diff options
| author | pinglamb <pinglambs@gmail.com> | 2016-07-28 19:21:10 +0300 |
|---|---|---|
| committer | pinglamb <pinglambs@gmail.com> | 2016-07-28 19:21:10 +0300 |
| commit | 63982c9a2b5a1be6fd6ec765b8cece7131dac805 (patch) | |
| tree | 8a6911d217fa28769f19d0035c4a2fba58ea79eb /templates | |
| parent | f6a7b7bf41ea628b61693597be299c4257f93079 (diff) | |
rake update[v4.0.0-alpha.3]
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/project/_bootstrap-variables.scss | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/templates/project/_bootstrap-variables.scss b/templates/project/_bootstrap-variables.scss index d9a8cb9..021bffd 100644 --- a/templates/project/_bootstrap-variables.scss +++ b/templates/project/_bootstrap-variables.scss @@ -1,4 +1,4 @@ -// Override Bootstrap variables here (defaults from bootstrap v4.0.0-alpha.2): +// Override Bootstrap variables here (defaults from bootstrap v4.0.0-alpha.3): // // Copy settings from this file into the provided `_custom.scss` to override @@ -22,7 +22,11 @@ // $prev-key: null; // $prev-num: null; // @each $key, $num in $map { -// @if $prev-num != null and $prev-num >= $num { +// @if $prev-num == null { +// // Do nothing +// } @else if not comparable($prev-num, $num) { +// @warn "Potentially invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} whose unit makes it incomparable to #{$prev-num}, the value of the previous key '#{$prev-key}' !"; +// } @else if $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; @@ -155,7 +159,7 @@ // // Font, line-height, and color for body text, headings, and more. -// $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif; +// $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; // $font-family-serif: Georgia, "Times New Roman", Times, serif; // $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; // $font-family-base: $font-family-sans-serif; |