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: use current user color scheme when filling theme-color attribute (#6384)

Browse Source 
* FIX: use current user color scheme when filling `meta` attribute `theme-color`

* update manifest.webmanifest colors
This commit is contained in:
Osama Sayegh
2018-09-12 04:04:58 +03:00
committed by Sam
parent f1cb431968
commit 16bd3f2cf2
6 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/color_scheme.rb
View File

@@ -186,14 +186,16 @@ class ColorScheme < ActiveRecord::Base
new_color_scheme
end
def self.lookup_hex_for_name(name)
enabled_color_scheme = Theme.where(id: SiteSetting.default_theme_id).first&.color_scheme
def self.lookup_hex_for_name(name, scheme_id = nil)
enabled_color_scheme = find_by(id: scheme_id) if scheme_id
enabled_color_scheme ||= Theme.where(id: SiteSetting.default_theme_id).first&.color_scheme
(enabled_color_scheme || base).colors.find { |c| c.name == name }.try(:hex) || "nil"
end
def self.hex_for_name(name)
hex_cache[name] ||= lookup_hex_for_name(name)
hex_cache[name] == "nil" ? nil : hex_cache[name]
def self.hex_for_name(name, scheme_id = nil)
cache_key = scheme_id ? name + "_#{scheme_id}" : name
hex_cache[cache_key] ||= lookup_hex_for_name(name, scheme_id)
hex_cache[cache_key] == "nil" ? nil : hex_cache[cache_key]
end
def colors=(arr)