diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2019-06-14 12:22:25 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2019-06-14 12:22:25 -0500 |
| commit | 292f401f141aa5411aab8f94b5cd3f6679b2ab03 (patch) | |
| tree | 559aceef245c5c13031e235ae5f0c9f0c575a78d | |
| parent | cdb4424ec0f171d5c8a47b8c6380499550eac515 (diff) | |
| download | gitlab-ce-63231-wiki-nav.tar.gz | |
Fix header alignment on wiki and kubernetes pages63231-wiki-nav
| -rw-r--r-- | app/assets/stylesheets/framework/secondary_navigation_elements.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/wiki.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/wikis/pages.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/show.html.haml | 2 |
4 files changed, 3 insertions, 3 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%; } } diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml index 77fdf7f001c..2191e5ab287 100644 --- a/app/views/projects/wikis/pages.html.haml +++ b/app/views/projects/wikis/pages.html.haml @@ -7,7 +7,7 @@ %div{ class: container_class } .wiki-page-header - .nav-text + .nav-text.flex-fill %h2.wiki-page-title = s_("Wiki|Wiki Pages") diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml index 40d674f3fec..95cd3356ec8 100644 --- a/app/views/projects/wikis/show.html.haml +++ b/app/views/projects/wikis/show.html.haml @@ -8,7 +8,7 @@ %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } = icon('angle-double-left') - .nav-text + .nav-text.flex-fill %h2.wiki-page-title= @page.human_title %span.wiki-last-edit-by - if @page.last_version |