From 2fcb0c05c04e30d3a0850b4bbd5644391be3cb60 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sat, 25 Sep 2021 21:58:15 +0200
Subject: [PATCH] added grey icon for the dark mode

---
 .../0185__migrate_black_theme_to_dark.sql        |   2 ++
 images/icon-bw.png                               | Bin 1030 -> 0 bytes
 package.json                                     |   2 +-
 src/public/app/widgets/buttons/global_menu.js    |   2 +-
 src/public/stylesheets/themes.css                |   8 ++++++--
 src/services/app_info.js                         |   2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 db/migrations/0185__migrate_black_theme_to_dark.sql
 delete mode 100644 images/icon-bw.png

diff --git a/db/migrations/0185__migrate_black_theme_to_dark.sql b/db/migrations/0185__migrate_black_theme_to_dark.sql
new file mode 100644
index 000000000..a785bb039
--- /dev/null
+++ b/db/migrations/0185__migrate_black_theme_to_dark.sql
@@ -0,0 +1,2 @@
+-- black theme has been removed, dark is closest replacement
+UPDATE options SET value = 'dark' WHERE name = 'theme' AND value = 'black';
diff --git a/images/icon-bw.png b/images/icon-bw.png
deleted file mode 100644
index 545b2492c8a16677afd883fd4a5ffddbead9fc77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1030
zcmV+h1o``kP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$i(@Onlaj=7kLx$>PK~%(1t5Adrp;l<s!Q|2}Xws0R
zxHt-~1qVMCs}3&Cx;nTDg5U>;o12rOi<J1kq|hSPgX4a@yZ5+z2MF~t)2zTapy{@m
zO2oxXc2x|%q6Y!=K|ok$mN6$uNpu`v_we!cF2=JupZjx!)ttoupGZ8*4AUmwAfDc|
z4bJ<-5muB{;&b9LlP*a7$aTfzH_io@1)do()2Vsl2(egbW2KE*(bR~ih@+~eQ@)V#
zSmnIMSu0mr^Pc>Lp`5<5%ypW>NMI35kRU=q6(y8mBSx!EiiH&I$2<6kT)#vvg<K^t
zax9<%4YKP8|AXJ%TKUNdFDVoUx?UXTV+0890*#vEd>=bb;{@<O16O*>U#SB#pQP7X
zTJ#9$-v%zOTbi;5T<!paPljyDuH>gF<nzG$8GTb07`O#`*Sy}E`#607($rP*1~@nb
zMhld^-r?Qd?Y;ebrrF;Q&N6aku^Uf<00006VoOIv0Pz4=08oX~>}~)6010qNS#tmY
z4c7nw4c7reD4Tcy000McNliru<p~7~FbNu5(_{bu02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00G`fL_t(o!|j;OD@0Kgz<-8ef#f4avtc_68zo9MQq-)*
z-h!1Z{Q*+4u+o&3gpFpSEMy@y8#FQtMM@%}386;D$N1V@b-TSc@4hkbJu;_mGxyFt
z=l<Tg_ndp?K|%hQ6uGcQ3(yNR0cjustN;&gK4>Fw3w&C%L!iNFn79Ur+R{L+6EKf9
zAdEaXoKKiF3xFgrlw~U~trlnpHh?$a1K0(^CUbpRK=y$Ekg)(Zm57GBM--hUlX=ZR
zRKs4inMdp#!~scH{q0_i>qJ_}2xd~6a0hGwi$F|lnVGRt1E8cBd(wc37{PRDC{6%D
z;940!R)8|1e`R3fUFok|9blbpngQw*ugO4uU{1qMOgD7THH^K8D<>iPW#V%TsMpY+
zx0_G;G`&?RvT_BG61rBQ-Tjk9x2XZ;m-0|&mU%n*%Dy$gO_qiFrMXqWfpWm7oUABX
zfpHP4VX1uC76<(lDE6|J3J6au0LzkRO1uL41_&zKnDPQ<&m<4Y5$K6`%z$Rygz3=$
zdd=0iF9)3trEgRd``rXOQ~HBm|8?>!+w*L<0(3&s%Hq>r1C=X_#|^yZy0j?}C(`#L
zudffat-2XyvRsG@HfoT`e}#;SiZWDqkMnQj3%(O!1Zkg6TL1t607*qoM6N<$f>>L~
A3;+NC

diff --git a/package.json b/package.json
index 85f5d87c3..1e33666a5 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "jsdoc": "3.6.7",
     "lorem-ipsum": "2.0.3",
     "rcedit": "3.0.1",
-    "webpack": "5.53.0",
+    "webpack": "5.54.0",
     "webpack-cli": "4.8.0"
   },
   "optionalDependencies": {
diff --git a/src/public/app/widgets/buttons/global_menu.js b/src/public/app/widgets/buttons/global_menu.js
index 9d41fa924..a597a5458 100644
--- a/src/public/app/widgets/buttons/global_menu.js
+++ b/src/public/app/widgets/buttons/global_menu.js
@@ -14,7 +14,7 @@ const TPL = `
     }
     
     .global-menu-button {
-        background-image: url("images/icon-bw.png");
+        background-image: url("images/icon-color.png");
         background-repeat: no-repeat;
         background-position: 50% 45%;
         width: 100%;
diff --git a/src/public/stylesheets/themes.css b/src/public/stylesheets/themes.css
index 35c684a7a..ad96cddf5 100644
--- a/src/public/stylesheets/themes.css
+++ b/src/public/stylesheets/themes.css
@@ -110,10 +110,10 @@ body.theme-dark {
     --modal-backdrop-color: #444;
 
     --left-pane-background-color: #1f1f1f;
-    --left-pane-text-color: #ADAAAA;
+    --left-pane-text-color: #AAAAAA;
 
     --launcher-pane-background-color: #1f1f1f;
-    --launcher-pane-text-color: #ADAAAA;
+    --launcher-pane-text-color: #AAAAAA;
 
     --active-tab-background-color: #666;
     --active-tab-text-color: #ccc;
@@ -126,6 +126,10 @@ body.theme-dark {
     --link-color: lightskyblue;
 }
 
+body.theme-dark .global-menu-button {
+    background-image: url("../images/icon-grey.png");
+}
+
 body.theme-dark ::-webkit-calendar-picker-indicator {
     filter: invert(1);
 }
diff --git a/src/services/app_info.js b/src/services/app_info.js
index bc41e3e4e..e5317c018 100644
--- a/src/services/app_info.js
+++ b/src/services/app_info.js
@@ -4,7 +4,7 @@ const build = require('./build');
 const packageJson = require('../../package');
 const {TRILIUM_DATA_DIR} = require('./data_dir');
 
-const APP_DB_VERSION = 184;
+const APP_DB_VERSION = 185;
 const SYNC_VERSION = 21;
 const CLIPPER_PROTOCOL_VERSION = "1.0";