Merge branch 'master' into feature/readthemeenv

lnbits/static/js/base.js

@@ -316,8 +316,6 @@ window.windowMixin = {
   methods: {
     changeColor: function (newValue) {
       document.body.setAttribute('data-theme', newValue)
-      //console.log(document.body.getAttribute('data-theme'))
-      //console.log(newValue)
       this.$q.localStorage.set('lnbits.theme', newValue)
     },
     toggleDarkMode: function () {

lnbits/static/scss/base.scss

@@ -26,9 +26,9 @@ $themes: (
   'flamingo': (
     primary: #d11d53,
     secondary: #db3e6d,
-    dark: #e75480,
+    dark: #803a45,
     info: #ec7599,
-    marginal-bg: #e75480,
+    marginal-bg: #803a45,
     marginal-text: rgb(255, 255, 255)
   ),
   'monochrome': (
@@ -41,10 +41,6 @@ $themes: (
   )
 );
 
-[data-theme='quasar'] .q-drawer--dark {
-  background: #121212 !important;
-}
-
 @each $theme, $colors in $themes {
   @each $name, $color in $colors {
     @if $name == 'dark' {
@@ -79,6 +75,21 @@ $themes: (
     }
   }
 }
+[data-theme='salvador'] .q-drawer--dark {
+  background: #242424 !important;
+}
+
+[data-theme='salvador'] .q-header {
+  background: #0f47af !important;
+}
+
+[data-theme='flamingo'] .q-drawer--dark {
+  background: #e75480 !important;
+}
+
+[data-theme='flamingo'] .q-header {
+  background: #e75480 !important;
+}
 
 [v-cloak] {
   display: none;