From 95c3d9694b08b75c47b3de3f95816c8d1ccc622a Mon Sep 17 00:00:00 2001 From: augier Date: Fri, 14 Aug 2015 18:48:11 +0200 Subject: [PATCH] Body padding-top use BS' SCSS variable --- app/assets/stylesheets/bootstrap-variables.scss | 2 +- app/assets/stylesheets/home.scss | 4 +++- app/assets/stylesheets/new_styles/_base.scss | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/bootstrap-variables.scss b/app/assets/stylesheets/bootstrap-variables.scss index 6c8376e97..bf0764955 100644 --- a/app/assets/stylesheets/bootstrap-variables.scss +++ b/app/assets/stylesheets/bootstrap-variables.scss @@ -358,7 +358,7 @@ $grid-float-breakpoint: 992px !default; // $screen-md-min //## // Basics of a navbar -// $navbar-height: 50px +$navbar-height: 50px; // $navbar-margin-bottom: $line-height-computed // $navbar-border-radius: $border-radius-base // $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss index acb3e9195..eafe0bde4 100644 --- a/app/assets/stylesheets/home.scss +++ b/app/assets/stylesheets/home.scss @@ -1,5 +1,7 @@ +@import "bootstrap-variables"; + body { - margin-top: 50px; + margin-top: $navbar-height; background-color: white; background-image : none; } diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss index e95f48fbc..233ceb08f 100644 --- a/app/assets/stylesheets/new_styles/_base.scss +++ b/app/assets/stylesheets/new_styles/_base.scss @@ -1,5 +1,5 @@ body { - margin-top: 50px; + margin-top: $navbar-height; padding : none; &.lock {