From 52fd57e1a0edbab389161eb510b272ad81b22dc0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 13 Jul 2022 17:23:56 +0200 Subject: [PATCH 1/2] Fix custom SVGs to match the new lib version Signed-off-by: Joas Schilling --- .../CancelPresentation.vue | 24 +++++++---------- .../missingMaterialDesignIcons/GridView.vue | 26 ++++++++----------- .../missingMaterialDesignIcons/Lobby.vue | 26 ++++++++----------- .../missingMaterialDesignIcons/MenuPeople.vue | 26 ++++++++----------- .../PresentToAll.vue | 24 +++++++---------- .../PromotedView.vue | 26 ++++++++----------- 6 files changed, 64 insertions(+), 88 deletions(-) diff --git a/src/components/missingMaterialDesignIcons/CancelPresentation.vue b/src/components/missingMaterialDesignIcons/CancelPresentation.vue index 4cca75f0d5a..066fdb50480 100644 --- a/src/components/missingMaterialDesignIcons/CancelPresentation.vue +++ b/src/components/missingMaterialDesignIcons/CancelPresentation.vue @@ -1,20 +1,20 @@ - @@ -25,11 +25,7 @@ export default { props: { title: { type: String, - default: 'Cancel Presentation icon', - }, - decorative: { - type: Boolean, - default: false, + default: '', }, fillColor: { type: String, diff --git a/src/components/missingMaterialDesignIcons/GridView.vue b/src/components/missingMaterialDesignIcons/GridView.vue index 8f6346335d1..951e6dea4f7 100644 --- a/src/components/missingMaterialDesignIcons/GridView.vue +++ b/src/components/missingMaterialDesignIcons/GridView.vue @@ -1,15 +1,14 @@ - @@ -37,11 +37,7 @@ export default { props: { title: { type: String, - default: 'Grid View icon', - }, - decorative: { - type: Boolean, - default: false, + default: '', }, fillColor: { type: String, diff --git a/src/components/missingMaterialDesignIcons/Lobby.vue b/src/components/missingMaterialDesignIcons/Lobby.vue index 577a68d2b08..1786e360a1b 100644 --- a/src/components/missingMaterialDesignIcons/Lobby.vue +++ b/src/components/missingMaterialDesignIcons/Lobby.vue @@ -1,17 +1,17 @@ - @@ -22,11 +22,7 @@ export default { props: { title: { type: String, - default: 'Lobby icon', - }, - decorative: { - type: Boolean, - default: false, + default: '', }, fillColor: { type: String, diff --git a/src/components/missingMaterialDesignIcons/MenuPeople.vue b/src/components/missingMaterialDesignIcons/MenuPeople.vue index 86b4db0781a..4b74611bc5c 100644 --- a/src/components/missingMaterialDesignIcons/MenuPeople.vue +++ b/src/components/missingMaterialDesignIcons/MenuPeople.vue @@ -1,17 +1,17 @@ - @@ -22,11 +22,7 @@ export default { props: { title: { type: String, - default: 'Menu People icon', - }, - decorative: { - type: Boolean, - default: false, + default: '', }, fillColor: { type: String, diff --git a/src/components/missingMaterialDesignIcons/PresentToAll.vue b/src/components/missingMaterialDesignIcons/PresentToAll.vue index ab1befec674..40c79135ed1 100644 --- a/src/components/missingMaterialDesignIcons/PresentToAll.vue +++ b/src/components/missingMaterialDesignIcons/PresentToAll.vue @@ -1,18 +1,18 @@ - @@ -23,11 +23,7 @@ export default { props: { title: { type: String, - default: 'Present To All icon', - }, - decorative: { - type: Boolean, - default: false, + default: '', }, fillColor: { type: String, diff --git a/src/components/missingMaterialDesignIcons/PromotedView.vue b/src/components/missingMaterialDesignIcons/PromotedView.vue index cd2c4d2d567..e1dee2b164f 100644 --- a/src/components/missingMaterialDesignIcons/PromotedView.vue +++ b/src/components/missingMaterialDesignIcons/PromotedView.vue @@ -1,15 +1,14 @@ - @@ -37,11 +37,7 @@ export default { props: { title: { type: String, - default: 'Promoted View icon', - }, - decorative: { - type: Boolean, - default: false, + default: '', }, fillColor: { type: String, From bb40af310831bca4477270a3e3cdc86b2d04fb48 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 13 Jul 2022 17:36:23 +0200 Subject: [PATCH 2/2] Since v5.0.0 of the lib, the property decorative has been removed. This means the "decorative" is added to the span element, causing the HTML validation to fail: > Attribute decorative not allowed on element span at this point. Upstream commit https://github.com/robcresswell/vue-material-design-icons/commit/c65d8ea786ea49210193cb3129c12a68ed6c0baf > This patch also removes the default title, encouraging better > accessibility by removing unhelpful titles that dont indicate usage. The > `decorative` prop has been removed and any icons that do not have a > meaningful title will be hidden from screen readers. Signed-off-by: Joas Schilling --- src/components/CallView/Grid/Grid.vue | 12 +-- .../CallView/shared/LocalMediaControls.vue | 73 +++++-------------- src/components/CallView/shared/Video.vue | 2 - .../CallView/shared/VideoBottomBar.vue | 26 ++----- src/components/ConversationIcon.vue | 12 +-- src/components/Description/Description.vue | 12 +-- .../DeviceChecker/DeviceChecker.vue | 20 +---- .../ConversationsList/Conversation.vue | 20 ++--- .../NewGroupConversation.vue | 4 +- .../SetContacts/SetContacts.vue | 4 +- .../LeftSidebar/SearchBox/SearchBox.vue | 4 +- src/components/LobbyScreen.vue | 4 +- .../MessageButtonsBar/MessageButtonsBar.vue | 28 ++----- .../Message/MessagePart/FilePreview.vue | 7 +- .../AudioRecorder/AudioRecorder.vue | 8 +- .../NewMessageForm/NewMessageForm.vue | 12 +-- src/components/Quote.vue | 4 +- .../Participant/Participant.vue | 34 +++------ .../ParticipantsSearchResults.vue | 4 +- src/components/RightSidebar/RightSidebar.vue | 20 ++--- .../SharedItems/SharedItemsTab.vue | 4 +- src/components/SetGuestUsername.vue | 8 +- src/components/TopBar/CallButton.vue | 24 ++---- src/components/TopBar/TopBar.vue | 24 ++---- src/components/UploadEditor.vue | 4 +- 25 files changed, 91 insertions(+), 283 deletions(-) diff --git a/src/components/CallView/Grid/Grid.vue b/src/components/CallView/Grid/Grid.vue index 41e24cbed57..c4504ec5192 100644 --- a/src/components/CallView/Grid/Grid.vue +++ b/src/components/CallView/Grid/Grid.vue @@ -27,13 +27,9 @@ @click="handleClickStripeCollapse"> @@ -44,9 +40,7 @@ class="grid-navigation grid-navigation__previous" :aria-label="t('spreed', 'Previous page of videos')" @click="handleClickPrevious"> -
-
diff --git a/src/components/CallView/shared/LocalMediaControls.vue b/src/components/CallView/shared/LocalMediaControls.vue index a006f51559d..4ad0e2206e8 100644 --- a/src/components/CallView/shared/LocalMediaControls.vue +++ b/src/components/CallView/shared/LocalMediaControls.vue @@ -30,9 +30,7 @@ :open="showQualityWarningTooltip"> + fill-color="#ffffff" /> + fill-color="#ffffff" /> + fill-color="#ffffff" /> + fill-color="#ffffff" /> + fill-color="#ffffff" /> {{ screenSharingButtonTooltip }} + :size="20" /> {{ t('spreed', 'Show your screen') }} + :size="20" /> {{ t('spreed', 'Stop screensharing') }} @@ -174,9 +150,7 @@ @click.stop="toggleHandRaised"> - {{ raiseHandButtonLabel }} @@ -203,14 +174,10 @@ @click="toggleVirtualBackground"> + :size="20" /> + :size="20" /> {{ toggleVirtualBackgroundButtonLabel }} @@ -219,21 +186,17 @@ @click="changeView"> + :size="20" /> + :size="20" /> {{ changeViewText }} + :size="20" /> {{ t('spreed', 'Devices settings') }} diff --git a/src/components/CallView/shared/Video.vue b/src/components/CallView/shared/Video.vue index 6f60f5b4531..73f24decdb1 100644 --- a/src/components/CallView/shared/Video.vue +++ b/src/components/CallView/shared/Video.vue @@ -70,8 +70,6 @@ :key="'placeholderForPromoted'" class="placeholder-for-promoted"> diff --git a/src/components/CallView/shared/VideoBottomBar.vue b/src/components/CallView/shared/VideoBottomBar.vue index 0dc05a2db68..24c18e87b01 100644 --- a/src/components/CallView/shared/VideoBottomBar.vue +++ b/src/components/CallView/shared/VideoBottomBar.vue @@ -26,8 +26,6 @@
@@ -54,14 +52,10 @@ @click.stop="forceMute"> + fill-color="#ffffff" /> + fill-color="#ffffff" />
diff --git a/src/components/ConversationIcon.vue b/src/components/ConversationIcon.vue index 32d6ae99329..cbee8980c59 100644 --- a/src/components/ConversationIcon.vue +++ b/src/components/ConversationIcon.vue @@ -37,18 +37,14 @@ class="conversation-icon__avatar" />
-
- + {{ t('spreed', 'Favorite') }}
diff --git a/src/components/Description/Description.vue b/src/components/Description/Description.vue index 45afadbe72a..252fd8d5e60 100644 --- a/src/components/Description/Description.vue +++ b/src/components/Description/Description.vue @@ -39,9 +39,7 @@ :aria-label="t('spreed', 'Cancel editing description')" @click="handleCancelEditing">
diff --git a/src/components/DeviceChecker/DeviceChecker.vue b/src/components/DeviceChecker/DeviceChecker.vue index 3ca0cca16b4..94b681bcc77 100644 --- a/src/components/DeviceChecker/DeviceChecker.vue +++ b/src/components/DeviceChecker/DeviceChecker.vue @@ -67,12 +67,8 @@ @click="toggleAudio"> @@ -90,12 +86,8 @@ @click="toggleVideo"> @@ -109,13 +101,9 @@ @click="toggleBlur">
@@ -127,9 +115,7 @@ class="select-devices" @click="showDeviceSelection = true"> {{ t('spreed', 'Choose devices') }} diff --git a/src/components/LeftSidebar/ConversationsList/Conversation.vue b/src/components/LeftSidebar/ConversationsList/Conversation.vue index d3d8cbfecf0..fc693236139 100644 --- a/src/components/LeftSidebar/ConversationsList/Conversation.vue +++ b/src/components/LeftSidebar/ConversationsList/Conversation.vue @@ -48,15 +48,11 @@ @click.prevent.exact="toggleFavoriteConversation"> + :size="20" /> + :fill-color="'#FFCC00'" /> {{ labelFavorite }} {{ t('spreed', 'Mark as read') }} + :size="20" /> {{ t('spreed', 'Conversation settings') }} {{ t('spreed', 'Delete conversation') }} diff --git a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue index 8c7bdb44696..ecae3d5cee4 100644 --- a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue +++ b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue @@ -29,9 +29,7 @@ :aria-label="t('spreed', 'Create a new group conversation')" @click="showModal"> diff --git a/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue b/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue index 3865fa2903a..30f55a41d18 100644 --- a/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue +++ b/src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue @@ -36,9 +36,7 @@ :aria-label="cancelSearchLabel" @click="abortSearch"> diff --git a/src/components/LobbyScreen.vue b/src/components/LobbyScreen.vue index 5aa726c2c25..7b7a9490df7 100644 --- a/src/components/LobbyScreen.vue +++ b/src/components/LobbyScreen.vue @@ -21,9 +21,7 @@