nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6319 from AugierLe42e/body-padding-use-variable

Browse source 
[Quickfix] Body padding-top use BS' SCSS variable
This commit is contained in:
Steffen van Bergerem 2015-08-22 01:19:36 +02:00
commit 51bfc6e114
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/bootstrap-variables.scss vendored
View file

@ -358,7 +358,7 @@ $grid-float-breakpoint: 992px !default; // $screen-md-min
//## //##
// Basics of a navbar // Basics of a navbar
// $navbar-height: 50px $navbar-height: 50px;
// $navbar-margin-bottom: $line-height-computed // $navbar-margin-bottom: $line-height-computed
// $navbar-border-radius: $border-radius-base // $navbar-border-radius: $border-radius-base
// $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) // $navbar-padding-horizontal: floor(($grid-gutter-width / 2))

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

@ -1,5 +1,7 @@
@import "bootstrap-variables";
body { body {
margin-top: 50px; margin-top: $navbar-height;
background-color: white; background-color: white;
background-image : none; background-image : none;
} }

2
app/assets/stylesheets/new_styles/_base.scss
View file

@ -1,5 +1,5 @@
body { body {
margin-top: 50px; margin-top: $navbar-height;
padding : none; padding : none;
&.lock { &.lock {