Working on left-pannel, include footer after main-container
This commit is contained in:
parent
23ef3e896a
commit
2d355bd6a0
7 changed files with 56 additions and 18 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
}
|
||||
}
|
||||
|
|
3
app/assets/stylesheets/main_container.scss
Normal file
3
app/assets/stylesheets/main_container.scss
Normal file
|
@ -0,0 +1,3 @@
|
|||
#main-container {
|
||||
float: right;
|
||||
}
|
|
@ -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"
|
||||
|
|
9
app/views/layouts/_left_pannel.html.haml
Normal file
9
app/views/layouts/_left_pannel.html.haml
Normal 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
|
|
@ -1,5 +1,4 @@
|
|||
- if false
|
||||
#beta{class:(Rails.env == 'production' ? '' : 'beta_staging')}
|
||||
#beta{class:(Rails.env == 'production' ? '' : 'beta_staging')}
|
||||
- if Rails.env == 'production'
|
||||
Beta
|
||||
- else
|
||||
|
|
|
@ -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
|
||||
= yield
|
||||
%div.row
|
||||
= render partial: 'layouts/footer'
|
||||
= render partial: 'layouts/google_analytics'
|
||||
|
|
Loading…
Reference in a new issue