framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix BS4 grid after their grid updates

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/styles/common/_variables.scss
View File

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

9
assets/styles/components/_grid.scss
View File

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