diff options
author | Marco <marcoambrosini@pm.me> | 2022-07-13 17:18:22 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-13 17:18:22 +0300 |
commit | dcf6fc97344e73482e42977dc5104e741ae7a2fa (patch) | |
tree | 381da253f5425d154846e903badb25ca865a194d /src | |
parent | aca44ace79094a34a6f03676f6ce2cfd2c4c16d1 (diff) | |
parent | b722a4bc89a010523b3058e15afaf366dcc1b525 (diff) |
Merge pull request #7133 from nextcloud/dependabot/npm_and_yarn/nextcloud/vue-5.3.1
Bump @nextcloud/vue from 5.3.0 to 5.3.1
Diffstat (limited to 'src')
14 files changed, 97 insertions, 45 deletions
diff --git a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue index aec78bcf8..64387999b 100644 --- a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue +++ b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue @@ -633,6 +633,10 @@ export default { filter: var(--background-invert-if-dark); } +::v-deep .modal-container { + height: 700px; +} + .matterbridge-settings { .loading { margin-top: 30px; diff --git a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue index 49c24b572..8c7bdb446 100644 --- a/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue +++ b/src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue @@ -28,9 +28,11 @@ icon="" :aria-label="t('spreed', 'Create a new group conversation')" @click="showModal"> - <Plus decorative - title="" - :size="20" /> + <template #icon> + <Plus decorative + title="" + :size="20" /> + </template> </Button> <!-- New group form --> <Modal v-if="modal" @@ -399,6 +401,7 @@ export default { it back */ ::v-deep .modal-container { border-radius: var(--border-radius-large) !important; + height: 700px; } .navigation { diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue index a40d6e4e9..46c94abef 100644 --- a/src/components/MessagesList/MessagesGroup/Message/Message.vue +++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue @@ -83,9 +83,11 @@ the main body of the message as well as a quote. class="nc-button nc-button__main--dark" :aria-label="sendingErrorIconTooltip" @click="handleRetry"> - <Reload decorative - title="" - :size="16" /> + <template #icon> + <Reload decorative + title="" + :size="16" /> + </template> </Button> <AlertCircle v-else decorative diff --git a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue index 67ce6d630..a5c87774a 100644 --- a/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue +++ b/src/components/MessagesList/MessagesGroup/Message/MessageButtonsBar/MessageButtonsBar.vue @@ -29,7 +29,9 @@ :aria-label="t('spreed', 'Add a reaction to this message')" @click="openReactionsMenu"> <template #icon> - <EmoticonOutline :size="20" /> + <EmoticonOutline decorative + :size="20" + title="" /> </template> </Button> <Actions v-show="isReplyable"> @@ -109,7 +111,9 @@ :aria-label="t('spreed', 'Close reactions menu')" @click="closeReactionsMenu"> <template #icon> - <ArrowLeft :size="20" /> + <ArrowLeft decorative + :size="20" + title="" /> </template> </Button> <Button type="tertiary" @@ -133,7 +137,9 @@ <Button type="tertiary" :aria-label="t('spreed', 'React with another emoji')"> <template #icon> - <Plus :size="20" /> + <Plus decorative + :size="20" + title="" /> </template> </Button> </EmojiPicker> diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue index c54764dd0..c48c03b56 100644 --- a/src/components/MessagesList/MessagesList.vue +++ b/src/components/MessagesList/MessagesList.vue @@ -915,7 +915,7 @@ export default { } .scroll-to-bottom { - position: absolute; + position: absolute !important; bottom: 76px; right: 24px; z-index: 2; diff --git a/src/components/NewMessageForm/AudioRecorder/AudioRecorder.vue b/src/components/NewMessageForm/AudioRecorder/AudioRecorder.vue index e488e0307..43fa1c80f 100644 --- a/src/components/NewMessageForm/AudioRecorder/AudioRecorder.vue +++ b/src/components/NewMessageForm/AudioRecorder/AudioRecorder.vue @@ -30,9 +30,11 @@ type="tertiary" :disabled="!canStartRecording" @click="start"> - <Microphone :size="16" - title="" - decorative /> + <template #icon> + <Microphone :size="16" + title="" + decorative /> + </template> </Button> <div v-else class="wrapper"> <Button v-tooltip.auto="{ diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue index 40f721ed1..2dc8d3164 100644 --- a/src/components/NewMessageForm/NewMessageForm.vue +++ b/src/components/NewMessageForm/NewMessageForm.vue @@ -70,9 +70,11 @@ :aria-label="t('spreed', 'Add emoji')" type="tertiary-no-background" :aria-haspopup="true"> - <EmoticonOutline :size="16" - decorative - title="" /> + <template #icon> + <EmoticonOutline :size="16" + decorative + title="" /> + </template> </Button> </EmojiPicker> <!-- Disabled emoji picker placeholder button --> @@ -80,9 +82,11 @@ type="tertiary" :aria-label="t('spreed', 'Add emoji')" :disabled="true"> - <EmoticonOutline :size="16" - decorative - title="" /> + <template #icon> + <EmoticonOutline :size="16" + decorative + title="" /> + </template> </Button> </div> <div v-if="messageToBeReplied" class="new-message-form__quote"> @@ -128,9 +132,11 @@ :title="t('spreed', 'Send message')" :aria-label="t('spreed', 'Send message')" @click.prevent="handleSubmit({ silent: false })"> - <Send title="" - :size="16" - decorative /> + <template #icon> + <Send title="" + :size="16" + decorative /> + </template> </Button> </template> </form> diff --git a/src/components/RightSidebar/Participants/ParticipantsSearchResults/ParticipantsSearchResults.vue b/src/components/RightSidebar/Participants/ParticipantsSearchResults/ParticipantsSearchResults.vue index f35fe2755..7763ff0cc 100644 --- a/src/components/RightSidebar/Participants/ParticipantsSearchResults/ParticipantsSearchResults.vue +++ b/src/components/RightSidebar/Participants/ParticipantsSearchResults/ParticipantsSearchResults.vue @@ -54,11 +54,12 @@ :key="'integration' + index" type="tertiary-no-background" @click="runIntegration(integration)"> - <!-- FIXME: dinamically change the material design icon --> - <AccountPlus slot="icon" - decorative - title="" - :size="20" /> + <!-- FIXME: dynamically change the material design icon --> + <template #icon> + <AccountPlus decorative + title="" + :size="20" /> + </template> {{ integration.label }} </Button> </ul> diff --git a/src/components/RightSidebar/SharedItems/SharedItemsBrowser/SharedItemsBrowser.vue b/src/components/RightSidebar/SharedItems/SharedItemsBrowser/SharedItemsBrowser.vue index 0b37b14f3..230912aa2 100644 --- a/src/components/RightSidebar/SharedItems/SharedItemsBrowser/SharedItemsBrowser.vue +++ b/src/components/RightSidebar/SharedItems/SharedItemsBrowser/SharedItemsBrowser.vue @@ -164,6 +164,10 @@ export default { } } +::v-deep .modal-container { + height: 700px; +} + ::v-deep .button-vue { border-radius: var(--border-radius-large); &.active { diff --git a/src/components/SetGuestUsername.vue b/src/components/SetGuestUsername.vue index bab20dd5a..4fa301c8e 100644 --- a/src/components/SetGuestUsername.vue +++ b/src/components/SetGuestUsername.vue @@ -46,9 +46,11 @@ native-type="submit" :aria-label="t('spreed', 'Save name')" type="tertiary"> - <ArrowRight :size="20" - title="" - decorative /> + <template #icon> + <ArrowRight :size="20" + title="" + decorative /> + </template> </Button> </div> </form> diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue index 174c2c793..6538e5a12 100644 --- a/src/components/TopBar/CallButton.vue +++ b/src/components/TopBar/CallButton.vue @@ -33,9 +33,11 @@ :disabled="startCallButtonDisabled || loading || blockCalls" :type="startCallButtonType" @click="handleClick"> - <Video slot="icon" - :size="20" - decorative /> + <template #icon> + <Video title="" + :size="20" + decorative /> + </template> {{ startCallLabel }} </Button> <Button v-else-if="showLeaveCallButton && !canEndForAll" @@ -43,30 +45,38 @@ type="error" :disabled="loading" @click="leaveCall(false)"> - <VideoOff slot="icon" - :size="20" - decorative /> + <template #icon> + <VideoOff title="" + :size="20" + decorative /> + </template> {{ leaveCallLabel }} </Button> <Actions v-else-if="showLeaveCallButton && canEndForAll" :disabled="loading"> - <template slot="icon"> + <template #icon> <VideoOff :size="16" + title="" decorative /> <span class="label">{{ leaveCallLabel }}</span> <MenuDown :size="16" + title="" decorative /> </template> <ActionButton @click="leaveCall(false)"> - <VideoOff slot="icon" - :size="20" - decorative /> + <template #icon> + <VideoOff title="" + :size="20" + decorative /> + </template> {{ leaveCallLabel }} </ActionButton> <ActionButton @click="leaveCall(true)"> - <VideoOff slot="icon" - :size="20" - decorative /> + <template #icon> + <VideoOff title="" + :size="20" + decorative /> + </template> {{ t('spreed', 'End meeting for all') }} </ActionButton> </Actions> diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue index 3b0ea761f..676312a1a 100644 --- a/src/components/TopBar/TopBar.vue +++ b/src/components/TopBar/TopBar.vue @@ -121,9 +121,13 @@ </ActionButton> </template> <ActionSeparator v-if="showModerationOptions" /> - <ActionButton icon="icon-settings" - :close-after-click="true" + <ActionButton :close-after-click="true" @click="openConversationSettings"> + <template #icon> + <Cog :size="20" + decorative + title="" /> + </template> {{ t('spreed', 'Conversation settings') }} </ActionButton> </Actions> diff --git a/src/components/UploadEditor.vue b/src/components/UploadEditor.vue index 091532d5d..5601f90d9 100644 --- a/src/components/UploadEditor.vue +++ b/src/components/UploadEditor.vue @@ -194,6 +194,10 @@ export default { <style lang="scss" scoped> @import '../assets/variables'; +::v-deep .modal-container { + height: 700px; +} + .upload-editor { height: 100%; position: relative; diff --git a/src/views/RoomSelector.vue b/src/views/RoomSelector.vue index 8274b8424..1657a0ae4 100644 --- a/src/views/RoomSelector.vue +++ b/src/views/RoomSelector.vue @@ -168,6 +168,10 @@ export default { <style lang="scss" scoped> +::v-deep .modal-container { + height: 700px; +} + .talk-modal { height: 80vh; } |