diff --git a/tasks/converter.rb b/tasks/converter.rb index 151aaefe..989de442 100644 --- a/tasks/converter.rb +++ b/tasks/converter.rb @@ -48,10 +48,6 @@ class Converter file = convert_to_scss(file) end - if name == 'progress-bars.less' - # file = fix_progress_bar(file) - end - name = name.gsub(/\.less$/, '.scss') path = "vendor/assets/stylesheets/bootstrap/_#{name}" save_file(path, file) @@ -156,13 +152,7 @@ private end def replace_vars(less) - less.gsub(/(?!@media|@-\w)@/, '$') - end - - def fix_progress_bar(less) - less = less.gsub(/(\$)(-webkit-keyframes progress-bar-stripes)/, '@\2') - less = less.gsub(/(\$)(-moz-keyframes)/, '@\2') - less = less.gsub(/(\$)(keyframes progress-bar-stripes)/, '@\2') + less.gsub(/(?!@media|@page|@keyframes|@font-face|@-\w)@/, '$') end def replace_fonts(less) diff --git a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss index 9bd4df25..7efed968 100644 --- a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +++ b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss @@ -19,7 +19,7 @@ // Import the fonts -$font-face { +@font-face { font-family: 'Glyphicons Halflings'; src: font-url('glyphiconshalflings-regular.eot'); src: font-url('glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'),