Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2014-08-24 01:39:54 +0400
committerGleb Mazovetskiy <glex.spb@gmail.com>2014-08-24 01:39:56 +0400
commit2eb5fafeb7608e2ceadd215b3924f60aa3d83230 (patch)
treebcc242d23c76c4e2c0fe2038c1d9005a481d750a
parent5ab84d6bd441a40701906b36a528155b79945d11 (diff)
sprockets: depend_on relative path #592 #689
-rw-r--r--assets/stylesheets/bootstrap/_glyphicons.scss8
-rw-r--r--bootstrap-sass.gemspec1
2 files changed, 5 insertions, 4 deletions
diff --git a/assets/stylesheets/bootstrap/_glyphicons.scss b/assets/stylesheets/bootstrap/_glyphicons.scss
index 0f6ad34..d7c7ccf 100644
--- a/assets/stylesheets/bootstrap/_glyphicons.scss
+++ b/assets/stylesheets/bootstrap/_glyphicons.scss
@@ -1,7 +1,7 @@
-//= 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"
+//= 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"
//
// Glyphicons for Bootstrap
//
diff --git a/bootstrap-sass.gemspec b/bootstrap-sass.gemspec
index 49dda86..45489a9 100644
--- a/bootstrap-sass.gemspec
+++ b/bootstrap-sass.gemspec
@@ -19,6 +19,7 @@ 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'