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/views | |
| 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/views')
| -rw-r--r-- | app/views/projects/wikis/pages.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/show.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
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 |