Update Sprockets depend_on

* depend_on_asset => depend_on * file-relative paths don't work, revert to load path-relative
twbs · Jun 18, 2014 · e2e7020 · e2e7020
1 parent 2dc2274
commit e2e7020
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tasks/converter/less_conversion.rb b/tasks/converter/less_conversion.rb
@@ -111,7 +111,7 @@ def process_stylesheet_assets
           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

diff --git a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss
@@ -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
 //