From f5ec47641614e9794ff9696bbacdad750e08a4c0 Mon Sep 17 00:00:00 2001 From: JC Date: Mon, 21 Nov 2016 14:12:59 +0100 Subject: [PATCH] New application layout struct for pages --- app/assets/stylesheets/print.scss | 2 +- app/views/layouts/application.html.haml | 30 +++++++++++++------------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss index c16833811..9b9dc1fec 100644 --- a/app/assets/stylesheets/print.scss +++ b/app/assets/stylesheets/print.scss @@ -28,4 +28,4 @@ #backoffice_dossier_show .nav-tabs { display: none; } -} \ No newline at end of file +} diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9e31d11ff..3cee15265 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,4 +1,3 @@ -!!! %html %head %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/ @@ -22,20 +21,23 @@ ="".html_safe %div#wrap - %div#header.navbar - =render partial: "layouts/navbar" + .row + %div#header.navbar + =render partial: "layouts/navbar" - #flash_message.center - - if flash.notice - .alert.alert-success - = flash.notice - - if flash.alert - .alert.alert-danger - = flash.alert - #main_div.main_div - = yield - - %br + .row + #left-pannel + #main_div + .row + #flash_message.center + - if flash.notice + .alert.alert-success + = flash.notice + - if flash.alert + .alert.alert-danger + = flash.alert + .row + = yield #footer .container.center