Commit 3d4f8c70 authored by Phil Hughes's avatar Phil Hughes

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
parents 28f7846c 292f401f
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
} }
.nav-text { .nav-text {
flex: 1;
padding-top: 16px; padding-top: 16px;
padding-bottom: 11px; padding-bottom: 11px;
display: inline-block; display: inline-block;
......
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
.nav-controls { .nav-controls {
width: auto; width: auto;
min-width: 50%;
} }
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
%div{ class: container_class } %div{ class: container_class }
.wiki-page-header .wiki-page-header
.nav-text .nav-text.flex-fill
%h2.wiki-page-title %h2.wiki-page-title
= s_("Wiki|Wiki Pages") = s_("Wiki|Wiki Pages")
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
%button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
= icon('angle-double-left') = icon('angle-double-left')
.nav-text .nav-text.flex-fill
%h2.wiki-page-title= @page.human_title %h2.wiki-page-title= @page.human_title
%span.wiki-last-edit-by %span.wiki-last-edit-by
- if @page.last_version - if @page.last_version
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment