From fc0c5495566813e7e230a81cb29ced2e17c16336 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 15 Jan 2015 10:47:34 +0100 Subject: [PATCH] Create separate stylesheets for dashboard and the rest --- Assetfile | 7 ++++++- assets/scripts/app/routes/dashboard.coffee | 9 ++++++++- assets/scripts/app/templates/dashboard.hbs | 2 +- assets/scripts/travis.coffee | 15 +++++++++++++++ assets/styles/app/_mixins/all.sass | 2 +- assets/styles/app/forms.scss | 2 +- assets/styles/dashboard/dashboard.scss | 3 +++ public/index.html | 3 ++- public/styles/dashboard.css | 4 ++++ 9 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 assets/styles/dashboard/dashboard.scss create mode 100644 public/styles/dashboard.css diff --git a/Assetfile b/Assetfile index 60e700a4..200eff3b 100644 --- a/Assetfile +++ b/Assetfile @@ -71,10 +71,15 @@ end output 'public/styles' input assets.styles do - match '**/*.{scss,sass,css}' do + match 'app/**/*.{scss,sass,css}' do sass assets.production? ? { style: :compressed } : {} concat assets.styles_order, ['app.css'] end + + match 'dashboard/**/*.{scss,sass,css}' do + sass assets.production? ? { style: :compressed } : {} + concat assets.styles_order, ['dashboard.css'] + end end output 'public/images' diff --git a/assets/scripts/app/routes/dashboard.coffee b/assets/scripts/app/routes/dashboard.coffee index 114efe6c..0921fd09 100644 --- a/assets/scripts/app/routes/dashboard.coffee +++ b/assets/scripts/app/routes/dashboard.coffee @@ -2,6 +2,13 @@ require 'routes/route' TravisRoute = Travis.Route -Route = TravisRoute.extend() +Route = TravisRoute.extend + activate: -> + @get('stylesheetsManager').disable('main') + @get('stylesheetsManager').enable('dashboard') + + deactivate: -> + @get('stylesheetsManager').enable('main') + @get('stylesheetsManager').disable('dashboard') Travis.DashboardRoute = Route diff --git a/assets/scripts/app/templates/dashboard.hbs b/assets/scripts/app/templates/dashboard.hbs index 13a665c5..76de1c7a 100644 --- a/assets/scripts/app/templates/dashboard.hbs +++ b/assets/scripts/app/templates/dashboard.hbs @@ -1 +1 @@ -DASHBOARD GOES HERE! +

DASHBOARD GOES HERE!

diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index eb0ee6d0..63ddb0f4 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -190,6 +190,21 @@ Travis.initializer application.inject('route', 'pusher', 'pusher:main') +stylesheetsManager = Ember.Object.create + enable: (id) -> + $("##{id}").removeAttr('disabled') + + disable: (id) -> + $("##{id}").attr('disabled', 'disabled') + +Travis.initializer + name: 'inject-stylesheets-manager' + + initialize: (container, application) -> + application.register 'stylesheetsManager:main', stylesheetsManager, { instantiate: false } + + application.inject('route', 'stylesheetsManager', 'stylesheetsManager:main') + Travis.Router.reopen didTransition: -> @_super.apply @, arguments diff --git a/assets/styles/app/_mixins/all.sass b/assets/styles/app/_mixins/all.sass index fe9eb854..b62bcfeb 100644 --- a/assets/styles/app/_mixins/all.sass +++ b/assets/styles/app/_mixins/all.sass @@ -1,4 +1,4 @@ -@import "app/compass" +@import "compass" @import "app/_mixins/colors" @import "app/_mixins/fonts" diff --git a/assets/styles/app/forms.scss b/assets/styles/app/forms.scss index af3d6c30..5b25d75f 100644 --- a/assets/styles/app/forms.scss +++ b/assets/styles/app/forms.scss @@ -1,4 +1,4 @@ -@import "app/compass"; +@import "compass"; .pro { form.subscription-form { diff --git a/assets/styles/dashboard/dashboard.scss b/assets/styles/dashboard/dashboard.scss new file mode 100644 index 00000000..df030d25 --- /dev/null +++ b/assets/styles/dashboard/dashboard.scss @@ -0,0 +1,3 @@ +h1 { + color: #A80000; +} diff --git a/public/index.html b/public/index.html index 673b0ae0..9b0035b2 100644 --- a/public/index.html +++ b/public/index.html @@ -23,7 +23,8 @@ - + +