summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-07 10:05:10 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-07 10:05:10 -0500
commitae6591081a0a16112adcd36304fc80b037228854 (patch)
treea5e3094a4f1f8481ca9eb85713a26822c1162e3b
parent04dba0e5f80659c28010f3eb1de1aa970f6a1bae (diff)
downloadgitlab-ce-ae6591081a0a16112adcd36304fc80b037228854.tar.gz
Fix alignment of wiki top area
-rw-r--r--app/assets/stylesheets/framework/nav.scss4
-rw-r--r--app/views/projects/wikis/edit.html.haml2
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index 1b22c88070b..a811778df70 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -101,6 +101,10 @@
width: 50%;
line-height: 28px;
+ &.wiki-page {
+ padding: 16px 10px 11px;
+ }
+
/* Small devices (phones, tablets, 768px and lower) */
@media (max-width: $screen-sm-min) {
width: 100%;
diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml
index aaa15dd3bbe..cbd69ee1a73 100644
--- a/app/views/projects/wikis/edit.html.haml
+++ b/app/views/projects/wikis/edit.html.haml
@@ -2,7 +2,7 @@
= render 'nav'
.top-area
- .nav-text
+ .nav-text.wiki-page
%strong
- if @page.persisted?
= link_to @page.title.capitalize, namespace_project_wiki_path(@project.namespace, @project, @page)