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

Merge branch '17485-broadcast-msg' into 'master'
c37006fa · Dmitriy Zaporozhets · 6aef2567 · e4d3e949 · c37006fa
Commit c37006fa authored May 13, 2016 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

_page.html.haml app/views/layouts/_page.html.haml +1 -1

No files found.
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
 .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) }