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

Update Sprockets depend_on

Browse source 
* depend_on_asset => depend_on
* file-relative paths don't work, revert to load path-relative
This commit is contained in:
Gleb Mazovetskiy 2014-06-18 14:32:02 +02:00
parent 2dc2274848
commit e2e70208d5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tasks/converter/less_conversion.rb
View file

@ -111,7 +111,7 @@ class Converter
when 'thumbnails.less', 'labels.less', 'badges.less'
file = extract_nested_rule file, 'a&'
when 'glyphicons.less'
file = bootstrap_font_files.map { |p| %Q(//= depend_on_asset "./../../fonts/bootstrap/#{File.basename(p)}") } * "\n" + "\n" + file
file = bootstrap_font_files.map { |p| %Q(//= depend_on "bootstrap/#{File.basename(p)}") } * "\n" + "\n" + file
file = replace_rules(file, '@font-face') { |rule|
rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}'
replace_asset_url rule, :font

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

@ -1,7 +1,7 @@
//= depend_on_asset "./../../fonts/bootstrap/glyphicons-halflings-regular.eot"
//= depend_on_asset "./../../fonts/bootstrap/glyphicons-halflings-regular.svg"
//= depend_on_asset "./../../fonts/bootstrap/glyphicons-halflings-regular.ttf"
//= depend_on_asset "./../../fonts/bootstrap/glyphicons-halflings-regular.woff"
//= depend_on "bootstrap/glyphicons-halflings-regular.eot"
//= depend_on "bootstrap/glyphicons-halflings-regular.svg"
//= depend_on "bootstrap/glyphicons-halflings-regular.ttf"
//= depend_on "bootstrap/glyphicons-halflings-regular.woff"
//
// Glyphicons for Bootstrap
//