summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-02-04 18:01:29 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-02-04 18:01:29 +0000
commit34edb3abe71ff7a9e9a0a431f150f54ef74cdfa5 (patch)
treebc07b9fc48aac3eddc7c15b9225b6275ebc93f41 /app/views/layouts
parentc5ed929d33981d4af25c701087a4eaca1348cc1b (diff)
parent2e6c5fb28e2fb924addffd29345dab45b7980905 (diff)
downloadgitlab-ce-34edb3abe71ff7a9e9a0a431f150f54ef74cdfa5.tar.gz
Merge branch 'feature/jschatz1/issuable-sidebar' into 'master'
Implement new design for issue and merge request right sidebar Fixes #3981 See merge request !2645
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/_page.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 26159989777..0c1b5eec95a 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,4 +1,4 @@
-.page-with-sidebar{ class: page_sidebar_class }
+.page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" }
= render "layouts/broadcast"
.sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
.header-logo