Skip to content

Commit

Permalink
Revert "Remove fallback color scheme info text (Shopify#2602)"
Browse files Browse the repository at this point in the history 
This reverts commit 70c98c6.
  • Loading branch information
Jonas Abrahams committed Jun 6, 2023
1 parent 211cd2b commit 4d7cf47
Show file tree
Hide file tree
Showing 22 changed files with 514 additions and 97 deletions.
127 changes: 72 additions & 55 deletions config/settings_schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,61 +37,78 @@
"name": "t:settings_schema.colors.name",
"settings": [
{
"type": "color_scheme_group",
"id": "color_schemes",
"definition": [
{
"type": "color",
"id": "background",
"label": "t:settings_schema.colors.settings.background.label"
},
{
"type": "color_background",
"id": "background_gradient",
"label": "t:settings_schema.colors.settings.background_gradient.label",
"info": "t:settings_schema.colors.settings.background_gradient.info"
},
{
"type": "color",
"id": "text",
"label": "t:settings_schema.colors.settings.text.label"
},
{
"type": "color",
"id": "button",
"label": "t:settings_schema.colors.settings.button_background.label"
},
{
"type": "color",
"id": "button_label",
"label": "t:settings_schema.colors.settings.button_label.label"
},
{
"type": "color",
"id": "secondary_button_label",
"label": "t:settings_schema.colors.settings.secondary_button_label.label"
},
{
"type": "color",
"id": "shadow",
"label": "t:settings_schema.colors.settings.shadow.label"
}
],
"role": {
"text": "text",
"background": {
"solid": "background",
"gradient": "background_gradient"
},
"links": "secondary_button_label",
"icons": "text",
"primary_button": "button",
"on_primary_button": "button_label",
"primary_button_border": "button",
"secondary_button": "background",
"on_secondary_button": "secondary_button_label",
"secondary_button_border": "secondary_button_label"
}
"type": "header",
"content": "t:settings_schema.colors.settings.header__1.content"
},
{
"type": "color",
"id": "colors_solid_button_labels",
"default": "#FFFFFF",
"label": "t:settings_schema.colors.settings.colors_solid_button_labels.label",
"info": "t:settings_schema.colors.settings.colors_solid_button_labels.info"
},
{
"type": "color",
"id": "colors_accent_1",
"default": "#121212",
"label": "t:settings_schema.colors.settings.colors_accent_1.label",
"info": "t:settings_schema.colors.settings.colors_accent_1.info"
},
{
"id": "gradient_accent_1",
"type": "color_background",
"label": "t:settings_schema.colors.settings.gradient_accent_1.label"
},
{
"type": "color",
"id": "colors_accent_2",
"default": "#334FB4",
"label": "t:settings_schema.colors.settings.colors_accent_2.label"
},
{
"id": "gradient_accent_2",
"type": "color_background",
"label": "t:settings_schema.colors.settings.gradient_accent_2.label"
},
{
"type": "header",
"content": "t:settings_schema.colors.settings.header__2.content"
},
{
"type": "color",
"id": "colors_text",
"default": "#121212",
"label": "t:settings_schema.colors.settings.colors_text.label",
"info": "t:settings_schema.colors.settings.colors_text.info"
},
{
"type": "color",
"id": "colors_outline_button_labels",
"default": "#121212",
"label": "t:settings_schema.colors.settings.colors_outline_button_labels.label",
"info": "t:settings_schema.colors.settings.colors_outline_button_labels.info"
},
{
"type": "color",
"id": "colors_background_1",
"default": "#FFFFFF",
"label": "t:settings_schema.colors.settings.colors_background_1.label"
},
{
"id": "gradient_background_1",
"type": "color_background",
"label": "t:settings_schema.colors.settings.gradient_background_1.label"
},
{
"type": "color",
"id": "colors_background_2",
"default": "#F3F3F3",
"label": "t:settings_schema.colors.settings.colors_background_2.label"
},
{
"id": "gradient_background_2",
"type": "color_background",
"label": "t:settings_schema.colors.settings.gradient_background_2.label"
}
]
},
Expand Down
23 changes: 21 additions & 2 deletions locales/cs.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,27 @@
"label": "Text",
"info": "Používá se jako barva popředí v kombinaci s barvami pozadí."
},
"shadow": {
"label": "Stín"
"colors_outline_button_labels": {
"label": "Tlačítko s obrysem",
"info": "Používá se také pro textové odkazy."
},
"colors_background_1": {
"label": "Pozadí 1"
},
"colors_background_2": {
"label": "Pozadí 2"
},
"gradient_accent_1": {
"label": "Přechod 1 zvýraznění"
},
"gradient_accent_2": {
"label": "Přechod 2 zvýraznění"
},
"gradient_background_1": {
"label": "Přechod 1 pozadí"
},
"gradient_background_2": {
"label": "Přechod 2 pozadí"
}
}
},
Expand Down
23 changes: 21 additions & 2 deletions locales/da.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,27 @@
"label": "Tekstfarve",
"info": "Bruges som forgrundsfarve på baggrundsfarver."
},
"shadow": {
"label": "Skygge"
"colors_outline_button_labels": {
"label": "Rammeknap",
"info": "Bruges også til tekstlinks."
},
"colors_background_1": {
"label": "Baggrund 1"
},
"colors_background_2": {
"label": "Baggrund 2"
},
"gradient_accent_1": {
"label": "Markering 1 – graduering"
},
"gradient_accent_2": {
"label": "Markering 2 – graduering"
},
"gradient_background_1": {
"label": "Baggrund 1 – graduering"
},
"gradient_background_2": {
"label": "Baggrund 2 – graduering"
}
}
},
Expand Down
23 changes: 21 additions & 2 deletions locales/de.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,27 @@
"label": "Text",
"info": "Wird als Vordergrundfarbe für Hintergrundfarben verwendet."
},
"shadow": {
"label": "Schatten"
"colors_outline_button_labels": {
"label": "Umriss-Schaltfläche",
"info": "Wird auch für Textlinks verwendet."
},
"colors_background_1": {
"label": "Hintergrund 1"
},
"colors_background_2": {
"label": "Hintergrund 2"
},
"gradient_accent_1": {
"label": "Akzent 1 Farbverlauf"
},
"gradient_accent_2": {
"label": "Akzent 2 Farbverlauf"
},
"gradient_background_1": {
"label": "Hintergrund 1 Farbverlauf"
},
"gradient_background_2": {
"label": "Hintergrund 2 Farbverlauf"
}
}
},
Expand Down
24 changes: 22 additions & 2 deletions locales/en.default.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,28 @@
"header__1": {
"content": "Primary colors"
},
"shadow": {
"label": "Shadow"
"header__2": {
"content": "Secondary colors"
},
"colors_text": {
"label": "Text",
"info": "Used as foreground color on background colors."
},
"colors_outline_button_labels": {
"label": "Outline button",
"info": "Also used for text links."
},
"colors_background_1": {
"label": "Background 1"
},
"gradient_background_1": {
"label": "Background 1 gradient"
},
"colors_background_2": {
"label": "Background 2"
},
"gradient_background_2": {
"label": "Background 2 gradient"
}
}
},
Expand Down
23 changes: 21 additions & 2 deletions locales/es.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,27 @@
"label": "Texto",
"info": "Se utiliza como color de primer plano sobre los colores de fondo."
},
"shadow": {
"label": "Sombra"
"colors_outline_button_labels": {
"label": "Botón con contorno",
"info": "También se utiliza para enlaces de texto."
},
"colors_background_1": {
"label": "Fondo 1"
},
"colors_background_2": {
"label": "Fondo 2"
},
"gradient_accent_1": {
"label": "Degradado resaltado 1"
},
"gradient_accent_2": {
"label": "Degradado resaltado 2"
},
"gradient_background_1": {
"label": "Degradado de fondo 1"
},
"gradient_background_2": {
"label": "Degradado de fondo 2"
}
}
},
Expand Down
23 changes: 21 additions & 2 deletions locales/fi.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,27 @@
"label": "Teksti",
"info": "Käytetään taustavärien edustavärinä."
},
"shadow": {
"label": "Varjo"
"colors_outline_button_labels": {
"label": "Kehyspainike",
"info": "Käytetään myös tekstilinkeissä."
},
"colors_background_1": {
"label": "Tausta 1"
},
"colors_background_2": {
"label": "Tausta 2"
},
"gradient_accent_1": {
"label": "Korostus 1 liukuväri"
},
"gradient_accent_2": {
"label": "Korostus 2 liukuväri"
},
"gradient_background_1": {
"label": "Tausta 1 liukuväri"
},
"gradient_background_2": {
"label": "Tausta 2 liukuväri"
}
}
},
Expand Down
23 changes: 21 additions & 2 deletions locales/fr.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,27 @@
"label": "Texte",
"info": "Utilisé comme couleur de premier plan sur les couleurs d'arrière-plan."
},
"shadow": {
"label": "Ombre"
"colors_outline_button_labels": {
"label": "Bouton en relief",
"info": "Utilisé également pour les liens de texte."
},
"colors_background_1": {
"label": "Arrière-plan 1"
},
"colors_background_2": {
"label": "Arrière-plan 2"
},
"gradient_accent_1": {
"label": "Dégradé accent 1"
},
"gradient_accent_2": {
"label": "Dégradé accent 2"
},
"gradient_background_1": {
"label": "Dégradé arrière-plan 1"
},
"gradient_background_2": {
"label": "Dégradé arrière-plan 2"
}
}
},
Expand Down
23 changes: 21 additions & 2 deletions locales/it.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,27 @@
"label": "Testo",
"info": "Utilizzato come colore in primo piano sui colori dello sfondo."
},
"shadow": {
"label": "Ombra"
"colors_outline_button_labels": {
"label": "Contorno pulsante",
"info": "Anche utilizzato per i link testuali."
},
"colors_background_1": {
"label": "Sfondo 1"
},
"colors_background_2": {
"label": "Sfondo 2"
},
"gradient_accent_1": {
"label": "Gradiente Elemento in risalto 1"
},
"gradient_accent_2": {
"label": "Gradiente Elemento in risalto 2"
},
"gradient_background_1": {
"label": "Gradiente Sfondo 1"
},
"gradient_background_2": {
"label": "Gradiente Sfondo 2"
}
}
},
Expand Down
Loading

0 comments on commit 4d7cf47

Please sign in to comment.