From e9065833c0224c1c950ff944813ca230e342da29 Mon Sep 17 00:00:00 2001 From: Ben Arc Date: Thu, 17 Feb 2022 21:34:36 +0000 Subject: [PATCH 1/2] Fixed themes, added bitcoin theme --- .env.example | 2 +- lnbits/static/js/base.js | 14 +++++++++++--- lnbits/static/scss/base.scss | 8 ++++++++ lnbits/templates/base.html | 12 +++++++++++- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index 857737161..51259007c 100644 --- a/.env.example +++ b/.env.example @@ -30,7 +30,7 @@ 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 mint, flamingo, salvador, autumn, monochrome, classic -LNBITS_THEME_OPTIONS="mint, flamingo, classic, autumn, monochrome, salvador" +LNBITS_THEME_OPTIONS="classic, bitcoin, flamingo, mint, autumn, monochrome, salvador" # Choose from LNPayWallet, OpenNodeWallet, LntxbotWallet, LndWallet (gRPC), # LndRestWallet, CLightningWallet, LNbitsWallet, SparkWallet, FakeWallet diff --git a/lnbits/static/js/base.js b/lnbits/static/js/base.js index d49eec16f..c8863b5ab 100644 --- a/lnbits/static/js/base.js +++ b/lnbits/static/js/base.js @@ -345,17 +345,25 @@ window.windowMixin = { } }, created: function () { - this.$q.dark.set(this.$q.localStorage.getItem('lnbits.darkMode')) - this.g.allowedThemes = window.allowedThemes ?? ['classic'] + + if(this.$q.localStorage.getItem('lnbits.darkMode') == true || this.$q.localStorage.getItem('lnbits.darkMode') == false){ + this.$q.dark.set(this.$q.localStorage.getItem('lnbits.darkMode')) + } + else{ + this.$q.dark.set(true) + } + this.g.allowedThemes = window.allowedThemes ?? ['bitcoin'] // failsafe if admin changes themes halfway + if (!this.$q.localStorage.getItem('lnbits.theme')){ + this.changeColor(this.g.allowedThemes[0]) + } if ( this.$q.localStorage.getItem('lnbits.theme') && !this.g.allowedThemes.includes( this.$q.localStorage.getItem('lnbits.theme') ) ) { - console.log('allowedThemes changed by Admin', this.g.allowedThemes[0]) this.changeColor(this.g.allowedThemes[0]) } diff --git a/lnbits/static/scss/base.scss b/lnbits/static/scss/base.scss index 32718f79e..c08b3b726 100644 --- a/lnbits/static/scss/base.scss +++ b/lnbits/static/scss/base.scss @@ -1,4 +1,12 @@ $themes: ( + 'bitcoin': ( + primary: #ff9853, + secondary: #ff7353, + dark: #2d293b, + info: #333646, + marginal-bg: #2d293b, + marginal-text: #fff + ), 'classic': ( primary: #673ab7, secondary: #9c27b0, diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html index 9ec1e2e39..bfaa9c167 100644 --- a/lnbits/templates/base.html +++ b/lnbits/templates/base.html @@ -20,7 +20,7 @@ {% block head_scripts %}{% endblock %} - + @@ -59,6 +59,16 @@ class="q-pl-md" >
+ bitcoin + Date: Thu, 17 Feb 2022 21:46:51 +0000 Subject: [PATCH 2/2] Changed theme order to default to classic --- lnbits/static/scss/base.scss | 16 ++++++++-------- lnbits/templates/base.html | 19 ++++++++++--------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lnbits/static/scss/base.scss b/lnbits/static/scss/base.scss index c08b3b726..afafd50d1 100644 --- a/lnbits/static/scss/base.scss +++ b/lnbits/static/scss/base.scss @@ -1,12 +1,4 @@ $themes: ( - 'bitcoin': ( - primary: #ff9853, - secondary: #ff7353, - dark: #2d293b, - info: #333646, - marginal-bg: #2d293b, - marginal-text: #fff - ), 'classic': ( primary: #673ab7, secondary: #9c27b0, @@ -15,6 +7,14 @@ $themes: ( marginal-bg: #1f2234, marginal-text: #fff ), + 'bitcoin': ( + primary: #ff9853, + secondary: #ff7353, + dark: #2d293b, + info: #333646, + marginal-bg: #2d293b, + marginal-text: #fff + ), 'mint': ( primary: #3ab77d, secondary: #27b065, diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html index bfaa9c167..965d5336e 100644 --- a/lnbits/templates/base.html +++ b/lnbits/templates/base.html @@ -59,6 +59,16 @@ class="q-pl-md" >
+ classic + bitcoin classic