diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-08-16 09:53:26 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-08-16 09:53:45 +0300 |
commit | 8e638871d5b11cc89f9f3203b08c50c580f4b114 (patch) | |
tree | d21a3e3cd184660129ea45f1b04fce4dc8975c4e | |
parent | 7f6a060d6ca870eb6ef5c777d816d97646c0507a (diff) |
Revert "Variables template: import functions and variables"
This reverts commit 7f6a060d6ca870eb6ef5c777d816d97646c0507a.
-rw-r--r-- | tasks/updater/scss.rb | 11 | ||||
-rw-r--r-- | templates/project/_bootstrap-variables.scss | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/tasks/updater/scss.rb b/tasks/updater/scss.rb index a99876e..c747b9a 100644 --- a/tasks/updater/scss.rb +++ b/tasks/updater/scss.rb @@ -23,18 +23,11 @@ class Updater end log_status 'Generating variable template file' - template_file_header = <<-SCSS -// Override Bootstrap variables here (defaults from bootstrap v#{upstream_version}): - -@import "bootstrap/functions"; -@import "bootstrap/variables"; - -SCSS save_file 'templates/project/_bootstrap-variables.scss', - template_file_header + + "// Override Bootstrap variables here (defaults from bootstrap v#{upstream_version}):\n" + File.read("#{save_to}/_variables.scss"). # The instructions in the file header are replaced with the line above - lines[5..-1]. + lines[4..-1]. join. # Comment out the assignments gsub(/^(?=[$@)}]|[ ]{2})/, '// '). diff --git a/templates/project/_bootstrap-variables.scss b/templates/project/_bootstrap-variables.scss index 1025640..29a6c8c 100644 --- a/templates/project/_bootstrap-variables.scss +++ b/templates/project/_bootstrap-variables.scss @@ -1,8 +1,5 @@ // Override Bootstrap variables here (defaults from bootstrap v4.0.0-beta): - -@import "bootstrap/functions"; -@import "bootstrap/variables"; - +// // Variables should follow the `$component-state-property-size` formula for // consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs. |