namespace assets in vendor

Gemfile

@@ -32,7 +32,7 @@ gem 'flash_cookie_session', '~> 1.1.1'
 gem 'locomotive_liquid',    '2.2.2', :require => 'liquid'
 gem 'formtastic',           '~> 2.0.2'
 gem 'responders',           '~> 0.6.4'
-gem 'cells',                '~> 3.7.0'
+gem 'cells',                '~> 3.7.1'
 gem 'RedCloth',             '~> 4.2.8'
 gem 'sanitize',             '~> 2.0.3'
 gem 'highline',             '~> 1.6.2'
@@ -47,8 +47,7 @@ gem 'rubyzip'
 
 gem 'actionmailer-with-request', '~> 0.3.0', :require => 'actionmailer_with_request'
 gem 'httparty',             '~> 0.8.1'
-gem 'delayed_job',          '~> 3.0.0.pre4'
+gem 'delayed_job_mongoid',  '~> 1.0.8'
-gem 'delayed_job_mongoid',  '~> 1.0.7'
 gem 'SystemTimer',          :platforms => :ruby_18
 
 # The rest of the dependencies are for use when in the locomotive dev environment

Gemfile.lock

@@ -98,7 +98,7 @@ GEM
     carrierwave-mongoid (0.1.3)
       carrierwave (>= 0.5.6)
       mongoid (~> 2.1)
-    cells (3.7.0)
+    cells (3.7.1)
       actionpack (~> 3.0)
       railties (~> 3.0)
     childprocess (0.2.2)
@@ -119,13 +119,11 @@ GEM
       capybara (>= 1.1.1)
       cucumber (>= 1.1.1)
       nokogiri (>= 1.5.0)
-    daemons (1.0.10)
     database_cleaner (0.7.0)
-    delayed_job (3.0.0.pre4)
+    delayed_job (3.0.0)
       activesupport (~> 3.0)
-      daemons (= 1.0.10)
+    delayed_job_mongoid (1.0.8)
-    delayed_job_mongoid (1.0.7)
+      delayed_job (~> 3.0.0)
-      delayed_job (~> 3.0.0.pre)
       mongoid (>= 2.0)
     diff-lcs (1.1.3)
     dragonfly (0.9.8)
@@ -308,15 +306,14 @@ DEPENDENCIES
   cancan (~> 1.6.7)
   capybara
   carrierwave-mongoid (~> 0.1.3)
-  cells (~> 3.7.0)
+  cells (~> 3.7.1)
   codemirror-rails
   coffee-script (~> 2.2.0)
   compass!
   cucumber-rails
   custom_fields!
   database_cleaner
-  delayed_job (~> 3.0.0.pre4)
+  delayed_job_mongoid (~> 1.0.8)
-  delayed_job_mongoid (~> 1.0.7)
   devise!
   dragonfly (~> 0.9.8)
   factory_girl_rails (~> 1.1)

app/assets/javascripts/locomotive.js

@@ -17,7 +17,7 @@
 //= require codemirror/modes/javascript
 //= require codemirror/modes/xml
 //= require codemirror/modes/htmlmixed
-//= require_tree ../../../vendor/assets/javascripts
+//= require locomotive/vendor
 //= require ./locomotive/application
 
 $(document).ready(function() {

app/assets/stylesheets/locomotive.css

@@ -3,13 +3,12 @@
  * and any sub-directories. 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.
  *= require_self
-
+ *= require locomotive/blueprint/screen.css
- *= require ../../../vendor/assets/stylesheets/blueprint/screen.css
+ *= require locomotive/jquery
- *= require_tree ../../../vendor/assets/stylesheets/jquery
  *= require formtastic
  *= require codemirror
-  *= require codemirror/themes/default
+ *= require codemirror/themes/default
- *= require ../../../vendor/assets/stylesheets/toggle.css
+ *= require locomotive/toggle.css
- *= require ../../../vendor/assets/stylesheets/liquid_mode.css
+ *= require locomotive/liquid_mode.css
  *= require_tree ./locomotive
 */

app/assets/stylesheets/locomotive/codemirror_changes.scss

@@ -5,7 +5,7 @@
 
   margin-top: 13px;
 
-  font-size: 12px;
+  font-size: 13px;
   font-weight: normal;
 
   @include background-image(linear-gradient(top, #f0f0f0, #f9f9f9 4px, #f9f9f9 4px, #ffffff 12px, #ffffff));

app/assets/stylesheets/locomotive/ie.css

@@ -1,7 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. 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.
- *= require_self
- *= require ../../../../vendor/assets/stylesheets/blueprint/ie.css
-*/

app/assets/stylesheets/locomotive/not_logged_in.css

@@ -2,6 +2,6 @@
  * This is a manifest file that'll automatically include all the stylesheets available in this directory
  * and any sub-directories. 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.
- *= require ../../../../vendor/assets/stylesheets/blueprint/screen.css
+ *= require locomotive/blueprint/screen.css
  *= require ./simple.css
 */

app/views/locomotive/sitemaps/show.xml.builder

@@ -9,7 +9,6 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
   @pages.each do |page|
     if not page.index_or_not_found?
       if page.templatized?
-
         page.content_type.entries.visible.each do |c|
           xml.url do
             xml.loc page_url(page, { :content => c, :host => true })

vendor/assets/javascripts/locomotive/vendor.js

@@ -0,0 +1 @@
+//= require_tree .

vendor/assets/stylesheets/locomotive/jquery.css

@@ -0,0 +1,3 @@
+/*
+ *= require_tree ./jquery
+*/