From e2e70208d5c8e0f177e45b45d872ba592f987ad9 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Wed, 18 Jun 2014 14:32:02 +0200 Subject: [PATCH] Update Sprockets depend_on * depend_on_asset => depend_on * file-relative paths don't work, revert to load path-relative --- tasks/converter/less_conversion.rb | 2 +- vendor/assets/stylesheets/bootstrap/_glyphicons.scss | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tasks/converter/less_conversion.rb b/tasks/converter/less_conversion.rb index 2806fa8174..fd197cabe9 100644 --- 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 index 03c980f2bc..0f6ad34520 100644 --- 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 //