From 9f049c195217be6c3fc0671a5d842454d84bae7f Mon Sep 17 00:00:00 2001 From: Ben Arc Date: Mon, 20 Feb 2023 22:41:11 +0000 Subject: [PATCH 1/3] Added cyber theme Because we all liked the theme from this pr https://github.com/lnbits/lnbits/pulls?page=2&q=is%3Apr+is%3Aopen --- .env.example | 4 ++-- lnbits/core/templates/admin/index.html | 1 + lnbits/settings.py | 2 +- lnbits/static/scss/base.scss | 16 ++++++++++++++++ lnbits/templates/base.html | 12 +++++++++++- 5 files changed, 31 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index 101a8cb70..dd85b655c 100644 --- a/.env.example +++ b/.env.example @@ -59,8 +59,8 @@ LNBITS_RESERVE_FEE_PERCENT=1.0 LNBITS_SITE_TITLE="LNbits" LNBITS_SITE_TAGLINE="free and open-source lightning wallet" LNBITS_SITE_DESCRIPTION="Some description about your service, will display if title is not 'LNbits'" -# Choose from bitcoin, mint, flamingo, freedom, salvador, autumn, monochrome, classic -LNBITS_THEME_OPTIONS="classic, bitcoin, flamingo, freedom, mint, autumn, monochrome, salvador" +# Choose from bitcoin, mint, flamingo, freedom, salvador, autumn, monochrome, classic, cyber +LNBITS_THEME_OPTIONS="classic, bitcoin, flamingo, freedom, mint, autumn, monochrome, salvador, cyber" # LNBITS_CUSTOM_LOGO="https://lnbits.com/assets/images/logo/logo.svg" # Choose from LNPayWallet, OpenNodeWallet, LntxbotWallet, ClicheWallet, diff --git a/lnbits/core/templates/admin/index.html b/lnbits/core/templates/admin/index.html index 4f1bea043..96e04fe61 100644 --- a/lnbits/core/templates/admin/index.html +++ b/lnbits/core/templates/admin/index.html @@ -160,6 +160,7 @@ 'classic', 'bitcoin', 'flamingo', + 'cyber', 'freedom', 'mint', 'autumn', diff --git a/lnbits/settings.py b/lnbits/settings.py index 3c54f9308..027c40df2 100644 --- a/lnbits/settings.py +++ b/lnbits/settings.py @@ -67,7 +67,7 @@ class ThemesSettings(LNbitsSettings): lnbits_site_description: str = Field(default=None) lnbits_default_wallet_name: str = Field(default="LNbits wallet") lnbits_theme_options: List[str] = Field( - default=["classic", "flamingo", "mint", "salvador", "monochrome", "autumn"] + default=["classic", "freedom", "mint", "salvador", "monochrome", "autumn", "cyber"] ) lnbits_custom_logo: str = Field(default=None) lnbits_ad_space_title: str = Field(default="Supported by") diff --git a/lnbits/static/scss/base.scss b/lnbits/static/scss/base.scss index 0730d03e9..2049243d2 100644 --- a/lnbits/static/scss/base.scss +++ b/lnbits/static/scss/base.scss @@ -23,6 +23,14 @@ $themes: ( marginal-bg: #2d293b, marginal-text: #fff ), + 'cyber': ( + primary: #ccff00, + secondary: #a4c910, + dark: #0a0a0a, + info: #1b1b1b, + marginal-bg: #2d293b, + marginal-text: #fff + ), 'mint': ( primary: #3ab77d, secondary: #27b065, @@ -98,6 +106,14 @@ $themes: ( background: #0a0a0a !important; } +[data-theme='cyber'] .q-drawer--dark { + background: #ccff00 !important; +} + +[data-theme='cyber'] .q-header { + background: #ccff00 !important; +} + [data-theme='salvador'] .q-drawer--dark { background: #242424 !important; } diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html index 073058d2d..410fcf0c1 100644 --- a/lnbits/templates/base.html +++ b/lnbits/templates/base.html @@ -138,7 +138,17 @@ icon="format_color_fill" color="pink-13" size="md" - >Freedom + >freedom + + cyber Date: Mon, 20 Feb 2023 22:45:52 +0000 Subject: [PATCH 2/3] format --- lnbits/settings.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lnbits/settings.py b/lnbits/settings.py index 027c40df2..30dd6f621 100644 --- a/lnbits/settings.py +++ b/lnbits/settings.py @@ -67,7 +67,15 @@ class ThemesSettings(LNbitsSettings): lnbits_site_description: str = Field(default=None) lnbits_default_wallet_name: str = Field(default="LNbits wallet") lnbits_theme_options: List[str] = Field( - default=["classic", "freedom", "mint", "salvador", "monochrome", "autumn", "cyber"] + default=[ + "classic", + "freedom", + "mint", + "salvador", + "monochrome", + "autumn", + "cyber", + ] ) lnbits_custom_logo: str = Field(default=None) lnbits_ad_space_title: str = Field(default="Supported by") From 910727a7f4179ce6ee15aae3ec85b998f068783d Mon Sep 17 00:00:00 2001 From: Ben Arc Date: Mon, 20 Feb 2023 23:17:40 +0000 Subject: [PATCH 3/3] Sadly had to tone down due to font color of buttons --- lnbits/static/scss/base.scss | 8 ++++---- lnbits/templates/base.html | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lnbits/static/scss/base.scss b/lnbits/static/scss/base.scss index 2049243d2..aac8edee5 100644 --- a/lnbits/static/scss/base.scss +++ b/lnbits/static/scss/base.scss @@ -24,8 +24,8 @@ $themes: ( marginal-text: #fff ), 'cyber': ( - primary: #ccff00, - secondary: #a4c910, + primary: #7cb342, + secondary: #558b2f, dark: #0a0a0a, info: #1b1b1b, marginal-bg: #2d293b, @@ -107,11 +107,11 @@ $themes: ( } [data-theme='cyber'] .q-drawer--dark { - background: #ccff00 !important; + background: #0a0a0a !important; } [data-theme='cyber'] .q-header { - background: #ccff00 !important; + background: #0a0a0a !important; } [data-theme='salvador'] .q-drawer--dark { diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html index 410fcf0c1..1d4e1063e 100644 --- a/lnbits/templates/base.html +++ b/lnbits/templates/base.html @@ -146,7 +146,7 @@ flat @click="changeColor('cyber')" icon="format_color_fill" - color="light-green-7" + color="light-green-9" size="md" >cyber