Merge 84b790c into bc0a900

Gemfile

@@ -11,7 +11,6 @@ gem 'sqlite3', '~> 1.3.13'
 gem 'bigdecimal', '1.3.5'
 gem 'bundler', '< 2.0'
 gem 'psych', '< 4.0'
-gem 'sprockets', '< 4.0'
 
 # Use SCSS for stylesheets
 gem 'sass-rails'

Gemfile.lock

@@ -329,7 +329,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
-    sprockets (3.7.2)
+    sprockets (4.1.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.2)
@@ -432,7 +432,6 @@ DEPENDENCIES
   simple_form
   simplecov
   simplecov-lcov
-  sprockets (< 4.0)
   sqlite3 (~> 1.3.13)
   state_machines-activerecord
   state_machines-yard

app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

app/assets/stylesheets/bootstrap_init.scss

@@ -1,2 +1 @@
-@import "bootstrap";
 @import "bootstrap_overrides";

app/assets/stylesheets/bootstrap_overrides.scss

@@ -1,3 +1,5 @@
+@import "bootstrap";
+
 blockquote.collapse,
 .history blockquote {
     margin-bottom: 0px;

app/themes/bento/assets/config/manifest.js

@@ -0,0 +1,9 @@
+//= link_tree ../../../../assets/images
+
+//= require_tree ../images
+//= link bento/header-logo.png
+
+//= link_directory ../../../../assets/javascripts .js
+//= require_directory ../javascripts
+//= link_directory ../../../../assets/stylesheets .css
+//= require_directory ../stylesheets

app/themes/bento/assets/stylesheets/bento/bootstrap_overrides.scss

@@ -66,7 +66,7 @@ h2 small { font-size: $font-size-base * 1.20; }
 #main, .well {
   background-color: $well-bg;
   padding: $bentoWellPadding;
-  padding-top: 0px;
+  padding-top: 0!important;
   border: 1px solid $bentoWellBorderColor;
   border-radius:$border-radius-base;
   box-shadow: 0px 1px 3px $bentoShadowColor;
@@ -97,7 +97,7 @@ h2 small { font-size: $font-size-base * 1.20; }
       text-transform: none;
       font-size: $font-size-base;
       font-weight: bold;
-      margin: 1px -14px 5px;
+      margin: 1px -24px 5px;
       border-bottom: 1px solid $bentoWellBorderColor;
     }
   }
@@ -162,7 +162,7 @@ input[type="color"],
 .breadcrumb {
   background:transparent image-url('bento/home_grey.png') no-repeat;
   margin: 0px;
-  padding: 0px 0px 0px 20px;
+  padding: 0px 0px 0px 20px!important;
 
   li {
     color: $gray-darker;

config/application.rb

@@ -55,8 +55,5 @@ class Application < Rails::Application
 
     # The configuration file for the application
     config.site = config_for(:site)
-
-    # Assets precompilation for the themes
-    config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
   end
 end

config/initializers/config.rb

@@ -1,7 +1,8 @@
 ActionMailer::Base.default_url_options = Rails.configuration.site['email_default_url_options'].symbolize_keys
 
 if theme = Rails.configuration.site['theme']
-  path = "#{Rails.root}/app/themes/#{theme}/"
-  ActionController::Base.prepend_view_path "#{path}views"
-  Rails.application.config.assets.paths.unshift "#{path}assets/images", "#{path}assets/javascripts", "#{path}assets/stylesheets"
+  path = Rails.root.join('app/themes', theme)
+  ActionController::Base.prepend_view_path path.join('views')
+  Rails.application.config.assets.paths.unshift path.join('assets/images'), path.join('assets/javascripts'), path.join('assets/stylesheets')
+  Sprockets.prepend_path(path.join('assets/config'))
 end