mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 08:39:56 +02:00
Code Issues Releases Wiki Activity

remove grid gutter sass map as it's output css was all jacked up

Browse Source
This commit is contained in:
Mark Otto
2017-06-29 21:27:27 -07:00
committed by Mark Otto
parent e51749e4a7
commit b013b987b0
4 changed files with 28 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,8 +9,8 @@
position: relative;
width: 100%;
min-height: 1px; // Prevent columns from collapsing when empty
@include make-gutters($gutters);
padding-right: ($grid-gutter-width / 2);
padding-left: ($grid-gutter-width / 2);
}
@each $breakpoint in map-keys($breakpoints) {

54
scss/mixins/_grid.scss
View File

@@ -2,17 +2,11 @@
//
// Generate semantic grid columns with these mixins.
@mixin make-container($gutters: $grid-gutter-widths) {
@mixin make-container() {
margin-right: auto;
margin-left: auto;
@each $breakpoint in map-keys($gutters) {
@include media-breakpoint-up($breakpoint) {
$gutter: map-get($gutters, $breakpoint);
padding-right: ($gutter / 2);
padding-left: ($gutter / 2);
}
}
padding-right: ($grid-gutter-width / 2);
padding-left: ($grid-gutter-width / 2);
}
@@ -26,44 +20,32 @@
}
}
@mixin make-gutters($gutters: $grid-gutter-widths) {
@each $breakpoint in map-keys($gutters) {
@include media-breakpoint-up($breakpoint) {
$gutter: map-get($gutters, $breakpoint);
padding-right: ($gutter / 2);
padding-left: ($gutter / 2);
}
}
}
// @mixin make-gutters($gutters: $grid-gutter-widths) {
// @each $breakpoint in map-keys($gutters) {
// @include media-breakpoint-up($breakpoint) {
// $gutter: map-get($gutters, $breakpoint);
// padding-right: ($gutter / 2);
// padding-left: ($gutter / 2);
// }
// }
// }
@mixin make-row($gutters: $grid-gutter-widths) {
@mixin make-row() {
display: flex;
flex-wrap: wrap;
@each $breakpoint in map-keys($gutters) {
@include media-breakpoint-up($breakpoint) {
$gutter: map-get($gutters, $breakpoint);
margin-right: ($gutter / -2);
margin-left: ($gutter / -2);
}
}
margin-right: ($grid-gutter-width / -2);
margin-left: ($grid-gutter-width / -2);
}
@mixin make-col-ready($gutters: $grid-gutter-widths) {
@mixin make-col-ready() {
position: relative;
// Prevent columns from becoming too narrow when at smaller grid tiers by
// always setting `width: 100%;`. This works because we use `flex` values
// later on to override this initial width.
width: 100%;
min-height: 1px; // Prevent collapsing
@each $breakpoint in map-keys($gutters) {
@include media-breakpoint-up($breakpoint) {
$gutter: map-get($gutters, $breakpoint);
padding-right: ($gutter / 2);
padding-left: ($gutter / 2);
}
}
padding-right: ($grid-gutter-width / 2);
padding-left: ($grid-gutter-width / 2);
}
@mixin make-col($size, $columns: $grid-columns) {