From 5b3f7c1cdccfe4aded1a8a1688ee9e67f568ee71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= <git@mkljczk.pl>
Date: Thu, 24 Feb 2022 18:28:52 +0100
Subject: [PATCH] Let accent color be configurable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 app/soapbox/actions/soapbox.js                | Bin 4049 -> 4070 bytes
 app/soapbox/containers/soapbox.js             | Bin 7326 -> 7425 bytes
 .../soapbox_config/components/site_preview.js | Bin 2069 -> 2099 bytes
 app/soapbox/features/soapbox_config/index.js  | Bin 23995 -> 24355 bytes
 app/soapbox/locales/pl.json                   |   1 +
 app/soapbox/locales/uk.json                   |   1 +
 app/soapbox/utils/theme.js                    | Bin 2232 -> 2823 bytes
 app/styles/forms.scss                         |   6 +++++-
 app/styles/themes.scss                        |   3 ---
 9 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/actions/soapbox.js b/app/soapbox/actions/soapbox.js
index d85bd0f0ff49a941a04195094e0ac3d32419fdf2..cc266aeb38a4d977085005b69c6cc8cae502a96e 100644
GIT binary patch
delta 29
kcmca8|4e>E2a7;ra&l^3iF1BVevy@ey1LHhW)?qg0I7Tm761SM

delta 12
TcmaDRe^Guz2g~NUES}r|B~}F5

diff --git a/app/soapbox/containers/soapbox.js b/app/soapbox/containers/soapbox.js
index 301de4c0151a07487554f6bfa7ea6820a6a70206..c08e643a6a8d45f0040e45e69b84fbe33b08acad 100644
GIT binary patch
delta 56
zcmbPd*=V)lCnukRLUMjyafw1=a&l^3$>g=1@{>Jyq}U+b%^x^dF>>fYB{xsy<`e_~
DMb;Cm

delta 17
ZcmZp)nrFG;C+B8=u7!-7|8lbk0suqM2EzaV

diff --git a/app/soapbox/features/soapbox_config/components/site_preview.js b/app/soapbox/features/soapbox_config/components/site_preview.js
index a5160469572723f9ea7ccf1da7587daffb774fed..5d6749452695e0d5da20570b488772aa8ea56852 100644
GIT binary patch
delta 65
zcmbO#uvuWjA?}il)ZA3({G9xv;*DoIn2`CC<Cx_|brg#86AO~^EA-M+OElCIlao{P
LN;a1<&u0MuKaChn

delta 41
ocmdliFjZi}A+DsN#Jm*e{G9xvjb}TUkhqf*nB_OmW}d+U09q#x<p2Nx

diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js
index 5ec7f0b399acc45825bc6c970522fe44cefb9821..1b3fb51d3d1fea68a4b5aa4560fc2395cb3fed9a 100644
GIT binary patch
delta 102
zcmdnJn{n|z#tmDQCkH9%@g^oGr{<N!C+Fwn7pYH9R1%%M!Iph;x0((cL}v0$B{?=n
qu%gL-luWoGqRt@YlRvsiOrBsY%I}<!n3tZa5v>l9++3>cW(5G&NhU7<

delta 18
acmZ3yk8$^I#tmDQC+Dm4Z`M)$ZV3QSst3*h

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 b398145bf2213d0efa5266e1177ddc6dd1d1e6e6..1b3c85dfe752dc1c28d4d8416a49166c2008205a 100644
GIT binary patch
delta 454
zcmdlX*e*69NKzxIC^0X^IX@@ANJk+tIXN}21kBN#7!%K{mz!FYo~i*6o;Y8c4^_#=
zT?*{}NP0r@Lo!lxQ(Y2E5*2I}aGI=OYo}1nrJ#_RrT{e>Vk1~^vLd@i5R#din$}!E
zwF(MFsU@XFc?zDnxuqqENja&$i3J)UQ$Ro+qCqzq<c;_Ybt{Do9aO2w6WJv=;R+|O
zXBQJwP^bl(4J1M4C+FuCmnc*#WK1?<cM8NbPC-|}&=g`Os%6DM%hWB*RMoLb=71zk
oOjOk;A7o#mQvwPcuvd#i@|}Z&@rBXkMh+8<;1@y-eo)W=0Gk7k@&Et;

delta 58
zcmZn{+aWk1h%2cmF)zhAKPSIvVs`vyMn-w|$&Wa@C)>002sj4^E7&R^6ilAUWx}j!
G%>@8Wwi46;

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);