From 9de6a61ea5c1c0394c3f12644111d1eec06edce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 11 May 2022 21:39:54 +0200 Subject: [PATCH] Move to vue-material-design-icons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- css/deck.css | 9 +++ css/globalstyles.scss | 28 --------- css/icons.scss | 41 ------------- img/activity-dark.svg | 4 ++ img/activity.svg | 4 ++ img/archive-white.svg | 1 - img/archive.svg | 1 - img/circles-dark.svg | 1 + img/circles.svg | 2 +- img/clone.svg | 1 - img/reply.svg | 1 - package-lock.json | 13 +++-- package.json | 1 + src/App.vue | 32 ++++++++++- src/components/Controls.vue | 57 ++++++++++++++----- src/components/board/Stack.vue | 7 ++- src/components/card/CardSidebar.vue | 8 ++- src/components/card/CommentItem.vue | 7 ++- src/components/card/Description.vue | 7 ++- src/components/cards/AvatarList.vue | 1 + src/components/cards/CardBadges.vue | 44 +++++++------- src/components/cards/CardMenu.vue | 10 +++- src/components/navigation/AppNavigation.vue | 9 ++- .../navigation/AppNavigationBoard.vue | 16 +++++- .../navigation/AppNavigationBoardCategory.vue | 3 + templates/main.php | 4 +- 26 files changed, 183 insertions(+), 129 deletions(-) delete mode 100644 css/globalstyles.scss delete mode 100644 css/icons.scss create mode 100644 img/activity-dark.svg create mode 100644 img/activity.svg delete mode 100644 img/archive-white.svg delete mode 100644 img/archive.svg create mode 100644 img/circles-dark.svg delete mode 100644 img/clone.svg delete mode 100644 img/reply.svg diff --git a/css/deck.css b/css/deck.css index b1a48d88e..601eb98f3 100644 --- a/css/deck.css +++ b/css/deck.css @@ -5,3 +5,12 @@ .icon-deck-white, .icon-deck.icon-white { background-image: url(../img/deck.svg); } + +body[data-theme-dark] .icon-deck { + background-image: url(../img/deck.svg); +} + +body[data-theme-dark] .icon-deck-white, +body[data-theme-dark] .icon-deck.icon-white { + background-image: url(../img/deck-dark.svg); +} diff --git a/css/globalstyles.scss b/css/globalstyles.scss deleted file mode 100644 index 9fd0a5d9c..000000000 --- a/css/globalstyles.scss +++ /dev/null @@ -1,28 +0,0 @@ -/* - * @copyright Copyright (c) 2016 Julius Härtl - * - * @author Julius Härtl - * @author Artem Anufrij - * @author Marin Treselj - * @author Oskar Kurz - * @author Ryan Fletcher - * - * @license GNU AGPL version 3 or any later version - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - */ - -@import 'icons'; -@import 'print'; diff --git a/css/icons.scss b/css/icons.scss deleted file mode 100644 index 6f2f35167..000000000 --- a/css/icons.scss +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Custom icons - */ -@include icon-black-white('deck', 'deck', 1); -@include icon-black-white('archive', 'deck', 1); -@include icon-black-white('circles', 'deck', 1); -@include icon-black-white('clone', 'deck', 1); -@include icon-black-white('filter', 'deck', 1); -@include icon-black-white('filter_set', 'deck', 1); -@include icon-black-white('attach', 'deck', 1); -@include icon-black-white('reply', 'deck', 1); -@include icon-black-white('notifications-dark', 'deck', 1); -@include icon-black-white('description', 'deck', 1); - -.icon-toggle-compact-collapsed { - @include icon-color('toggle-view-expand', 'deck', $color-black); -} - -.icon-toggle-compact-expanded { - @include icon-color('toggle-view-collapse', 'deck', $color-black); -} -.icon-activity { - @include icon-color('activity-dark', 'activity', $color-black); -} -.icon-comment--unread { - @include icon-color('comment', 'actions', $color-primary, 1, true); -} - -.avatardiv.circles { - background: var(--color-primary); -} - -.icon-circles { - opacity: 1; - background-size: 20px; - background-position: center center; -} - -.icon-colorpicker { - background-image: url('../img/color_picker.svg'); -} diff --git a/img/activity-dark.svg b/img/activity-dark.svg new file mode 100644 index 000000000..ee6ebdf11 --- /dev/null +++ b/img/activity-dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/activity.svg b/img/activity.svg new file mode 100644 index 000000000..df76fb137 --- /dev/null +++ b/img/activity.svg @@ -0,0 +1,4 @@ + + + + diff --git a/img/archive-white.svg b/img/archive-white.svg deleted file mode 100644 index ef4c7baa6..000000000 --- a/img/archive-white.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/archive.svg b/img/archive.svg deleted file mode 100644 index 63079a4c4..000000000 --- a/img/archive.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/circles-dark.svg b/img/circles-dark.svg new file mode 100644 index 000000000..30035d9dc --- /dev/null +++ b/img/circles-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/img/circles.svg b/img/circles.svg index 30035d9dc..1fe9999e2 100644 --- a/img/circles.svg +++ b/img/circles.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/img/clone.svg b/img/clone.svg deleted file mode 100644 index 469fd1beb..000000000 --- a/img/clone.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/img/reply.svg b/img/reply.svg deleted file mode 100644 index a198103b8..000000000 --- a/img/reply.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 1b866594a..45c5daf5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,6 +38,7 @@ "vue-click-outside": "^1.1.0", "vue-easymde": "^2.0.0", "vue-infinite-loading": "^2.4.5", + "vue-material-design-icons": "^5.1.2", "vue-router": "^3.5.4", "vue-smooth-dnd": "^0.8.1", "vuex": "^3.6.2", @@ -18233,9 +18234,9 @@ } }, "node_modules/vue-material-design-icons": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.0.0.tgz", - "integrity": "sha512-lYSJFW/TyQqmg7MvUbEB8ua1mwWy/v8qve7QJuA/UWUAXC4/yVUdAm4pg/sM9+k5n7VLckBv6ucOROuGBsGPDQ==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.1.2.tgz", + "integrity": "sha512-nD1qFM2qAkMlVoe23EfNKIeMfYl6YjHZjSty9q0mwc2gXmPmvEhixywJQhM+VF5KVBI1zAkVTNLoUEERPY10pA==" }, "node_modules/vue-multiselect": { "version": "2.1.6", @@ -32526,9 +32527,9 @@ } }, "vue-material-design-icons": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.0.0.tgz", - "integrity": "sha512-lYSJFW/TyQqmg7MvUbEB8ua1mwWy/v8qve7QJuA/UWUAXC4/yVUdAm4pg/sM9+k5n7VLckBv6ucOROuGBsGPDQ==" + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-5.1.2.tgz", + "integrity": "sha512-nD1qFM2qAkMlVoe23EfNKIeMfYl6YjHZjSty9q0mwc2gXmPmvEhixywJQhM+VF5KVBI1zAkVTNLoUEERPY10pA==" }, "vue-multiselect": { "version": "2.1.6" diff --git a/package.json b/package.json index 17ba74b9b..e01208ff0 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "vue-click-outside": "^1.1.0", "vue-easymde": "^2.0.0", "vue-infinite-loading": "^2.4.5", + "vue-material-design-icons": "^5.1.2", "vue-router": "^3.5.4", "vue-smooth-dnd": "^0.8.1", "vuex": "^3.6.2", diff --git a/src/App.vue b/src/App.vue index 10b1aed05..b1d044f38 100644 --- a/src/App.vue +++ b/src/App.vue @@ -42,7 +42,6 @@