diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-05-13 13:04:36 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-05-13 13:04:36 +0000 |
| commit | c37006fa4f4a85c031d4916a618be39ac0b0d3ed (patch) | |
| tree | a6fa722d250c3ed6fe651dc91cf5d22363a37326 | |
| parent | 6aef2567330fb7c3e549d3f434acc0c272a8366f (diff) | |
| parent | e4d3e949555c51cf54ead163bf001b4ec86a2733 (diff) | |
| download | gitlab-ce-c37006fa4f4a85c031d4916a618be39ac0b0d3ed.tar.gz | |
Merge branch '17485-broadcast-msg' into 'master'
Move broadcast msg into content-wrapper
Closes #17485
<img src="/uploads/ab365f471209c55d2ee876cf558d4032/Screen_Shot_2016-05-12_at_4.21.22_PM.png" width="800px">
See merge request !4132
| -rw-r--r-- | app/views/layouts/_page.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 3c3bc41bf0e..3c0660d34f4 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -1,5 +1,4 @@ .page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" } - = render "layouts/broadcast" .sidebar-wrapper.nicescroll{ class: nav_sidebar_class } .header-logo %a#logo @@ -27,6 +26,7 @@ .container-fluid = render "layouts/nav/#{nav}" .content-wrapper{ class: ('page-with-layout-nav' if defined?(nav) && nav) } + = render "layouts/broadcast" = render "layouts/flash" = yield :flash_message %div{ class: (container_class unless @no_container) } |