-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix BS4 grid after their grid updates
- Loading branch information
Showing
2 changed files
with
3 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| // Grid settings | ||
| $enable-flex: true; | ||
| $main-sm-columns: 12; | ||
| $sidebar-sm-columns: 4; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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); | ||
| } | ||
| } |