From 18ef91223481d4f904195c98335b6ead85472b9a Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 10 Apr 2023 18:24:14 +0530 Subject: [PATCH 1/8] Set NC App icon default --- core/css/server.css | 48 ++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index fd37cc16..dbd330a2 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1589,72 +1589,72 @@ button.edit-output-dir span.icon-rename, } .new-icons .drive, .new-icons .files { - background-image: url("../img/app-icons/Drive.svg"); + background-image: url("../img/app-icons/Drive.svg") !important; } .new-icons .activity { - background-image: url("../img/app-icons/Activity.svg"); + background-image: url("../img/app-icons/Activity.svg") !important; } .new-icons .bookmarks { - background-image: url("../img/app-icons/Bookmark.svg"); + background-image: url("../img/app-icons/Bookmark.svg") !important; } .new-icons .calendar { - background-image: url("../img/app-icons/Calendar.svg"); + background-image: url("../img/app-icons/Calendar.svg") !important; } .new-icons .carnet { - background-image: url("../img/app-icons/Carnet.svg"); + background-image: url("../img/app-icons/Carnet.svg") !important; } .new-icons .contacts { - background-image: url("../img/app-icons/Contacts.svg"); + background-image: url("../img/app-icons/Contacts.svg") !important; } .new-icons .deck { - background-image: url("../img/app-icons/Deck.svg"); + background-image: url("../img/app-icons/Deck.svg") !important; } .new-icons .docs { - background-image: url("../img/app-icons/Docs.svg"); + background-image: url("../img/app-icons/Docs.svg") !important; } .new-icons .email, .new-icons .rainloop, .new-icons .snappymail { - background-image: url("../img/app-icons/E-mail.svg"); + background-image: url("../img/app-icons/E-mail.svg") !important; } .new-icons .gitlab { - background-image: url("../img/app-icons/Gitlab.svg"); + background-image: url("../img/app-icons/Gitlab.svg") !important; } .new-icons .news { - background-image: url("../img/app-icons/News.svg"); + background-image: url("../img/app-icons/News.svg") !important; } .new-icons .notes { - background-image: url("../img/app-icons/Notes.svg"); + background-image: url("../img/app-icons/Notes.svg") !important; } .new-icons .presentation { - background-image: url("../img/app-icons/Presentation.svg"); + background-image: url("../img/app-icons/Presentation.svg") !important; } .new-icons .spreadsheet { - background-image: url("../img/app-icons/Spreadsheet.svg"); + background-image: url("../img/app-icons/Spreadsheet.svg") !important; } .new-icons .tasks { - background-image: url("../img/app-icons/Tasks.svg"); + background-image: url("../img/app-icons/Tasks.svg") !important; } .new-icons .photos { - background-image: url("../img/app-icons/Gallery.svg"); + background-image: url("../img/app-icons/Gallery.svg") !important; } .new-icons .e-user-support-center { - background-image: url("../img/app-icons/Support.svg"); + background-image: url("../img/app-icons/Support.svg") !important; } .new-icons .passwords { - background-image: url("../img/app-icons/Password.svg"); + background-image: url("../img/app-icons/Password.svg") !important; } .new-icons .onlyoffice_docx { - background-image: url("../img/app-icons/Docs.svg"); + background-image: url("../img/app-icons/Docs.svg") !important; } .new-icons .onlyoffice_xlsx { - background-image: url("../img/app-icons/Spreadsheet.svg"); + background-image: url("../img/app-icons/Spreadsheet.svg") !important; } .new-icons .onlyoffice_pptx { - background-image: url("../img/app-icons/Presentation.svg"); + background-image: url("../img/app-icons/Presentation.svg") !important; } .new-icons .cookbook { - background-image: url("../img/app-icons/Cookbook.svg"); + background-image: url("../img/app-icons/Cookbook.svg") !important; } #appmenu li:hover a, @@ -1755,3 +1755,7 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { #content.app-files #filestable { padding-top: 20px; } +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes -- GitLab From 1997d42e65ad383a2e4553effcce6363347ea977 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 10 Apr 2023 18:25:38 +0530 Subject: [PATCH 2/8] change --- core/css/server.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index dbd330a2..c6881172 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1754,8 +1754,4 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { /* Files App */ #content.app-files #filestable { padding-top: 20px; -} -<<<<<<< Updated upstream -======= - ->>>>>>> Stashed changes +} \ No newline at end of file -- GitLab From da9484598ac4b58e964426d5b1a04fafdfcaf335 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 10 Apr 2023 18:26:27 +0530 Subject: [PATCH 3/8] change --- 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 c6881172..30b5a0ca 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1754,4 +1754,4 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { /* Files App */ #content.app-files #filestable { padding-top: 20px; -} \ No newline at end of file +} -- GitLab From 16aa4c4d2129b333c3355a350d132115afeb9bed Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 13 Apr 2023 17:21:33 +0530 Subject: [PATCH 4/8] removed app-icons and added new in apps, change in server.css --- .../Deck.svg => apps/deck/img/app-color.svg | 0 .../News.svg => apps/news/img/app-color.svg | 0 .../onlyoffice_docx/img/app-color.svg | 0 .../onlyoffice_pptx/img/app-color.svg | 0 .../onlyoffice_xlsx/img/app-color.svg | 0 .../passwords/img/app-color.svg | 0 core/css/server.css | 82 ------------------- core/img/app-icons/Activity.svg | 14 ---- core/img/app-icons/Bookmark.svg | 24 ------ core/img/app-icons/Calendar.svg | 14 ---- core/img/app-icons/Carnet.svg | 16 ---- core/img/app-icons/Contacts.svg | 44 ---------- core/img/app-icons/Cookbook.svg | 19 ----- core/img/app-icons/E-mail.svg | 32 -------- core/img/app-icons/Gallery.svg | 27 ------ core/img/app-icons/Notes.svg | 24 ------ core/img/app-icons/Support.svg | 13 --- core/img/app-icons/Tasks.svg | 31 ------- 18 files changed, 340 deletions(-) rename core/img/app-icons/Deck.svg => apps/deck/img/app-color.svg (100%) rename core/img/app-icons/News.svg => apps/news/img/app-color.svg (100%) rename core/img/app-icons/Docs.svg => apps/onlyoffice_docx/img/app-color.svg (100%) rename core/img/app-icons/Presentation.svg => apps/onlyoffice_pptx/img/app-color.svg (100%) rename core/img/app-icons/Spreadsheet.svg => apps/onlyoffice_xlsx/img/app-color.svg (100%) rename core/img/app-icons/Password.svg => apps/passwords/img/app-color.svg (100%) delete mode 100644 core/img/app-icons/Activity.svg delete mode 100644 core/img/app-icons/Bookmark.svg delete mode 100644 core/img/app-icons/Calendar.svg delete mode 100644 core/img/app-icons/Carnet.svg delete mode 100644 core/img/app-icons/Contacts.svg delete mode 100644 core/img/app-icons/Cookbook.svg delete mode 100644 core/img/app-icons/E-mail.svg delete mode 100644 core/img/app-icons/Gallery.svg delete mode 100644 core/img/app-icons/Notes.svg delete mode 100644 core/img/app-icons/Support.svg delete mode 100644 core/img/app-icons/Tasks.svg diff --git a/core/img/app-icons/Deck.svg b/apps/deck/img/app-color.svg similarity index 100% rename from core/img/app-icons/Deck.svg rename to apps/deck/img/app-color.svg diff --git a/core/img/app-icons/News.svg b/apps/news/img/app-color.svg similarity index 100% rename from core/img/app-icons/News.svg rename to apps/news/img/app-color.svg diff --git a/core/img/app-icons/Docs.svg b/apps/onlyoffice_docx/img/app-color.svg similarity index 100% rename from core/img/app-icons/Docs.svg rename to apps/onlyoffice_docx/img/app-color.svg diff --git a/core/img/app-icons/Presentation.svg b/apps/onlyoffice_pptx/img/app-color.svg similarity index 100% rename from core/img/app-icons/Presentation.svg rename to apps/onlyoffice_pptx/img/app-color.svg diff --git a/core/img/app-icons/Spreadsheet.svg b/apps/onlyoffice_xlsx/img/app-color.svg similarity index 100% rename from core/img/app-icons/Spreadsheet.svg rename to apps/onlyoffice_xlsx/img/app-color.svg diff --git a/core/img/app-icons/Password.svg b/apps/passwords/img/app-color.svg similarity index 100% rename from core/img/app-icons/Password.svg rename to apps/passwords/img/app-color.svg diff --git a/core/css/server.css b/core/css/server.css index 30b5a0ca..4b803a0e 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1579,84 +1579,6 @@ button.edit-output-dir span.icon-rename, #header .header-right .magnify-icon > svg { display: none; } -.new-icons .color-icons { - background-image: url("../img/app-icons/other.svg"); - width: 100%; - height: 80px; - background-position: 50%; - background-repeat: no-repeat; - background-size: 60px; -} -.new-icons .drive, -.new-icons .files { - background-image: url("../img/app-icons/Drive.svg") !important; -} -.new-icons .activity { - background-image: url("../img/app-icons/Activity.svg") !important; -} -.new-icons .bookmarks { - background-image: url("../img/app-icons/Bookmark.svg") !important; -} -.new-icons .calendar { - background-image: url("../img/app-icons/Calendar.svg") !important; -} -.new-icons .carnet { - background-image: url("../img/app-icons/Carnet.svg") !important; -} -.new-icons .contacts { - background-image: url("../img/app-icons/Contacts.svg") !important; -} -.new-icons .deck { - background-image: url("../img/app-icons/Deck.svg") !important; -} -.new-icons .docs { - background-image: url("../img/app-icons/Docs.svg") !important; -} -.new-icons .email, -.new-icons .rainloop, -.new-icons .snappymail { - background-image: url("../img/app-icons/E-mail.svg") !important; -} -.new-icons .gitlab { - background-image: url("../img/app-icons/Gitlab.svg") !important; -} -.new-icons .news { - background-image: url("../img/app-icons/News.svg") !important; -} -.new-icons .notes { - background-image: url("../img/app-icons/Notes.svg") !important; -} -.new-icons .presentation { - background-image: url("../img/app-icons/Presentation.svg") !important; -} -.new-icons .spreadsheet { - background-image: url("../img/app-icons/Spreadsheet.svg") !important; -} -.new-icons .tasks { - background-image: url("../img/app-icons/Tasks.svg") !important; -} -.new-icons .photos { - background-image: url("../img/app-icons/Gallery.svg") !important; -} -.new-icons .e-user-support-center { - background-image: url("../img/app-icons/Support.svg") !important; -} -.new-icons .passwords { - background-image: url("../img/app-icons/Password.svg") !important; -} -.new-icons .onlyoffice_docx { - background-image: url("../img/app-icons/Docs.svg") !important; -} -.new-icons .onlyoffice_xlsx { - background-image: url("../img/app-icons/Spreadsheet.svg") !important; -} -.new-icons .onlyoffice_pptx { - background-image: url("../img/app-icons/Presentation.svg") !important; -} -.new-icons .cookbook { - background-image: url("../img/app-icons/Cookbook.svg") !important; -} - #appmenu li:hover a, #appmenu li a:focus { font-size: 12px; @@ -1693,10 +1615,6 @@ button#quotaincreasebutton { margin-top: 15px !important; } @media only screen and(max-width: 640px) { - .new-icons .color-icons { - height: 50px; - background-size: 40px; - } #launcher-menu { width: 300px !important; left: 10% !important; diff --git a/core/img/app-icons/Activity.svg b/core/img/app-icons/Activity.svg deleted file mode 100644 index 57ac25be..00000000 --- a/core/img/app-icons/Activity.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/core/img/app-icons/Bookmark.svg b/core/img/app-icons/Bookmark.svg deleted file mode 100644 index 024db3bb..00000000 --- a/core/img/app-icons/Bookmark.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/img/app-icons/Calendar.svg b/core/img/app-icons/Calendar.svg deleted file mode 100644 index 1a3f1465..00000000 --- a/core/img/app-icons/Calendar.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/core/img/app-icons/Carnet.svg b/core/img/app-icons/Carnet.svg deleted file mode 100644 index b1fcd3c6..00000000 --- a/core/img/app-icons/Carnet.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/core/img/app-icons/Contacts.svg b/core/img/app-icons/Contacts.svg deleted file mode 100644 index 093ad70a..00000000 --- a/core/img/app-icons/Contacts.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/img/app-icons/Cookbook.svg b/core/img/app-icons/Cookbook.svg deleted file mode 100644 index 72305dfc..00000000 --- a/core/img/app-icons/Cookbook.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/core/img/app-icons/E-mail.svg b/core/img/app-icons/E-mail.svg deleted file mode 100644 index 3d5aeb5b..00000000 --- a/core/img/app-icons/E-mail.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/img/app-icons/Gallery.svg b/core/img/app-icons/Gallery.svg deleted file mode 100644 index aa7d03fe..00000000 --- a/core/img/app-icons/Gallery.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/img/app-icons/Notes.svg b/core/img/app-icons/Notes.svg deleted file mode 100644 index ec826ea0..00000000 --- a/core/img/app-icons/Notes.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/img/app-icons/Support.svg b/core/img/app-icons/Support.svg deleted file mode 100644 index aa9b2cfb..00000000 --- a/core/img/app-icons/Support.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/core/img/app-icons/Tasks.svg b/core/img/app-icons/Tasks.svg deleted file mode 100644 index 82fd0dc0..00000000 --- a/core/img/app-icons/Tasks.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- GitLab From 68957a6874d9fdaf0613fd099edd4ab961c1d584 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Thu, 4 May 2023 19:22:07 +0530 Subject: [PATCH 5/8] bright class added --- core/css/server.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 4b803a0e..3b1eb4e8 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1673,3 +1673,6 @@ body.theme--dark.theme--highcontrast #header #appmenu li:focus a { #content.app-files #filestable { padding-top: 20px; } +.custom-app-icon{ + filter: var(--background-invert-if-bright); +} -- GitLab From 3e36962c617cf99bd5433ab817ed1c1ce5b9cae0 Mon Sep 17 00:00:00 2001 From: Ronak Date: Mon, 15 May 2023 10:20:14 -0700 Subject: [PATCH 6/8] removed close button css --- core/css/server.css | 1 - 1 file changed, 1 deletion(-) diff --git a/core/css/server.css b/core/css/server.css index 1167599f..c966af75 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -840,7 +840,6 @@ body[data-dashboard-background="default"] #app-dashboard h2 { background-image: var(--icon-text-007fff); } -#uploadprogressbar + button.icon-close, #google-drive button .icon-close, #google-photos button .icon-close { background-image: var(--icon-close-fff); -- GitLab From 6601040caf087935f43d555547066b925afe5462 Mon Sep 17 00:00:00 2001 From: Ronak Date: Tue, 16 May 2023 02:11:57 -0700 Subject: [PATCH 7/8] revert --- core/css/server.css | 1 + 1 file changed, 1 insertion(+) diff --git a/core/css/server.css b/core/css/server.css index c966af75..1167599f 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -840,6 +840,7 @@ body[data-dashboard-background="default"] #app-dashboard h2 { background-image: var(--icon-text-007fff); } +#uploadprogressbar + button.icon-close, #google-drive button .icon-close, #google-photos button .icon-close { background-image: var(--icon-close-fff); -- GitLab From 860dc06ba9f045b65cfe314fbe491edaf6b68fa3 Mon Sep 17 00:00:00 2001 From: Ronak Date: Wed, 17 May 2023 01:22:17 -0700 Subject: [PATCH 8/8] added new var --- core/css/server.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index 1167599f..e53d0cb0 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -59,6 +59,7 @@ --notification-icon-has-notification: var(--icon-has-notification-dark); --search-icon: var(--original-icon-search-dark); --body-container-radius: 0px; + --app-icon-filter: brightness(0.5); } /* Force a few variables to right values for dark theme */ @@ -70,6 +71,7 @@ body[data-themes="dark"] , body[data-themes="dark-highcontrast"]{ --notification-icon: var(--original-icon-notifications-white); --notification-icon-has-notification: var(--icon-has-notification-light); --search-icon: var(--original-icon-search-white); + --app-icon-filter: brightness(1); } body.theme--highcontrast { -- GitLab