DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4671 from betagouv/dev

Browse source 
2020-01-07-01
This commit is contained in:
Keirua 2020-01-07 10:24:56 +01:00 committed by GitHub
commit 6f654b3ebe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/views/layouts/_main_container.html.haml
View file

@ -1,6 +1,7 @@
#main-container{ class: "col-xs-#{main_container_size}" } #main-container{ class: "col-xs-#{main_container_size}" }
.row .row
= render partial: 'layouts/strike_banner' - if feature_enabled?(:team_on_strike)
= render partial: 'layouts/strike_banner'
= render partial: 'layouts/outdated_browser_banner' = render partial: 'layouts/outdated_browser_banner'
= render partial: 'layouts/pre_maintenance' = render partial: 'layouts/pre_maintenance'
.row .row

3
app/views/layouts/application.html.haml
View file

@ -26,7 +26,8 @@
%body{ id: content_for(:page_id), class: browser.platform.ios? ? 'ios' : nil } %body{ id: content_for(:page_id), class: browser.platform.ios? ? 'ios' : nil }
.page-wrapper .page-wrapper
= render partial: 'layouts/strike_banner' - if feature_enabled?(:team_on_strike)
= render partial: 'layouts/strike_banner'
= render partial: "layouts/outdated_browser_banner" = render partial: "layouts/outdated_browser_banner"
= render partial: 'layouts/pre_maintenance' = render partial: 'layouts/pre_maintenance'