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 /assets/stylesheets/bootstrap/_variables.scss | |
parent | f6a7b7bf41ea628b61693597be299c4257f93079 (diff) |
rake update[v4.0.0-alpha.3]
Diffstat (limited to 'assets/stylesheets/bootstrap/_variables.scss')
-rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index d129f9f..da9f5ef 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -21,7 +21,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; @@ -154,7 +158,7 @@ $grid-gutter-width: 30px !default; // // 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 !default; +$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; $font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; |