diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-18 11:20:41 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-18 11:20:41 +0000 |
| commit | 3d4f8c7035e88def3e1f78cd880f4b591de9341e (patch) | |
| tree | 111e65071792b1511d659fb9470e406d7ef373b8 /app/assets | |
| parent | 28f7846c4723457c6d53808215796515396eaa7d (diff) | |
| parent | 292f401f141aa5411aab8f94b5cd3f6679b2ab03 (diff) | |
| download | gitlab-ce-3d4f8c7035e88def3e1f78cd880f4b591de9341e.tar.gz | |
Merge branch '63231-wiki-nav' into 'master'
Fix header alignment on wiki and kubernetes pages
Closes #63231
See merge request gitlab-org/gitlab-ce!29698
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/secondary_navigation_elements.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/wiki.scss | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/secondary_navigation_elements.scss b/app/assets/stylesheets/framework/secondary_navigation_elements.scss index ada8f2fe1a6..7e15e5c8bfd 100644 --- a/app/assets/stylesheets/framework/secondary_navigation_elements.scss +++ b/app/assets/stylesheets/framework/secondary_navigation_elements.scss @@ -66,6 +66,7 @@ } .nav-text { + flex: 1; padding-top: 16px; padding-bottom: 11px; display: inline-block; diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss index 3260aed143e..10120a472d3 100644 --- a/app/assets/stylesheets/pages/wiki.scss +++ b/app/assets/stylesheets/pages/wiki.scss @@ -77,7 +77,6 @@ .nav-controls { width: auto; - min-width: 50%; } } |