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

Merge pull request #260 from sgmap/border_on_header_and_footer

Browse source 
Css: add border on header and footer
This commit is contained in:
LeSim 2017-05-09 12:43:34 +02:00 committed by GitHub
commit 30d3702a69
4 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/_colors.scss
View file

@ -3,6 +3,7 @@ $light-blue: rgba(61, 149, 236, 0.8);
$black: #333333; $black: #333333;
$grey: #999999; $grey: #999999;
$light-grey: #F8F8F8; $light-grey: #F8F8F8;
$border-grey: #CCCCCC;
$dark-red: #A94442; $dark-red: #A94442;
$light-red: #EBCCD1; $light-red: #EBCCD1;
$lighter-red: #F2DEDE; $lighter-red: #F2DEDE;

1
app/assets/stylesheets/new_footer.scss
View file

@ -6,6 +6,7 @@
.footer { .footer {
@include vertical-padding(72px); @include vertical-padding(72px);
background-color: $light-grey; background-color: $light-grey;
border-top: 1px solid $border-grey;
} }
.footer-inner-content { .footer-inner-content {

4
app/assets/stylesheets/new_header.scss
View file

@ -8,6 +8,10 @@
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.new-header-with-border {
border-bottom: 1px solid $border-grey;
}
.header-inner-content { .header-inner-content {
width: $page-width; width: $page-width;
margin: 0 auto; margin: 0 auto;

2
app/views/layouts/_new_header.haml
View file

@ -1,4 +1,4 @@
.new-header .new-header{ class: current_page?(root_path) ? nil : 'new-header-with-border' }
.header-inner-content .header-inner-content
%img.header-logo.pull-left{ src: image_url("header/logo-tps.svg") } %img.header-logo.pull-left{ src: image_url("header/logo-tps.svg") }