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: display label when theme uses default color scheme

Browse Source
This commit is contained in:
Penar Musaraj 2020-08-18 21:11:15 -04:00
parent 1a7391a251
commit 328ad921fb
No known key found for this signature in database
GPG Key ID: E390435D881FF0F7
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/select-kit/addon/components/color-palettes.js
View File

@ -1,3 +1,4 @@
import I18n from "I18n";
import ComboBoxComponent from "select-kit/components/combo-box"; import ComboBoxComponent from "select-kit/components/combo-box";
export default ComboBoxComponent.extend({ export default ComboBoxComponent.extend({
@ -6,5 +7,9 @@ export default ComboBoxComponent.extend({
modifyComponentForRow() { modifyComponentForRow() {
return "color-palettes/color-palettes-row"; return "color-palettes/color-palettes-row";
},
selectKitOptions: {
translatedNone: I18n.t("admin.customize.theme.default_light_scheme")
} }
}); });

2
app/controllers/admin/themes_controller.rb
View File

@ -135,7 +135,7 @@ class Admin::ThemesController < Admin::AdminController
theme_fields: :upload theme_fields: :upload
) )
@color_schemes = ColorScheme.all.includes(:theme, color_scheme_colors: :color_scheme).to_a @color_schemes = ColorScheme.all.includes(:theme, color_scheme_colors: :color_scheme).to_a
light = ColorScheme.new(name: I18n.t("color_schemes.light")) light = ColorScheme.new(name: I18n.t("color_schemes.light_default"))
@color_schemes.unshift(light) @color_schemes.unshift(light)
payload = { payload = {

1
config/locales/client.en.yml
View File

@ -3909,6 +3909,7 @@ en:
is_default: "Theme is enabled by default" is_default: "Theme is enabled by default"
user_selectable: "Theme can be selected by users" user_selectable: "Theme can be selected by users"
color_scheme: "Color Palette" color_scheme: "Color Palette"
default_light_scheme: "Light (default)"
color_scheme_select: "Select colors to be used by theme" color_scheme_select: "Select colors to be used by theme"
custom_sections: "Custom sections:" custom_sections: "Custom sections:"
theme_components: "Theme Components" theme_components: "Theme Components"

1
config/locales/server.en.yml
View File

@ -3872,6 +3872,7 @@ en:
color_schemes: color_schemes:
base_theme_name: "Base" base_theme_name: "Base"
light: "Light" light: "Light"
light_default: "Light (default)"
dark: "Dark" dark: "Dark"
neutral: "Neutral" neutral: "Neutral"
grey_amber: "Grey Amber" grey_amber: "Grey Amber"