aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package-lock.json18
-rw-r--r--src/assets/images/tray/win32/tray-unread.icobin1150 -> 39006 bytes
-rw-r--r--src/assets/images/tray/win32/tray-unread@2x.icobin5430 -> 0 bytes
-rw-r--r--src/assets/images/tray/win32/tray.icobin1150 -> 33292 bytes
-rw-r--r--src/assets/images/tray/win32/tray@2x.icobin5430 -> 0 bytes
-rw-r--r--src/lib/Menu.js5
6 files changed, 23 insertions, 0 deletions
diff --git a/package-lock.json b/package-lock.json
index cd43fcda6..fc328c4b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2169,6 +2169,15 @@
2169 "@meetfranz/theme": "^1.0.13", 2169 "@meetfranz/theme": "^1.0.13",
2170 "react-html-attributes": "^1.4.3", 2170 "react-html-attributes": "^1.4.3",
2171 "react-loader": "^2.4.5" 2171 "react-loader": "^2.4.5"
2172 },
2173 "dependencies": {
2174 "@meetfranz/theme": {
2175 "version": "1.0.13",
2176 "bundled": true,
2177 "requires": {
2178 "color": "^3.1.0"
2179 }
2180 }
2172 } 2181 }
2173 }, 2182 },
2174 "@meetfranz/theme": { 2183 "@meetfranz/theme": {
@@ -2184,6 +2193,15 @@
2184 "@mdi/react": "^1.1.0", 2193 "@mdi/react": "^1.1.0",
2185 "@meetfranz/theme": "^1.0.13", 2194 "@meetfranz/theme": "^1.0.13",
2186 "react-loader": "^2.4.5" 2195 "react-loader": "^2.4.5"
2196 },
2197 "dependencies": {
2198 "@meetfranz/theme": {
2199 "version": "1.0.13",
2200 "bundled": true,
2201 "requires": {
2202 "color": "^3.1.0"
2203 }
2204 }
2187 } 2205 }
2188 }, 2206 },
2189 "@mrmlnc/readdir-enhanced": { 2207 "@mrmlnc/readdir-enhanced": {
diff --git a/src/assets/images/tray/win32/tray-unread.ico b/src/assets/images/tray/win32/tray-unread.ico
index a59428cfb..507845120 100644
--- a/src/assets/images/tray/win32/tray-unread.ico
+++ b/src/assets/images/tray/win32/tray-unread.ico
Binary files differ
diff --git a/src/assets/images/tray/win32/tray-unread@2x.ico b/src/assets/images/tray/win32/tray-unread@2x.ico
deleted file mode 100644
index f6fe65093..000000000
--- a/src/assets/images/tray/win32/tray-unread@2x.ico
+++ /dev/null
Binary files differ
diff --git a/src/assets/images/tray/win32/tray.ico b/src/assets/images/tray/win32/tray.ico
index d3aa25d68..1f0057a8c 100644
--- a/src/assets/images/tray/win32/tray.ico
+++ b/src/assets/images/tray/win32/tray.ico
Binary files differ
diff --git a/src/assets/images/tray/win32/tray@2x.ico b/src/assets/images/tray/win32/tray@2x.ico
deleted file mode 100644
index c1b7a73a5..000000000
--- a/src/assets/images/tray/win32/tray@2x.ico
+++ /dev/null
Binary files differ
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index da2540274..061c83160 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -500,6 +500,11 @@ const _titleBarTemplateFactory = intl => [
500 submenu: [], 500 submenu: [],
501 }, 501 },
502 { 502 {
503 label: intl.formatMessage(menuItems.workspaces),
504 submenu: [],
505 visible: workspaceStore.isFeatureEnabled,
506 },
507 {
503 label: intl.formatMessage(menuItems.window), 508 label: intl.formatMessage(menuItems.window),
504 submenu: [ 509 submenu: [
505 { 510 {