From 38ea058afc8816e5fc735445a3c0e59df1381228 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Thu, 4 Oct 2012 00:20:17 +0200 Subject: [PATCH] fix assets order --- AssetFile | 4 ++-- Gemfile.lock | 2 +- assets/scripts/app/templates/layouts/profile.hbs | 4 ++++ assets/scripts/app/views.coffee | 4 ++-- assets/styles/maximize.sass | 1 - public/scripts/app.js | 2 +- public/scripts/app.min.js | 2 +- public/styles/app.css | 1 - public/version | 2 +- 9 files changed, 12 insertions(+), 10 deletions(-) diff --git a/AssetFile b/AssetFile index 957f15b4..e92d0adc 100644 --- a/AssetFile +++ b/AssetFile @@ -4,10 +4,10 @@ require 'rake-pipeline-web-filters' require 'rake-pipeline/travis' require 'compass' -roots ||= [Pathname.new(File.expand_path('.'))] +ROOTS ||= [Pathname.new(File.expand_path('.'))] paths = %w(styles scripts images static vendor).inject({}) do |paths, type| - paths.merge(type.to_sym => roots.map { |root| root.join("assets/#{type}").to_s }) + paths.merge(type.to_sym => ROOTS.map { |root| root.join("assets/#{type}").to_s }) end Compass.configuration.images_path = paths[:images].first diff --git a/Gemfile.lock b/Gemfile.lock index 5cef6770..7efe3812 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -60,7 +60,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: c40cee1a6d66d0cc18034e6e5e90c335349ead97 + revision: 9fccbb2ccf1ecfacf146e397eeac1c9c6e443e42 branch: sf-travis-api specs: travis-core (0.0.1) diff --git a/assets/scripts/app/templates/layouts/profile.hbs b/assets/scripts/app/templates/layouts/profile.hbs index 72205db7..49c4195d 100644 --- a/assets/scripts/app/templates/layouts/profile.hbs +++ b/assets/scripts/app/templates/layouts/profile.hbs @@ -12,6 +12,10 @@