From 4d5cfb062164c7fab87ca32a62b5ba1ac786752d Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Mon, 22 Dec 2014 15:18:20 -0500 Subject: [PATCH] removed application.css.scss --- app/assets/stylesheets/application.css | 11 ++++++----- config/application.rb | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 3b9760c..2e6e7ab 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -5,10 +5,11 @@ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. + * You're free to add application-wide styles to this file and they'll appear at the bottom of the + * compiled file so the styles you add here take precedence over styles defined in any styles + * defined in the other CSS/SCSS files in this directory. It is generally better to create a new + * file per style scope. * - *= require_self *= require_tree . - */ - + *= require_self + */ \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index acd64d7..486c763 100644 --- a/config/application.rb +++ b/config/application.rb @@ -19,6 +19,7 @@ module Wrestling # 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 + #Add Bootstrap SAAS to asset pipeline config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif) end