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 545b2492c..000000000 Binary files a/images/icon-bw.png and /dev/null differ 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";