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
This commit is contained in:
Phil Hughes 2019-06-18 11:20:41 +00:00
commit 3d4f8c7035
4 changed files with 3 additions and 3 deletions

View File

@ -66,6 +66,7 @@
}
.nav-text {
flex: 1;
padding-top: 16px;
padding-bottom: 11px;
display: inline-block;

View File

@ -77,7 +77,6 @@
.nav-controls {
width: auto;
min-width: 50%;
}
}

View File

@ -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")

View File

@ -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