From 4fae71a002fa3fc6aead4926ed693d85d3d8d261 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 15 Jan 2015 13:08:50 +0100 Subject: [PATCH] Add ordering to dashboard stylesheets --- Assetfile | 2 +- .../dashboard/{a_foundation.scss => foundation.scss} | 0 lib/travis/assets.rb | 7 ++++++- 3 files changed, 7 insertions(+), 2 deletions(-) rename assets/styles/dashboard/{a_foundation.scss => foundation.scss} (100%) diff --git a/Assetfile b/Assetfile index cbfe99c3..6420a780 100644 --- a/Assetfile +++ b/Assetfile @@ -79,7 +79,7 @@ input assets.styles do match 'dashboard/**/*.{scss,sass,css}' do sass assets.production? ? { style: :compressed } : {} - concat assets.styles_order, ['dashboard.css'] + concat assets.dashboard_styles_order, ['dashboard.css'] end end diff --git a/assets/styles/dashboard/a_foundation.scss b/assets/styles/dashboard/foundation.scss similarity index 100% rename from assets/styles/dashboard/a_foundation.scss rename to assets/styles/dashboard/foundation.scss diff --git a/lib/travis/assets.rb b/lib/travis/assets.rb index 6a009608..08f765e7 100644 --- a/lib/travis/assets.rb +++ b/lib/travis/assets.rb @@ -10,7 +10,8 @@ module Travis VENDOR_ORDER = %w(jquery.min minispade handlebars ember) PRODUCTION_VENDOR_ORDER = %w(jquery.min minispade handlebars ember.prod) SPEC_VENDOR_ORDER = %w(jasmine jasmine-html jasmine-runner sinon) - STYLES_ORDER = %w(main/tools) + STYLES_ORDER = %w(app/main/tools) + DASHBOARD_STYLES_ORDER = %w(dashboard/foundation) attr_reader :roots, :env @@ -40,6 +41,10 @@ module Travis STYLES_ORDER.map { |name| "#{name}.css" } end + def dashboard_styles_order + DASHBOARD_STYLES_ORDER.map { |name| "#{name}.css" } + end + def spec_vendor_order SPEC_VENDOR_ORDER.map { |name| "spec/vendor/#{name}.js" } end