IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: emails should use default theme colors

Browse Source
This commit is contained in:
Neil Lalonde
2017-05-03 14:35:13 -04:00
parent e38014772b
commit 389a0e1a1c
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/color_scheme.rb
View File

@@ -112,15 +112,8 @@ class ColorScheme < ActiveRecord::Base
end
def self.lookup_hex_for_name(name)
Discourse.plugin_themes.each do |pt|
if pt.color_scheme
found = pt.color_scheme[name.to_sym]
return found if found
end
end
# Can't use `where` here because base doesn't allow it
(base).colors.find {|c| c.name == name }.try(:hex) || :nil
enabled_color_scheme = Theme.where(key: SiteSetting.default_theme_key).first&.color_scheme
(enabled_color_scheme || base).colors.find {|c| c.name == name }.try(:hex) || :nil
end
def self.hex_for_name(name)