From 88be09541f342c44aa0d0e6b1cd24b92633af06b Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sun, 24 Aug 2014 01:25:15 +0200 Subject: [PATCH] Revert "sprockets: depend_on relative path #592 #689" This reverts commit 2eb5fafeb7608e2ceadd215b3924f60aa3d83230. See /~https://github.com/rails/sass-rails/issues/241 --- assets/stylesheets/bootstrap/_glyphicons.scss | 8 ++++---- bootstrap-sass.gemspec | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/assets/stylesheets/bootstrap/_glyphicons.scss b/assets/stylesheets/bootstrap/_glyphicons.scss index d7c7ccf016..0f6ad34520 100644 --- a/assets/stylesheets/bootstrap/_glyphicons.scss +++ b/assets/stylesheets/bootstrap/_glyphicons.scss @@ -1,7 +1,7 @@ -//= depend_on "../../fonts/bootstrap/glyphicons-halflings-regular.eot" -//= depend_on "../../fonts/bootstrap/glyphicons-halflings-regular.svg" -//= depend_on "../../fonts/bootstrap/glyphicons-halflings-regular.ttf" -//= depend_on "../../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 // diff --git a/bootstrap-sass.gemspec b/bootstrap-sass.gemspec index 45489a9f60..49dda86a12 100644 --- a/bootstrap-sass.gemspec +++ b/bootstrap-sass.gemspec @@ -19,7 +19,6 @@ Gem::Specification.new do |s| s.add_development_dependency 'capybara' s.add_development_dependency 'poltergeist' # Dummy Rails app dependencies - s.add_development_dependency 'rails', '>= 4.1' s.add_development_dependency 'json', '>= 1.8.1' s.add_development_dependency 'sprockets-rails', '>= 2.1.3' s.add_development_dependency 'autoprefixer-rails', '~> 1.1'