diff --git a/app/soapbox/actions/soapbox.js b/app/soapbox/actions/soapbox.js index d85bd0f0ff..cc266aeb38 100644 Binary files a/app/soapbox/actions/soapbox.js and b/app/soapbox/actions/soapbox.js differ diff --git a/app/soapbox/containers/soapbox.js b/app/soapbox/containers/soapbox.js index 301de4c015..c08e643a6a 100644 Binary files a/app/soapbox/containers/soapbox.js and b/app/soapbox/containers/soapbox.js differ diff --git a/app/soapbox/features/soapbox_config/components/site_preview.js b/app/soapbox/features/soapbox_config/components/site_preview.js index a516046957..5d67494526 100644 Binary files a/app/soapbox/features/soapbox_config/components/site_preview.js and b/app/soapbox/features/soapbox_config/components/site_preview.js differ diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js index 5ec7f0b399..1b3fb51d3d 100644 Binary files a/app/soapbox/features/soapbox_config/index.js and b/app/soapbox/features/soapbox_config/index.js differ diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index 470bac41b5..d26164d620 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -856,6 +856,7 @@ "soapbox_config.crypto_donate_panel_limit.meta_fields.limit_placeholder": "Liczba elementów do wyświetlenia w widżecie krypto na stronie głównej", "soapbox_config.custom_css.meta_fields.url_placeholder": "Adres URL", "soapbox_config.display_fqn_label": "Wyświetlaj domenę (np. @użytkownik@domena) dla lokalnych kont.", + "soapbox_config.fields.accent_color_label": "Kolor akcentu", "soapbox_config.fields.brand_color_label": "Kolor marki", "soapbox_config.fields.crypto_address.add": "Dodaj nowy adres krypto", "soapbox_config.fields.crypto_addresses_label": "Adresy kryptowalut", diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json index 47b9144911..1ab59de143 100644 --- a/app/soapbox/locales/uk.json +++ b/app/soapbox/locales/uk.json @@ -844,6 +844,7 @@ "soapbox_config.crypto_donate_panel_limit.meta_fields.limit_placeholder": "Number of items to display in the crypto homepage widget", "soapbox_config.custom_css.meta_fields.url_placeholder": "URL", "soapbox_config.display_fqn_label": "Display domain (eg @user@domain) for local accounts.", + "soapbox_config.fields.accent_color_label": "Акцентний колір", "soapbox_config.fields.brand_color_label": "Brand color", "soapbox_config.fields.crypto_address.add": "Add new crypto address", "soapbox_config.fields.crypto_addresses_label": "Cryptocurrency addresses", diff --git a/app/soapbox/utils/theme.js b/app/soapbox/utils/theme.js index b398145bf2..1b3c85dfe7 100644 Binary files a/app/soapbox/utils/theme.js and b/app/soapbox/utils/theme.js differ diff --git a/app/styles/forms.scss b/app/styles/forms.scss index 64ab2fb4d1..53551941a8 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -418,6 +418,10 @@ code { margin-bottom: 10px; margin-right: 10px; + &#accent_color { + background: var(--accent-color); + } + &:last-child { margin-right: 0; } @@ -510,7 +514,7 @@ code { .label_input { &__color { - display: inline-flex; + display: flex; font-size: 14px; .color-swatch { diff --git a/app/styles/themes.scss b/app/styles/themes.scss index 032f8ce4db..de6a6b1bff 100644 --- a/app/styles/themes.scss +++ b/app/styles/themes.scss @@ -41,9 +41,6 @@ body, --background-color_hsl: var(--background-color_h), var(--background-color_s), var(--background-color_l); --foreground-color_hsl: var(--foreground-color_h), var(--foreground-color_s), var(--foreground-color_l); --warning-color_hsl: var(--warning-color_h), var(--warning-color_s), var(--warning-color_l); - --accent-color_h: calc(var(--brand-color_h) - 15); - --accent-color_s: 86%; - --accent-color_l: 44%; // Modifiers --brand-color--faint: hsla(var(--brand-color_hsl), 0.1);