From eb7aab3e0b387588b05f9dc7ecfbe940c37fcda4 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 14 May 2014 10:17:20 -0400 Subject: [PATCH] FIX: revert button on all colors in a new color scheme --- app/assets/javascripts/admin/models/color_scheme.js | 2 +- app/assets/stylesheets/desktop.scss | 2 +- app/assets/stylesheets/mobile.scss | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/models/color_scheme.js b/app/assets/javascripts/admin/models/color_scheme.js index 6735e75e4..1b85df9f9 100644 --- a/app/assets/javascripts/admin/models/color_scheme.js +++ b/app/assets/javascripts/admin/models/color_scheme.js @@ -27,7 +27,7 @@ Discourse.ColorScheme = Discourse.Model.extend(Ember.Copyable, { copy: function() { var newScheme = Discourse.ColorScheme.create({name: this.get('name'), enabled: false, can_edit: true, colors: Em.A()}); _.each(this.get('colors'), function(c){ - newScheme.colors.pushObject(Discourse.ColorSchemeColor.create({name: c.get('name'), hex: c.get('hex')})); + newScheme.colors.pushObject(Discourse.ColorSchemeColor.create({name: c.get('name'), hex: c.get('hex'), default_hex: c.get('default_hex')})); }); return newScheme; }, diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss index f6f3a00c8..05eefb4bc 100644 --- a/app/assets/stylesheets/desktop.scss +++ b/app/assets/stylesheets/desktop.scss @@ -1,6 +1,6 @@ @import "common"; -/* @import "desktop/*"; I don't know why this doesn't work. */ +/* @import "desktop/*"; TODO: get this working again */ @import "desktop/compose"; @import "desktop/discourse"; diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss index 50eaedc6f..e01438a4f 100644 --- a/app/assets/stylesheets/mobile.scss +++ b/app/assets/stylesheets/mobile.scss @@ -1,5 +1,6 @@ @import "common"; -/* @import "mobile/*"; I don't know why this doesn't work */ + +/* @import "mobile/*"; TODO: get this working again */ @import "mobile/compose"; @import "mobile/discourse";