rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-15 15:29:22 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #19257 from twbs/fix-19147

Browse Source 
Add $gutter parameter to make-col mixin
This commit is contained in:
Chris Rebert 2016-02-17 03:25:04 -08:00
commit 3c2692447c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scss/mixins/_grid-framework.scss
View File

@ -22,7 +22,7 @@
@for $i from 1 through $columns { @for $i from 1 through $columns {
.col-#{$breakpoint}-#{$i} { .col-#{$breakpoint}-#{$i} {
@include make-col($i, $columns); @include make-col($i, $columns, $gutter);
} }
} }

6
scss/mixins/_grid.scss
View File

@ -33,11 +33,11 @@
margin-right: ($gutter / -2); margin-right: ($gutter / -2);
} }
@mixin make-col($size, $columns: $grid-columns) { @mixin make-col($size, $columns: $grid-columns, $gutter: $grid-gutter-width) {
position: relative; position: relative;
min-height: 1px; min-height: 1px;
padding-right: ($grid-gutter-width / 2); padding-right: ($gutter / 2);
padding-left: ($grid-gutter-width / 2); padding-left: ($gutter / 2);
@if $enable-flex { @if $enable-flex {
flex: 0 0 percentage($size / $columns); flex: 0 0 percentage($size / $columns);