diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f41620d7e..d621048f6 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -24,7 +24,7 @@ @import "bootstrap"; body { - background-color: rgb(255, 255, 255); + background-color: #F2F6FA; } html, body { @@ -49,12 +49,14 @@ body { display: block; } -#footer, #wrap:after { - height: 50px; -} - #footer { background-color: rgb(240, 240, 240); + position: relative; + width: 100%; + margin-top: 30px; + bottom: 0px; + height: 50px; + line-height: 50px; } .beta_staging { @@ -214,3 +216,7 @@ div.pagination { .no-padding { padding: 0; } + +.no-margin { + margin: 0; +} diff --git a/app/assets/stylesheets/left_pannel.scss b/app/assets/stylesheets/left_pannel.scss index 10223b1e0..ef6f0f3d5 100644 --- a/app/assets/stylesheets/left_pannel.scss +++ b/app/assets/stylesheets/left_pannel.scss @@ -1,3 +1,22 @@ #left-pannel { - width: 100%; + padding: 80px 0 0 10px; + background-color: #003189; + height: 100%; + position: fixed; + top: 0; + left: 0; + bottom: 0; + color: white; + #first-block { + font-family: Arial; + font-size: 16px; + font-weight: bold; + line-height: 18px; + } + #action-block { + } + #menu-block { + } + #infos-block { + } } diff --git a/app/assets/stylesheets/main_container.scss b/app/assets/stylesheets/main_container.scss new file mode 100644 index 000000000..fda591698 --- /dev/null +++ b/app/assets/stylesheets/main_container.scss @@ -0,0 +1,3 @@ +#main-container { + float: right; +} diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index a981f56b4..b13db1d2f 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,5 +1,5 @@ #footer - .container.center + .center %p{style:'margin-top: 1em;'} %p{class: "copyright text-muted small"} =link_to 'SGMAP', "http://etatplateforme.modernisation.gouv.fr" diff --git a/app/views/layouts/_left_pannel.html.haml b/app/views/layouts/_left_pannel.html.haml new file mode 100644 index 000000000..f18278714 --- /dev/null +++ b/app/views/layouts/_left_pannel.html.haml @@ -0,0 +1,9 @@ +%div#first-block + %div.row + %div.col-lg-12.col-md-12 + 112 dossiers en cours + %div.col-lg-12.col-md-12 + > 2 nouveaux dossiers +%div#action-block +%div#menu-block +%div#infos-block diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml index 15fe0b794..bbe3cbc28 100644 --- a/app/views/layouts/_navbar.html.haml +++ b/app/views/layouts/_navbar.html.haml @@ -1,9 +1,8 @@ -- if false - #beta{class:(Rails.env == 'production' ? '' : 'beta_staging')} - - if Rails.env == 'production' - Beta - - else - Env Test +#beta{class:(Rails.env == 'production' ? '' : 'beta_staging')} + - if Rails.env == 'production' + Beta + - else + Env Test %div.col-lg-2.col-md-2.no-padding %a#title_navbar{href: '/'} diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9afa146d7..d110fce9f 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -24,12 +24,14 @@ %div.row %div#header.navbar = render partial: "layouts/navbar" - %div.row - %div#left-pannel - %div#main_div + %div.row.no-margin + %div.col-lg-2.col-md-2#left-pannel + = render partial: 'layouts/left_pannel' + %div.col-lg-10.col-md-10#main-container %div.row = render partial: 'layouts/flash_messages' %div.row - =# yield - = render partial: 'layouts/footer' + = yield + %div.row + = render partial: 'layouts/footer' = render partial: 'layouts/google_analytics'