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

Merge branch 'v4-dev' into v4-form-sizing

Browse Source
This commit is contained in:
Mark Otto
2016-02-07 22:48:26 -08:00
parent e589cdbfe9 e3b55aadea
commit e455b6b8d2
18 changed files with 151 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scss/_variables.scss
View File

@@ -17,6 +17,18 @@
// Fonts
// Components
@mixin _assert-ascending($map, $map-name) {
$prev-key: null;
$prev-num: null;
@each $key, $num in $map {
@if $prev-num != null and $prev-num >= $num {
@warn "Invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} which isn't greater than #{$prev-num}, the value of the previous key '#{$prev-key}' !";
}
$prev-key: $key;
$prev-num: $num;
}
}
// General variable structure
//
// Variable format should follow the `$component-modifier-state-property` order.
@@ -50,6 +62,7 @@ $enable-gradients: false !default;
$enable-transitions: false !default;
$enable-hover-media-query: false !default;
$enable-grid-classes: true !default;
$enable-print-styles: true !default;
// Spacing
@@ -111,6 +124,7 @@ $grid-breakpoints: (
lg: 992px,
xl: 1200px
) !default;
@include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
// Grid containers
@@ -123,6 +137,7 @@ $container-max-widths: (
lg: 940px,
xl: 1140px
) !default;
@include _assert-ascending($container-max-widths, "$container-max-widths");
// Grid columns