From 5d915ada8897f58ea0dd13c1362ea197abaa17cf Mon Sep 17 00:00:00 2001 From: Simon Lehericey Date: Fri, 5 May 2017 12:29:19 +0200 Subject: [PATCH] Css: add border on header and footer Remove headers border on homepage --- app/assets/stylesheets/_colors.scss | 1 + app/assets/stylesheets/new_footer.scss | 1 + app/assets/stylesheets/new_header.scss | 4 ++++ app/views/layouts/_new_header.haml | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/_colors.scss b/app/assets/stylesheets/_colors.scss index 8661f29b0..ab61a6c21 100644 --- a/app/assets/stylesheets/_colors.scss +++ b/app/assets/stylesheets/_colors.scss @@ -3,6 +3,7 @@ $light-blue: rgba(61, 149, 236, 0.8); $black: #333333; $grey: #999999; $light-grey: #F8F8F8; +$border-grey: #CCCCCC; $dark-red: #A94442; $light-red: #EBCCD1; $lighter-red: #F2DEDE; diff --git a/app/assets/stylesheets/new_footer.scss b/app/assets/stylesheets/new_footer.scss index de93cd97d..ccfab7146 100644 --- a/app/assets/stylesheets/new_footer.scss +++ b/app/assets/stylesheets/new_footer.scss @@ -6,6 +6,7 @@ .footer { @include vertical-padding(72px); background-color: $light-grey; + border-top: 1px solid $border-grey; } .footer-inner-content { diff --git a/app/assets/stylesheets/new_header.scss b/app/assets/stylesheets/new_header.scss index 3213bb3c1..a76bbf9a1 100644 --- a/app/assets/stylesheets/new_header.scss +++ b/app/assets/stylesheets/new_header.scss @@ -8,6 +8,10 @@ background-color: #FFFFFF; } +.new-header-with-border { + border-bottom: 1px solid $border-grey; +} + .header-inner-content { width: $page-width; margin: 0 auto; diff --git a/app/views/layouts/_new_header.haml b/app/views/layouts/_new_header.haml index 73f1946c6..82554fd60 100644 --- a/app/views/layouts/_new_header.haml +++ b/app/views/layouts/_new_header.haml @@ -1,4 +1,4 @@ -.new-header +.new-header{ class: current_page?(root_path) ? nil : 'new-header-with-border' } .header-inner-content %img.header-logo.pull-left{ src: image_url("header/logo-tps.svg") }