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

fix glyphicons

Browse source
This commit is contained in:
Gleb Mazovetskiy 2013-08-21 13:46:35 +02:00
parent 91d8dc386f
commit 6b9dd2965c
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/bootstrap-sass/version.rb
View file

@ -1,4 +1,4 @@
module Bootstrap
VERSION = '3.0.0.0'
BOOTSTRAP_SHA = '0759dc4119178954bd86f1c89800cbb027877e1c'
BOOTSTRAP_SHA = 'e143c3547241a1f92f54849ffbcb0745f3f8002c'
end

1
tasks/converter.rb
View file

@ -111,6 +111,7 @@ class Converter
file = extract_nested_rule file, 'a&'
when 'glyphicons.less'
file = replace_rules(file, '@font-face') { |rule|
rule = replace_all rule, /(\$icon-font-\w+)/, '#{\1}'
replace_all rule, /url\(/, 'font-url('
}
end

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

@ -10,11 +10,11 @@
// Import the fonts
@font-face {
font-family: 'Glyphicons Halflings';
src: font-url('$icon-font-path$icon-font-name.eot');
src: font-url('$icon-font-path$icon-font-name.eot?#iefix') format('embedded-opentype'),
font-url('$icon-font-path$icon-font-name.woff') format('woff'),
font-url('$icon-font-path$icon-font-name.ttf') format('truetype'),
font-url('$icon-font-path$icon-font-name.svg#glyphicons-halflingsregular') format('svg');
src: font-url('#{$icon-font-path}#{$icon-font-name}.eot');
src: font-url('#{$icon-font-path}#{$icon-font-name}.eot?#iefix') format('embedded-opentype'),
font-url('#{$icon-font-path}#{$icon-font-name}.woff') format('woff'),
font-url('#{$icon-font-path}#{$icon-font-name}.ttf') format('truetype'),
font-url('#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular') format('svg');
}
// Catchall baseclass