From 29c97151cfb271e59d16f746487cacf0d8682d6c Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Fri, 14 Feb 2014 10:41:33 -0500 Subject: [PATCH] Fix bootstrap install mistakes --- app/assets/stylesheets/application.css | 1 - app/assets/stylesheets/custom.css.scss | 1 + config/application.rb | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/custom.css.scss diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index af1f35d..3192ec8 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -11,4 +11,3 @@ *= require_self *= require_tree . */ -@import "boostrap" diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss new file mode 100644 index 0000000..cbd46a7 --- /dev/null +++ b/app/assets/stylesheets/custom.css.scss @@ -0,0 +1 @@ +@import "bootstrap"; diff --git a/config/application.rb b/config/application.rb index 89bd25c..3e7cd79 100644 --- a/config/application.rb +++ b/config/application.rb @@ -19,5 +19,6 @@ module Tack2us # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de + config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif) end end