Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-sass.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2018-04-18 01:42:23 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2018-12-14 15:16:04 +0300
commit92aa0c8b4631d7b0af6071f9c0aa08d49593678c (patch)
treea4d915d0252bf594e836f1d4b0e5ef5934cc6e99
parent418073fd435446c2c3d55e1e29990bbff4159c96 (diff)
Update converter to support v3.4.0
-rw-r--r--tasks/converter/less_conversion.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/tasks/converter/less_conversion.rb b/tasks/converter/less_conversion.rb
index 6774a0bb..b8856333 100644
--- a/tasks/converter/less_conversion.rb
+++ b/tasks/converter/less_conversion.rb
@@ -67,6 +67,7 @@ class Converter
log_processing name
# apply common conversions
file = convert_less(file)
+ file = replace_all file, %r{/\* stylelint-disable.*?\*/\n*}, '', optional: true
if name.start_with?('mixins/')
file = varargify_mixin_definitions(file, *VARARG_MIXINS)
%w(responsive-(in)?visibility input-size text-emphasis-variant bg-variant).each do |mixin|
@@ -325,10 +326,10 @@ SASS
%Q(@import "#{target_path}\\1";)
end
- def replace_all(file, regex, replacement = nil, &block)
+ def replace_all(file, regex, replacement = nil, optional: false, &block)
log_transform regex, replacement
new_file = file.gsub(regex, replacement, &block)
- raise "replace_all #{regex}, #{replacement} NO MATCH" if file == new_file
+ raise "replace_all #{regex}, #{replacement} NO MATCH" if !optional && file == new_file
new_file
end
@@ -465,7 +466,7 @@ SASS
def replace_ms_filters(file)
log_transform
file.gsub(
- /filter: e\(%\("progid:DXImageTransform.Microsoft.gradient\(startColorstr='%d', endColorstr='%d', GradientType=(\d)\)",argb\(([\-$\w]+)\),argb\(([\-$\w]+)\)\)\);/,
+ /filter: e\(%\("progid:DXImageTransform.Microsoft.gradient\(startColorstr='%d', endColorstr='%d', GradientType=(\d)\)", ?argb\(([\-$\w]+)\), ?argb\(([\-$\w]+)\)\)\);/,
%Q(filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='\#{ie-hex-str(\\2)}', endColorstr='\#{ie-hex-str(\\3)}', GradientType=\\1);)
)
end