diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2018-04-18 02:00:02 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2018-12-14 15:16:04 +0300 |
| commit | 2e15e662c01b5fb53905deb3fc17a4518dac440a (patch) | |
| tree | d1ea14bc97a962a21627e2a2b10686a501749a91 | |
| parent | 8c0b5db239cc5af72882d662decbd39fabefce64 (diff) | |
Fix "$a-$b" -> "#{$a}-#{$b}" conversion
| -rw-r--r-- | assets/stylesheets/bootstrap/_glyphicons.scss | 12 | ||||
| -rw-r--r-- | tasks/converter/less_conversion.rb | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/assets/stylesheets/bootstrap/_glyphicons.scss b/assets/stylesheets/bootstrap/_glyphicons.scss index 7c9b4bc7..5fe36615 100644 --- a/assets/stylesheets/bootstrap/_glyphicons.scss +++ b/assets/stylesheets/bootstrap/_glyphicons.scss @@ -11,12 +11,12 @@ // Import the fonts @font-face { font-family: "Glyphicons Halflings"; - src: url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{#{$icon-font-name}}.eot"), "#{$icon-font-path}#{#{$icon-font-name}}.eot")); - src: url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{#{$icon-font-name}}.eot?#iefix"), "#{$icon-font-path}#{#{$icon-font-name}}.eot?#iefix")) format("embedded-opentype"), - url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{#{$icon-font-name}}.woff2"), "#{$icon-font-path}#{#{$icon-font-name}}.woff2")) format("woff2"), - url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{#{$icon-font-name}}.woff"), "#{$icon-font-path}#{#{$icon-font-name}}.woff")) format("woff"), - url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{#{$icon-font-name}}.ttf"), "#{$icon-font-path}#{#{$icon-font-name}}.ttf")) format("truetype"), - url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.svg##{#{$icon-font-svg-id}}"), "#{$icon-font-path}#{$icon-font-name}.svg##{#{$icon-font-svg-id}}")) format("svg"); + src: url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.eot"), "#{$icon-font-path}#{$icon-font-name}.eot")); + src: url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.eot?#iefix"), "#{$icon-font-path}#{$icon-font-name}.eot?#iefix")) format("embedded-opentype"), + url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.woff2"), "#{$icon-font-path}#{$icon-font-name}.woff2")) format("woff2"), + url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.woff"), "#{$icon-font-path}#{$icon-font-name}.woff")) format("woff"), + url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.ttf"), "#{$icon-font-path}#{$icon-font-name}.ttf")) format("truetype"), + url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}"), "#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}")) format("svg"); } } diff --git a/tasks/converter/less_conversion.rb b/tasks/converter/less_conversion.rb index b8856333..c4eaed81 100644 --- a/tasks/converter/less_conversion.rb +++ b/tasks/converter/less_conversion.rb @@ -127,10 +127,7 @@ class Converter when 'thumbnails.less', 'labels.less', 'badges.less', 'buttons.less' file = extract_nested_rule file, 'a&' when 'glyphicons.less' - file = replace_rules(file, /\s*@font-face/) { |rule| - rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}' - replace_asset_url rule, :font - } + file = replace_rules(file, /\s*@font-face/) { |rule| replace_asset_url rule, :font } when 'type.less' file = apply_mixin_parent_selector(file, '\.(text|bg)-(success|primary|info|warning|danger)') # .bg-primary will not get patched automatically as it includes an additional rule. fudge for now @@ -512,7 +509,8 @@ SASS def replace_escaping(less) less = less.gsub(/~"([^"]+)"/, '\1').gsub(/~'([^']+)'/, '\1') # Get rid of ~"" escape less.gsub!(/\$\{([^}]+)\}/, '$\1') # Get rid of @{} escape - less.gsub!(/"([^"\n]*)(\$[\w\-]+)([^"\n]*)"/, '"\1#{\2}\3"') # interpolate variable in string, e.g. url("$file-1x") => url("#{$file-1x}") + # interpolate variables in strings, e.g. url("$file-1x") => url("#{$file-1x}") + less.gsub!(/"[^"\n]*"/) { |str| str.gsub(/\$[^"\n$.\\]+/, '#{\0}') } less.gsub(/(\W)e\(%\("?([^"]*)"?\)\)/, '\1\2') # Get rid of e(%("")) escape end |