Fix BS4 grid after their grid updates

This commit is contained in:
Ben Word
2016-02-20 08:49:53 -07:00
parent 856a482bab
commit 5551ddebfa
2 changed files with 3 additions and 7 deletions

View File

@@ -1,5 +1,4 @@
// Grid settings
$enable-flex: true;
$main-sm-columns: 12;
$sidebar-sm-columns: 4;

View File

@@ -1,18 +1,15 @@
// Grid system
.main {
@include make-col();
@include make-col($main-sm-columns, $main-sm-columns, $grid-gutter-width);
@include media-breakpoint-up(sm) {
@include make-col-span($main-sm-columns);
.sidebar-primary & {
@include make-col-span($main-sm-columns - $sidebar-sm-columns);
@include make-col($main-sm-columns - $sidebar-sm-columns, $main-sm-columns, $grid-gutter-width);
}
}
}
.sidebar {
@include make-col();
@include media-breakpoint-up(sm) {
@include make-col-span($sidebar-sm-columns);
@include make-col($sidebar-sm-columns, $main-sm-columns, $grid-gutter-width);
}
}