Revert "sprockets: depend_on relative path #592 #689"

This reverts commit 2eb5faf. See rails/sass-rails#241
twbs · Aug 23, 2014 · 88be095 · 88be095
1 parent 2eb5faf
commit 88be095
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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'