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 b7a097122d4a069328fcfb8406455dc3db775339..e53d0cb0abfa40cf5f7f0e4387be1a82c9463733 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 {
@@ -1659,86 +1661,8 @@ 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");
-}
-.new-icons .activity {
- background-image: url("../img/app-icons/Activity.svg");
-}
-.new-icons .bookmarks {
- background-image: url("../img/app-icons/Bookmark.svg");
-}
-.new-icons .calendar {
- background-image: url("../img/app-icons/Calendar.svg");
-}
-.new-icons .carnet {
- background-image: url("../img/app-icons/Carnet.svg");
-}
-.new-icons .contacts {
- background-image: url("../img/app-icons/Contacts.svg");
-}
-.new-icons .deck {
- background-image: url("../img/app-icons/Deck.svg");
-}
-.new-icons .docs {
- background-image: url("../img/app-icons/Docs.svg");
-}
-.new-icons .email,
-.new-icons .rainloop,
-.new-icons .snappymail {
- background-image: url("../img/app-icons/E-mail.svg");
-}
-.new-icons .gitlab {
- background-image: url("../img/app-icons/Gitlab.svg");
-}
-.new-icons .news {
- background-image: url("../img/app-icons/News.svg");
-}
-.new-icons .notes {
- background-image: url("../img/app-icons/Notes.svg");
-}
-.new-icons .presentation {
- background-image: url("../img/app-icons/Presentation.svg");
-}
-.new-icons .spreadsheet {
- background-image: url("../img/app-icons/Spreadsheet.svg");
-}
-.new-icons .tasks {
- background-image: url("../img/app-icons/Tasks.svg");
-}
-.new-icons .photos {
- background-image: url("../img/app-icons/Gallery.svg");
-}
-.new-icons .e-user-support-center {
- background-image: url("../img/app-icons/Support.svg");
-}
-.new-icons .passwords {
- background-image: url("../img/app-icons/Password.svg");
-}
-.new-icons .onlyoffice_docx {
- background-image: url("../img/app-icons/Docs.svg");
-}
-.new-icons .onlyoffice_xlsx {
- background-image: url("../img/app-icons/Spreadsheet.svg");
-}
-.new-icons .onlyoffice_pptx {
- background-image: url("../img/app-icons/Presentation.svg");
-}
-.new-icons .cookbook {
- background-image: url("../img/app-icons/Cookbook.svg");
-}
-
-#header .app-menu li:hover a,
-#header .app-menu li a:focus {
+#appmenu li:hover a,
+#appmenu li a:focus {
font-size: 12px;
font-family: 'Roboto';
letter-spacing: 1px;
@@ -1771,10 +1695,6 @@ progress {
@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 57ac25be77e154073751983daf68a46f87a72572..0000000000000000000000000000000000000000
--- 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 024db3bb7562c1bc9f28fc3f798bccff1dea346b..0000000000000000000000000000000000000000
--- 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 1a3f1465bbce2061ec5dd3193228c3e0483a8172..0000000000000000000000000000000000000000
--- 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 b1fcd3c6ca0608a57777c5307d386204f3b1aa38..0000000000000000000000000000000000000000
--- 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 093ad70a86219b4985502ffda0cbd24650c9bd27..0000000000000000000000000000000000000000
--- 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 72305dfc71c9695df434428e000bfcec2b1e8d13..0000000000000000000000000000000000000000
--- 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 3d5aeb5bece728aeef40e83ed24ef10a06f6fe99..0000000000000000000000000000000000000000
--- 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 aa7d03fe205ec41e251df64adfe57814fca6511c..0000000000000000000000000000000000000000
--- 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 ec826ea0c7ae7ae8fdf86a1abf85cdd3e08d1416..0000000000000000000000000000000000000000
--- 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 aa9b2cfbb6300d4453c9f20d0c64954d39d02206..0000000000000000000000000000000000000000
--- 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 82fd0dc08d7fd312df19a959f64aeab3de84547c..0000000000000000000000000000000000000000
--- a/core/img/app-icons/Tasks.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-
diff --git a/core/webfonts/montserrat.woff2 b/core/webfonts/montserrat.woff2
index e02a41b4e856477ede807b7d90e6c89057ac14fc..db978a8c9f62bfae2c10517afd0cf804f0d962aa 100644
Binary files a/core/webfonts/montserrat.woff2 and b/core/webfonts/montserrat.woff2 differ