From 396370b5aeaa152513b4fd4015e5c4b72e24eda3 Mon Sep 17 00:00:00 2001 From: Jonah Foster <81132130+JonahFoster@users.noreply.github.com> Date: Sat, 13 Jan 2024 10:47:19 -0500 Subject: [PATCH 1/4] Added a Nordic base theme --- .../theme-settings/theme-settings.js | 6 ++-- src/renderer/themes.css | 35 +++++++++++++++---- static/locales/en-US.yaml | 1 + 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/renderer/components/theme-settings/theme-settings.js b/src/renderer/components/theme-settings/theme-settings.js index 090a6dc8984cf..e3e9c95f7ceba 100644 --- a/src/renderer/components/theme-settings/theme-settings.js +++ b/src/renderer/components/theme-settings/theme-settings.js @@ -37,7 +37,8 @@ export default defineComponent({ 'dracula', 'catppuccinMocha', 'pastelPink', - 'hotPink' + 'hotPink', + 'nordic' ] } }, @@ -102,7 +103,8 @@ export default defineComponent({ this.$t('Settings.Theme Settings.Base Theme.Dracula'), this.$t('Settings.Theme Settings.Base Theme.Catppuccin Mocha'), this.$t('Settings.Theme Settings.Base Theme.Pastel Pink'), - this.$t('Settings.Theme Settings.Base Theme.Hot Pink') + this.$t('Settings.Theme Settings.Base Theme.Hot Pink'), + this.$t('Settings.Theme Settings.Base Theme.Nordic') ] }, diff --git a/src/renderer/themes.css b/src/renderer/themes.css index 0e6ddecf4a285..0e7aad5149de1 100644 --- a/src/renderer/themes.css +++ b/src/renderer/themes.css @@ -5,7 +5,8 @@ .dracula, .catppuccinMocha, .pastelPink, -.hotPink { +.hotPink, +.nordic { --primary-input-color: rgba(0, 0, 0, 0.50); } @@ -15,7 +16,8 @@ .dracula, .catppuccinMocha, .pastelPink, -.hotPink { +.hotPink, +.nordic { --link-color: var(--accent-color); --link-visited-color: var(--accent-color-visited); --instance-menu-color: var(--search-bar-color); @@ -27,7 +29,8 @@ .gray, .dracula, .catppuccinMocha, -.pastelPink { +.pastelPink, +.nordic { --primary-input-color: rgba(0, 0, 0, 0.50); --side-nav-hover-text-color: var(--primary-text-color); } @@ -37,7 +40,8 @@ .black, .gray, .dracula, -.catppuccinMocha { +.catppuccinMocha, +.nordic { --side-nav-active-text-color: var(--primary-text-color); --scrollbar-text-color-hover: var(--primary-text-color); @@ -46,7 +50,8 @@ .system[data-system-theme*='light'], .light, .system[data-system-theme*='dark'], .dark, .black, -.gray { +.gray, +.nordic { --logo-icon: url("../../_icons/iconColorSmall.png"); --logo-text: url("../../_icons/textColorSmall.png"); } @@ -56,7 +61,8 @@ .gray, .dracula, .catppuccinMocha, -.hotPink { +.hotPink, +.nordic { --primary-shadow-color: rgba(0, 0, 0, 0.75); } @@ -237,6 +243,23 @@ it can be safely elided. This looks quite pleasant on this theme. */ text-decoration: underline; } +.nordic { + --primary-text-color: #EEEEEE; + --secondary-text-color: #ddd; + --tertiary-text-color: #EEEEEE; + --title-color: #EEEEEE; + --bg-color: #2b2f3a; + --favorite-icon-color: #85a4c1; + --card-bg-color: #2e3440; + --secondary-card-bg-color: rgba(59, 66, 82, 0.75); + --scrollbar-color: #4b566a; + --scrollbar-color-hover: #4b566a; + --side-nav-color: #2e3440; + --side-nav-hover-color: #3b4252; + --side-nav-active-color: #3b4252; + --search-bar-color: #4b566a; +} + .mainRed, .mainPink, .mainPurple, diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml index cce1a5b867987..69192d627cc89 100644 --- a/static/locales/en-US.yaml +++ b/static/locales/en-US.yaml @@ -284,6 +284,7 @@ Settings: Catppuccin Mocha: Catppuccin Mocha Pastel Pink: Pastel Pink Hot Pink: Hot Pink + Nordic: Nordic Main Color Theme: Main Color Theme: Main Color Theme Red: Red From 1e3e316afb12e67b0f517197bc145157e9f2af5d Mon Sep 17 00:00:00 2001 From: Jonah Foster <81132130+JonahFoster@users.noreply.github.com> Date: Tue, 30 Jan 2024 13:53:11 -0500 Subject: [PATCH 2/4] Added Nordic icon --- _icons/iconNordicLightSmall.png | Bin 0 -> 559 bytes _icons/textNordicLightSmall.png | Bin 0 -> 2090 bytes src/renderer/themes.css | 5 +++-- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 _icons/iconNordicLightSmall.png create mode 100644 _icons/textNordicLightSmall.png diff --git a/_icons/iconNordicLightSmall.png b/_icons/iconNordicLightSmall.png new file mode 100644 index 0000000000000000000000000000000000000000..bbde3fca78a55e87ecef63cd15658245c1292789 GIT binary patch literal 559 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%3?x6Bmj(hU#^NA%C&rs6b?Si}&H|6fVg?31 zWe{epSZZGe6g(5)6XN;~6##`%1%?vu=9X9LKo7W-1o;Ig{rZ1VlVN$Kb%WR6de5sK zZcXY>vsztR+M3gJgo?RXyx%7aGTz9PzxL+?>m#jOU1AT5ewPUU`_#+UXnM0>M)8Hn zif^*2){}wet?_hm45^q?d;YpmlLL=KAkVQb-lL+ffd}vHzH$2h|H*xuc;2P#)wiDf zc|+$S7Y2vkB%T&K1_A#LhEv}?m$`WSUXid z&a5)Oz~{u{lI^tm?G6d8J<-c=Pv&r#ZzYTBGL(3hH_Rl)zKpC*j44?P8CkQ9CE12BN49xclYQTpks|xP zg)GqwWe-_Kqfp43_g}mpy64>Qo_oIE?)knOV~W=21_^-x006h40Sd!V9D@q%%#0}< zb}Y^iAReQy1EdVfhA|9>mw_c7008&=M_`H!SQr3cDmFF2>M@o(fAA-P|91lWjs2aB zOI`BCpv?iyiaLJ-x%DmXm`k5GFy@zEI66Ms{0uI9UFhzdXSC`W%Apy%h=Ie(Ww6%&S_S?{plY^H}v7|tIUn;h|ROVA`{;YUKP$0 zr+f(f(v1jqvAVH;{q+n9tS~2)B=@zw<#}b%4;$3CfhJi=uDgwoFQ_Nies}H~>U#rf zUS5jP4ZvjG%O!^8Jel=cjGFq3*K*U+K{WPuw zxK7@oBM%FIkG-8N;~)yXz@nO* zVvTF2q92Hm!Og<5Wq!a($LBCeNcidiSvT8S919x}l45+UHhsltd zs%eO4nV6D>|N9MzDfm!-@@F_t{OOUs6e}2PJ1Y`#Foe?L=S90=i z>F1LCX+UxDs#JNUF)2s`3$A9txo}*eu42_2w=>x%IdDD-fi?>DZ~uyn#X||uu_SMK z#|!gm8O2nm=vv=2T|uIQ?D7OWp~WuACH#<+R9QeF-jD0J)8`|eIG(q5NprxjAGb~? zH2j3U&@aN1nEF7m&kE4I7;DVe0@w-^mX_tqG9)AIlDsk{Q{oa+jxbb131aT)mZy@f zrY_8gx*6CvkLA~uA=_DRt~m#5%XHa3Qcawpu4${3hGfCX^_ARkt8&v0nQhgj*p8wOnB=}vZHDWZ*?kGJJJ?^A&Yg9 z?TvCm2+`FB0yRm=zT@cFJA~wVO^E1`&OSlym)o<4YLr7m zf-kM+U{mv-;WLa)ORR)^V*Ft*S?F`EQ(99Dq--ci9mZO4^5;an)Uyd1CdB7FOv=%nZ^9-k{l;Y_}-iSy(&y(;= zWYO?R#eGAYN2dPc^-MGVBRJ#&qPtpXAzeKbsUl{p-igyQMRSs@R!(|^m3&J@AAzR1 zWr(GG#_LgF51$jkgG0M5zo8s?_&Kf)82Ywk*?OpA-7K~yAmRqiTmd_I#R!I4{hSy< z%&c2i>6HU6ISHVzTemlOuYzo?cXBU2d#k+G6@4by1T!14frgtL=#(9K1S!+qK@^%1 z3Vcqq*M6=UL#bJ=pd|_o9i?mjc)`?@d^khseU+B2!qfhV-u?dgXgLW={^;e+(-Fq+CQF$mnx6tU XajFuU^i)MgQ34G0(5Px1yNG`Q&?OlO literal 0 HcmV?d00001 diff --git a/src/renderer/themes.css b/src/renderer/themes.css index 0e7aad5149de1..c4c202d08370c 100644 --- a/src/renderer/themes.css +++ b/src/renderer/themes.css @@ -50,8 +50,7 @@ .system[data-system-theme*='light'], .light, .system[data-system-theme*='dark'], .dark, .black, -.gray, -.nordic { +.gray { --logo-icon: url("../../_icons/iconColorSmall.png"); --logo-text: url("../../_icons/textColorSmall.png"); } @@ -258,6 +257,8 @@ it can be safely elided. This looks quite pleasant on this theme. */ --side-nav-hover-color: #3b4252; --side-nav-active-color: #3b4252; --search-bar-color: #4b566a; + --logo-icon: url("../../_icons/iconNordicLightSmall.png"); + --logo-text: url("../../_icons/textNordicLightSmall.png"); } .mainRed, From f89779f31fe80593f464911d45595e4e7d6822e4 Mon Sep 17 00:00:00 2001 From: Jonah Foster <81132130+JonahFoster@users.noreply.github.com> Date: Thu, 1 Feb 2024 07:49:35 -0500 Subject: [PATCH 3/4] Added Nordic theme to switch --- src/main/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/index.js b/src/main/index.js index 23b561cee10b4..2f8944c88df09 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -493,6 +493,8 @@ function runApp() { return '#ffd1dc' case 'hot-pink': return '#de1c85' + case 'nordic': + return '#2b2f3a' case 'system': default: return nativeTheme.shouldUseDarkColors ? '#212121' : '#f1f1f1' From 94eb618f3176ce1fe10b4beee981ffe075ba8d05 Mon Sep 17 00:00:00 2001 From: JonahFoster <81132130+JonahFoster@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:20:52 -0500 Subject: [PATCH 4/4] Update src/renderer/themes.css Co-authored-by: Jason <84899178+jasonhenriquez@users.noreply.github.com> --- src/renderer/themes.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/themes.css b/src/renderer/themes.css index c4c202d08370c..fd100cc5f5f2f 100644 --- a/src/renderer/themes.css +++ b/src/renderer/themes.css @@ -248,7 +248,7 @@ it can be safely elided. This looks quite pleasant on this theme. */ --tertiary-text-color: #EEEEEE; --title-color: #EEEEEE; --bg-color: #2b2f3a; - --favorite-icon-color: #85a4c1; + --favorite-icon-color: #FFEA00; --card-bg-color: #2e3440; --secondary-card-bg-color: rgba(59, 66, 82, 0.75); --scrollbar-color: #4b566a;