Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: revert button on all colors in a new color scheme

This commit is contained in:
Neil Lalonde 2014-05-14 10:17:20 -04:00
parent 4980cff802
commit eb7aab3e0b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/models/color_scheme.js
View File

@ -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;
},

2
app/assets/stylesheets/desktop.scss
View File

@ -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";

3
app/assets/stylesheets/mobile.scss
View File

@ -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";