Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

heroku asset fix

  • Loading branch information...
commit ff4b2a61333f4c224eda66368439c39997ecdfc2 1 parent 5f19f85
@danryan authored
View
5 Gemfile
@@ -21,12 +21,13 @@ gem 'tinder'
gem 'redphone'
group :assets do
- gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
- gem 'bootstrap-sass'
gem 'uglifier', '>= 1.0.3'
end
+gem 'sass-rails', '~> 3.2.3'
+gem 'bootstrap-sass'
+
gem 'jquery-rails'
group :test do
View
5 app/assets/stylesheets/application.css.scss
@@ -11,3 +11,8 @@
*= require_self
*= require_tree .
*/
+
+ @import "bootstrap";
+ @import "bootstrap-responsive";
+
+ @import "bootstrap_and_overrides";
View
3  app/assets/stylesheets/bootstrap_and_overrides.css.scss
@@ -5,6 +5,3 @@ $iconWhiteSpritePath: asset-url("glyphicons-halflings-white.png", image);
body {
margin-top: 60px;
}
-
-@import "bootstrap";
-@import "bootstrap-responsive";
Please sign in to comment.
Something went wrong with that request. Please try again.