From 33a9bfb0c818e6a090678a8e8f0ce3ab6d000200 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 23 Jun 2022 18:07:25 +0530 Subject: [PATCH 01/14] Notification icon issue --- core/css/server.css | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index f55145c0..f05b91ea 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -528,17 +528,23 @@ background-image: var(--icon-files-app-808080); } - #header .icon-notifications, - #header .icon-notifications-new { + #header .notifications-button, + #header .hasNotifications { background-size: 17px; + background-repeat: no-repeat; + background-position: center; } - .icon-notifications-new { + .notifications-button { + background-image: var(--icon-notifications-notifications-000000); + } + + .hasNotifications { background-image: var(--icon-notifications-notifications-new-000000); } - .icon-notifications { - background-image: var(--icon-notifications-notifications-000000); + .notifications-button img{ + display: none; } .icon-external, -- GitLab From 456d183d3f153e75760fb381fded565a5099dcae Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 23 Jun 2022 18:46:17 +0530 Subject: [PATCH 02/14] notification new svg image --- apps/notifications/img/notifications-new.svg | 21 +------------------- core/css/server.css | 16 +++++---------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/apps/notifications/img/notifications-new.svg b/apps/notifications/img/notifications-new.svg index 63313977..cb4be513 100755 --- a/apps/notifications/img/notifications-new.svg +++ b/apps/notifications/img/notifications-new.svg @@ -1,20 +1 @@ - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/core/css/server.css b/core/css/server.css index f05b91ea..f55145c0 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -528,23 +528,17 @@ background-image: var(--icon-files-app-808080); } - #header .notifications-button, - #header .hasNotifications { + #header .icon-notifications, + #header .icon-notifications-new { background-size: 17px; - background-repeat: no-repeat; - background-position: center; } - .notifications-button { - background-image: var(--icon-notifications-notifications-000000); - } - - .hasNotifications { + .icon-notifications-new { background-image: var(--icon-notifications-notifications-new-000000); } - .notifications-button img{ - display: none; + .icon-notifications { + background-image: var(--icon-notifications-notifications-000000); } .icon-external, -- GitLab From ccfec42e2fe6413ae75b8887199320665a7a1fc8 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 23 Jun 2022 18:55:34 +0530 Subject: [PATCH 03/14] new icons --- .../notifications/img/notifications-has-new.svg | 16 ++++++++++++++++ apps/notifications/img/notifications-new.svg | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 apps/notifications/img/notifications-has-new.svg diff --git a/apps/notifications/img/notifications-has-new.svg b/apps/notifications/img/notifications-has-new.svg new file mode 100644 index 00000000..7e16969e --- /dev/null +++ b/apps/notifications/img/notifications-has-new.svg @@ -0,0 +1,16 @@ + + download-svg + + + + + + + + + + + \ No newline at end of file diff --git a/apps/notifications/img/notifications-new.svg b/apps/notifications/img/notifications-new.svg index cb4be513..c29d147f 100755 --- a/apps/notifications/img/notifications-new.svg +++ b/apps/notifications/img/notifications-new.svg @@ -1 +1,16 @@ - \ No newline at end of file + + download-svg + + + + + + + + + + + \ No newline at end of file -- GitLab From bd4ae8907de04b05282e2118e1d516f7e3a85b56 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 23 Jun 2022 19:21:43 +0530 Subject: [PATCH 04/14] hidden img --- core/css/server.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index f55145c0..e778ba8a 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -58,6 +58,7 @@ --input-background-color: #181818; --icon-notifications-notifications-000000: url("/svg/notifications/notifications?color=000"); --icon-notifications-notifications-new-000000: url("/svg/notifications/notifications-new?color=000"); + --icon-notifications-notifications-has-new-000000: url("/svg/notifications/notifications-has-new?color=000"); --icon-search-000: url("/svg/core/actions/search?color=000"); } @@ -540,7 +541,14 @@ .icon-notifications { background-image: var(--icon-notifications-notifications-000000); } + + .notifications-button{ + background-image: var(--icon-notifications-notifications-has-new-000000); + } + .notifications-button img{ + display: none; + } .icon-external, .icon-goto { background-image: var(--icon-external-808080); -- GitLab From 96fa6529ac8bbbda80965b1eced06094c5e5d0a6 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 23 Jun 2022 19:26:55 +0530 Subject: [PATCH 05/14] hidden img #1 --- core/css/server.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index e778ba8a..5a6cad3e 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -58,7 +58,6 @@ --input-background-color: #181818; --icon-notifications-notifications-000000: url("/svg/notifications/notifications?color=000"); --icon-notifications-notifications-new-000000: url("/svg/notifications/notifications-new?color=000"); - --icon-notifications-notifications-has-new-000000: url("/svg/notifications/notifications-has-new?color=000"); --icon-search-000: url("/svg/core/actions/search?color=000"); } @@ -542,13 +541,6 @@ background-image: var(--icon-notifications-notifications-000000); } - .notifications-button{ - background-image: var(--icon-notifications-notifications-has-new-000000); - } - - .notifications-button img{ - display: none; - } .icon-external, .icon-goto { background-image: var(--icon-external-808080); -- GitLab From c0483280780adc6b5ab0c4311d64a194ad2f33d6 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 23 Jun 2022 19:30:21 +0530 Subject: [PATCH 06/14] hidden img #2 --- core/css/server.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index 5a6cad3e..dccc2dde 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -537,7 +537,7 @@ background-image: var(--icon-notifications-notifications-new-000000); } - .icon-notifications { + .notifications-button { background-image: var(--icon-notifications-notifications-000000); } -- GitLab From e3b29bd2759c552605b0735da4e40ee531ab7b5d Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 23 Jun 2022 19:32:18 +0530 Subject: [PATCH 07/14] hidden img #2 --- core/css/server.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index dccc2dde..0df979c2 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -539,6 +539,9 @@ .notifications-button { background-image: var(--icon-notifications-notifications-000000); + background-repeat: no-repeat; + background-size: 17px; + background-position: center; } .icon-external, -- GitLab From a9103926d0dde253c36fef3a1c40b6b6b2a04ec0 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 24 Jun 2022 11:19:24 +0530 Subject: [PATCH 08/14] removed css change --- core/css/server.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 0df979c2..69430f0d 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -536,13 +536,15 @@ .icon-notifications-new { background-image: var(--icon-notifications-notifications-new-000000); } - - .notifications-button { + .icon-notifications { + background-image: var(--icon-notifications-notifications-000000); + } + /* .notifications-button { background-image: var(--icon-notifications-notifications-000000); background-repeat: no-repeat; background-size: 17px; background-position: center; - } + } */ .icon-external, .icon-goto { -- GitLab From 81aca09e3b2c97a983e80c75d4ecac0988b8220a Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 24 Jun 2022 12:19:02 +0530 Subject: [PATCH 09/14] added new class --- core/css/server.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 69430f0d..84feec66 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -58,6 +58,7 @@ --input-background-color: #181818; --icon-notifications-notifications-000000: url("/svg/notifications/notifications?color=000"); --icon-notifications-notifications-new-000000: url("/svg/notifications/notifications-new?color=000"); + --icon-notifications-notifications-pre-000000: url("/svg/notifications/notifications-has-new?color=000"); --icon-search-000: url("/svg/core/actions/search?color=000"); } @@ -539,6 +540,9 @@ .icon-notifications { background-image: var(--icon-notifications-notifications-000000); } + .icon-notifications-pre { + background-image: var(--icon-notifications-notifications-pre-000000); + } /* .notifications-button { background-image: var(--icon-notifications-notifications-000000); background-repeat: no-repeat; -- GitLab From e1ca09b5a80f721a3924e24f8e3919bc092ceec8 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 24 Jun 2022 23:05:13 +0530 Subject: [PATCH 10/14] server css changes --- core/css/server.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 84feec66..c4eeaccc 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -57,8 +57,8 @@ body.theme--dark { --input-background-color: #181818; --icon-notifications-notifications-000000: url("/svg/notifications/notifications?color=000"); - --icon-notifications-notifications-new-000000: url("/svg/notifications/notifications-new?color=000"); - --icon-notifications-notifications-pre-000000: url("/svg/notifications/notifications-has-new?color=000"); + --icon-notifications-notifications-new-000000: url("/themes/eCloud/apps/notifications/img/notifications-new"); + --icon-notifications-notifications-pre-000000: url("/themes/eCloud/apps/notifications/img/notifications-has-new"); --icon-search-000: url("/svg/core/actions/search?color=000"); } -- GitLab From 0a0a3b775731b5e233f3a110c5135cbe1e6f3231 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Fri, 24 Jun 2022 23:10:28 +0530 Subject: [PATCH 11/14] reverted changes --- core/css/server.css | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index c4eeaccc..bb0e517b 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -57,8 +57,7 @@ body.theme--dark { --input-background-color: #181818; --icon-notifications-notifications-000000: url("/svg/notifications/notifications?color=000"); - --icon-notifications-notifications-new-000000: url("/themes/eCloud/apps/notifications/img/notifications-new"); - --icon-notifications-notifications-pre-000000: url("/themes/eCloud/apps/notifications/img/notifications-has-new"); + --icon-notifications-notifications-new-000000: url("/svg/notifications/notifications-new?color=000"); --icon-search-000: url("/svg/core/actions/search?color=000"); } @@ -529,27 +528,21 @@ background-image: var(--icon-files-app-808080); } - #header .icon-notifications, - #header .icon-notifications-new { + #header .notifications-button, + #header .hasNotifications { background-size: 17px; + background-repeat: no-repeat; + background-position: center; } - .icon-notifications-new { - background-image: var(--icon-notifications-notifications-new-000000); - } - .icon-notifications { + .notifications-button { background-image: var(--icon-notifications-notifications-000000); } - .icon-notifications-pre { - background-image: var(--icon-notifications-notifications-pre-000000); + + .hasNotifications { + background-image: var(--icon-notifications-notifications-new-000000); } - /* .notifications-button { - background-image: var(--icon-notifications-notifications-000000); - background-repeat: no-repeat; - background-size: 17px; - background-position: center; - } */ - + .icon-external, .icon-goto { background-image: var(--icon-external-808080); -- GitLab From 4d6a5a79b25e60e65a985b80ce005aaf77ca5100 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 7 Jul 2022 10:37:56 +0530 Subject: [PATCH 12/14] reverted back server.css --- core/css/server.css | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index bb0e517b..b648c371 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -528,19 +528,17 @@ background-image: var(--icon-files-app-808080); } - #header .notifications-button, - #header .hasNotifications { + #header .icon-notifications, + #header .icon-notifications-new { background-size: 17px; - background-repeat: no-repeat; - background-position: center; } - .notifications-button { - background-image: var(--icon-notifications-notifications-000000); + .icon-notifications-new { + background-image: var(--icon-notifications-notifications-new-000000); } - .hasNotifications { - background-image: var(--icon-notifications-notifications-new-000000); + .icon-notifications { + background-image: var(--icon-notifications-notifications-000000); } .icon-external, @@ -1732,4 +1730,4 @@ #launcher-menu { left: 5% !important; } - } + } \ No newline at end of file -- GitLab From 33fc90c30dae0402898bdd482f9ccdd4888b7b41 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 7 Jul 2022 10:38:48 +0530 Subject: [PATCH 13/14] reverted back server.css --- core/css/server.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index b648c371..6d259b73 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1730,4 +1730,5 @@ #launcher-menu { left: 5% !important; } - } \ No newline at end of file + } + \ No newline at end of file -- GitLab From dfecc72dec88d05b81d668ad6c1aabea70d46afd Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 7 Jul 2022 10:39:56 +0530 Subject: [PATCH 14/14] reverted back server.css --- core/css/server.css | 1 - 1 file changed, 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index 6d259b73..f55145c0 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1731,4 +1731,3 @@ left: 5% !important; } } - \ No newline at end of file -- GitLab