Working on left-pannel, include footer after main-container

This commit is contained in:
JC 2016-11-21 16:13:19 +01:00
parent 23ef3e896a
commit 2d355bd6a0
7 changed files with 56 additions and 18 deletions

View file

@ -24,7 +24,7 @@
@import "bootstrap"; @import "bootstrap";
body { body {
background-color: rgb(255, 255, 255); background-color: #F2F6FA;
} }
html, body { html, body {
@ -49,12 +49,14 @@ body {
display: block; display: block;
} }
#footer, #wrap:after {
height: 50px;
}
#footer { #footer {
background-color: rgb(240, 240, 240); background-color: rgb(240, 240, 240);
position: relative;
width: 100%;
margin-top: 30px;
bottom: 0px;
height: 50px;
line-height: 50px;
} }
.beta_staging { .beta_staging {
@ -214,3 +216,7 @@ div.pagination {
.no-padding { .no-padding {
padding: 0; padding: 0;
} }
.no-margin {
margin: 0;
}

View file

@ -1,3 +1,22 @@
#left-pannel { #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 {
}
} }

View file

@ -0,0 +1,3 @@
#main-container {
float: right;
}

View file

@ -1,5 +1,5 @@
#footer #footer
.container.center .center
%p{style:'margin-top: 1em;'} %p{style:'margin-top: 1em;'}
%p{class: "copyright text-muted small"} %p{class: "copyright text-muted small"}
=link_to 'SGMAP', "http://etatplateforme.modernisation.gouv.fr" =link_to 'SGMAP', "http://etatplateforme.modernisation.gouv.fr"

View file

@ -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

View file

@ -1,9 +1,8 @@
- if false #beta{class:(Rails.env == 'production' ? '' : 'beta_staging')}
#beta{class:(Rails.env == 'production' ? '' : 'beta_staging')} - if Rails.env == 'production'
- if Rails.env == 'production' Beta
Beta - else
- else Env Test
Env Test
%div.col-lg-2.col-md-2.no-padding %div.col-lg-2.col-md-2.no-padding
%a#title_navbar{href: '/'} %a#title_navbar{href: '/'}

View file

@ -24,12 +24,14 @@
%div.row %div.row
%div#header.navbar %div#header.navbar
= render partial: "layouts/navbar" = render partial: "layouts/navbar"
%div.row %div.row.no-margin
%div#left-pannel %div.col-lg-2.col-md-2#left-pannel
%div#main_div = render partial: 'layouts/left_pannel'
%div.col-lg-10.col-md-10#main-container
%div.row %div.row
= render partial: 'layouts/flash_messages' = render partial: 'layouts/flash_messages'
%div.row %div.row
=# yield = yield
= render partial: 'layouts/footer' %div.row
= render partial: 'layouts/footer'
= render partial: 'layouts/google_analytics' = render partial: 'layouts/google_analytics'