diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-05-30 21:47:54 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-05-30 21:47:54 +0300 |
commit | d1e4e696b7fefcaec458aa6ab8f31411172011d6 (patch) | |
tree | ae0c54320923611a9b299b853947abeaf049f653 | |
parent | b5baad25d6dcdf59feb558194edda59e813f89e0 (diff) |
Variables template: comment out mixins/functions
Fixes #70
-rw-r--r-- | tasks/updater/scss.rb | 5 | ||||
-rw-r--r-- | templates/project/_bootstrap-variables.scss | 27 |
2 files changed, 23 insertions, 9 deletions
diff --git a/tasks/updater/scss.rb b/tasks/updater/scss.rb index d92ff87..c747b9a 100644 --- a/tasks/updater/scss.rb +++ b/tasks/updater/scss.rb @@ -28,12 +28,9 @@ class Updater File.read("#{save_to}/_variables.scss"). # The instructions in the file header are replaced with the line above lines[4..-1]. - # Remove the _assert-ascending mixin definition and usages - reject { |line| line.start_with?('@include _assert-ascending') }. join. - gsub(/@mixin _assert-ascending.*?\n}\n/m, ''). # Comment out the assignments - gsub(/^(?=\$|\)|[ ]{2})/, '// '). + gsub(/^(?=[$@)}]|[ ]{2})/, '// '). # Remove the !default modifier gsub(/ !default/, '') end diff --git a/templates/project/_bootstrap-variables.scss b/templates/project/_bootstrap-variables.scss index 5b13c9c..b014155 100644 --- a/templates/project/_bootstrap-variables.scss +++ b/templates/project/_bootstrap-variables.scss @@ -38,6 +38,21 @@ // Close // Code +// @mixin _assert-ascending($map, $map-name) { +// $prev-key: null; +// $prev-num: null; +// @each $key, $num in $map { +// @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; +// $prev-num: $num; +// } +// } // Replace `$search` with `$replace` in `$string` // @author Hugo Giraudel @@ -45,7 +60,7 @@ // @param {String} $search - Substring to replace // @param {String} $replace ('') - New value // @return {String} - Updated string -@function str-replace($string, $search, $replace: "") { +// @function str-replace($string, $search, $replace: "") { // $index: str-index($string, $search); // @if $index { @@ -53,15 +68,15 @@ // } // @return $string; -} +// } -@mixin _assert-starts-at-zero($map) { +// @mixin _assert-starts-at-zero($map) { // $values: map-values($map); // $first-value: nth($values, 1); // @if $first-value != 0 { // @warn "First breakpoint in `$grid-breakpoints` must start at 0, but starts at #{$first-value}."; // } -} +// } // General variable structure @@ -167,7 +182,8 @@ // lg: 992px, // xl: 1200px // ); -@include _assert-starts-at-zero($grid-breakpoints); +// @include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); +// @include _assert-starts-at-zero($grid-breakpoints); // Grid containers @@ -180,6 +196,7 @@ // lg: 960px, // xl: 1140px // ); +// @include _assert-ascending($container-max-widths, "$container-max-widths"); // Grid columns |