kotovalexarian-likes-github/twbs--bootstrap-sass
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00
Code Releases Activity

More exclusions for variable replace pattern

Browse source
This commit is contained in:
Peter Gumeson 2013-05-25 00:36:55 -07:00
parent 138f145d27
commit 4ad50ce13d
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tasks/converter.rb
View file

@ -48,10 +48,6 @@ class Converter
file = convert_to_scss(file) file = convert_to_scss(file)
end end
if name == 'progress-bars.less'
# file = fix_progress_bar(file)
end
name = name.gsub(/\.less$/, '.scss') name = name.gsub(/\.less$/, '.scss')
path = "vendor/assets/stylesheets/bootstrap/_#{name}" path = "vendor/assets/stylesheets/bootstrap/_#{name}"
save_file(path, file) save_file(path, file)
@ -156,13 +152,7 @@ private
end end
def replace_vars(less) def replace_vars(less)
less.gsub(/(?!@media|@-\w)@/, '$') less.gsub(/(?!@media|@page|@keyframes|@font-face|@-\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')
end end
def replace_fonts(less) def replace_fonts(less)

2
vendor/assets/stylesheets/bootstrap/_glyphicons.scss vendored
View file

@ -19,7 +19,7 @@
// Import the fonts // Import the fonts
$font-face { @font-face {
font-family: 'Glyphicons Halflings'; font-family: 'Glyphicons Halflings';
src: font-url('glyphiconshalflings-regular.eot'); src: font-url('glyphiconshalflings-regular.eot');
src: font-url('glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), src: font-url('glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'),