FIX: display label when theme uses default color scheme
This commit is contained in:
parent
1a7391a251
commit
328ad921fb
|
@ -1,3 +1,4 @@
|
|||
import I18n from "I18n";
|
||||
import ComboBoxComponent from "select-kit/components/combo-box";
|
||||
|
||||
export default ComboBoxComponent.extend({
|
||||
|
@ -6,5 +7,9 @@ export default ComboBoxComponent.extend({
|
|||
|
||||
modifyComponentForRow() {
|
||||
return "color-palettes/color-palettes-row";
|
||||
},
|
||||
|
||||
selectKitOptions: {
|
||||
translatedNone: I18n.t("admin.customize.theme.default_light_scheme")
|
||||
}
|
||||
});
|
||||
|
|
|
@ -135,7 +135,7 @@ class Admin::ThemesController < Admin::AdminController
|
|||
theme_fields: :upload
|
||||
)
|
||||
@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)
|
||||
|
||||
payload = {
|
||||
|
|
|
@ -3647,7 +3647,7 @@ en:
|
|||
use_global_key: Global Key (allows all actions)
|
||||
scopes:
|
||||
description: |
|
||||
When using scopes, you can restrict an API key to a specific set of endpoints.
|
||||
When using scopes, you can restrict an API key to a specific set of endpoints.
|
||||
You can also define which parameters will be allowed. Use commas to separate multiple values.
|
||||
title: Scopes
|
||||
resource: Resource
|
||||
|
@ -3909,6 +3909,7 @@ en:
|
|||
is_default: "Theme is enabled by default"
|
||||
user_selectable: "Theme can be selected by users"
|
||||
color_scheme: "Color Palette"
|
||||
default_light_scheme: "Light (default)"
|
||||
color_scheme_select: "Select colors to be used by theme"
|
||||
custom_sections: "Custom sections:"
|
||||
theme_components: "Theme Components"
|
||||
|
|
|
@ -3872,6 +3872,7 @@ en:
|
|||
color_schemes:
|
||||
base_theme_name: "Base"
|
||||
light: "Light"
|
||||
light_default: "Light (default)"
|
||||
dark: "Dark"
|
||||
neutral: "Neutral"
|
||||
grey_amber: "Grey Amber"
|
||||
|
|
Loading…
Reference in New Issue