Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix HTML validation of material design icons #7600

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,7 @@
:aria-label="t('spreed', 'Edit permissions')"
class="nc-button nc-button__main"
@click="showPermissionsEditor = true">
<Pencil :size="20"
decorative
title="" />
<Pencil :size="20" />
</button>
</div>
<PermissionEditor v-if="showPermissionsEditor"
Expand Down
8 changes: 2 additions & 6 deletions src/components/ConversationSettings/LinkShareSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,14 @@
<div class="app-settings-subsection">
<button ref="copyLinkButton"
@click.prevent="handleCopyLink">
<ClipboardTextOutline :size="16"
decorative
title="" />
<ClipboardTextOutline :size="16" />
{{ t('spreed', 'Copy conversation link') }}
</button>
</div>
<div v-if="isSharedPublicly" class="app-settings-subsection">
<button :disabled="isSendingInvitations"
@click.prevent="handleResendInvitations">
<Email :size="16"
decorative
title="" />
<Email :size="16" />
{{ t('spreed', 'Resend invitations') }}
</button>
<span v-if="isSendingInvitations" class="icon-loading-small spinner" />
Expand Down
18 changes: 3 additions & 15 deletions src/components/ConversationSettings/NotificationsSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,51 +26,39 @@
class="radio-element"
:class="{'radio-element--active': isNotifyAlways}"
@click.prevent.exact="setNotificationLevel(1)">
<VolumeHigh decorative
title=""
:size="20"
<VolumeHigh :size="20"
class="radio-element__icon" />
<label class="radio-element__label">
{{ t('spreed', 'All messages') }}
</label>
<Check v-if="isNotifyAlways"
class="check"
decorative
title=""
:size="20" />
</a>
<a href="#"
class="radio-element"
:class="{'radio-element--active': isNotifyMention}"
@click.prevent.exact="setNotificationLevel(2)">
<Account decorative
title=""
:size="20"
<Account :size="20"
class="radio-element__icon" />
<label class="radio-element__label">
{{ t('spreed', '@-mentions only') }}
</label>
<Check v-if="isNotifyMention"
class="check"
decorative
title=""
:size="20" />
</a>
<a href="#"
class="radio-element"
:class="{'radio-element--active': isNotifyNever}"
@click.prevent.exact="setNotificationLevel(3)">
<VolumeOff decorative
title=""
:size="20"
<VolumeOff :size="20"
class="radio-element__icon" />
<label class="radio-element__label">
{{ t('spreed', 'Off') }}
</label>
<Check v-if="isNotifyNever"
class="check"
decorative
title=""
:size="20" />
</a>

Expand Down
8 changes: 2 additions & 6 deletions src/components/DeviceChecker/DeviceChecker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@
@click="silentCall= true">
{{ t('spreed', 'The conversation participants will not be notified about this call') }}
<BellOff slot="icon"
:size="16"
decorative
title="" />
:size="16" />
</ActionButton>
</template>
<template v-else>
Expand All @@ -157,9 +155,7 @@
@click="silentCall= false">
{{ t('spreed', 'The conversation participants will be notified about this call') }}
<Bell slot="icon"
:size="16"
decorative
title="" />
:size="16" />
</ActionButton>
</template>
</Actions>
Expand Down
14 changes: 3 additions & 11 deletions src/components/MessagesList/MessagesGroup/Message/Message.vue
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,10 @@ the main body of the message as well as a quote.
:aria-label="sendingErrorIconTooltip"
@click="handleRetry">
<template #icon>
<Reload decorative
title=""
:size="16" />
<Reload :size="16" />
</template>
</Button>
<AlertCircle v-else
decorative
title=""
:size="16" />
</div>
<div v-else-if="isTemporary && !isTemporaryUpload || isDeleting"
Expand All @@ -102,17 +98,13 @@ the main body of the message as well as a quote.
v-tooltip.auto="commonReadIconTooltip"
class="message-status"
:aria-label="commonReadIconTooltip">
<CheckAll decorative
title=""
:size="16" />
<CheckAll :size="16" />
</div>
<div v-else-if="showSentIcon"
v-tooltip.auto="sentIconTooltip"
class="message-status"
:aria-label="sentIconTooltip">
<Check decorative
title=""
:size="16" />
<Check :size="16" />
</div>
</div>
</div>
Expand Down
4 changes: 1 addition & 3 deletions src/components/MessagesList/MessagesList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ get the messagesList array and loop through the list to generate the messages.
class="scroll-to-bottom"
@click="smoothScrollToBottom">
<template #icon>
<ChevronDown decorative
title=""
:size="20" />
<ChevronDown :size="20" />
</template>
</Button>
</transition>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@
:class="{'audio-recorder__trigger--recording': isRecording}"
@click="stop">
<template #icon>
<Check :size="16"
title=""
decorative />
<Check :size="16" />
</template>
</Button>
</div>
Expand Down
8 changes: 2 additions & 6 deletions src/components/NewMessageForm/NewMessageForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,7 @@
@click.prevent="handleSubmit({ silent: true })">
{{ silentSendInfo }}
<BellOff slot="icon"
:size="16"
decorative
title="" />
:size="16" />
</ActionButton>
</Actions>
<!-- Send -->
Expand All @@ -127,9 +125,7 @@
:aria-label="t('spreed', 'Send message')"
@click.prevent="handleSubmit({ silent: false })">
<template #icon>
<Send title=""
:size="16"
decorative />
<Send :size="16" />
</template>
</Button>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,36 +133,28 @@
:close-after-click="true"
@click="applyDefaultPermissions">
<template #icon>
<LockReset :size="20"
title=""
decorative />
<LockReset :size="20" />
</template>
{{ t('spreed', 'Reset custom permissions') }}
</ActionButton>
<ActionButton :close-after-click="true"
@click="grantAllPermissions">
<template #icon>
<LockOpenVariant :size="20"
title=""
decorative />
<LockOpenVariant :size="20" />
</template>
{{ t('spreed', 'Grant all permissions') }}
</ActionButton>
<ActionButton :close-after-click="true"
@click="removeAllPermissions">
<template #icon>
<Lock :size="20"
title=""
decorative />
<Lock :size="20" />
</template>
{{ t('spreed', 'Remove all permissions') }}
</ActionButton>
<ActionButton :close-after-click="true"
@click="showPermissionsEditor">
<template #icon>
<Pencil :size="20"
title=""
decorative />
<Pencil :size="20" />
</template>
{{ t('spreed', 'Edit permissions') }}
</ActionButton>
Expand All @@ -177,9 +169,7 @@
:close-after-click="true"
@click="sendCallNotification">
<template #icon>
<Bell :size="20"
title=""
decorative />
<Bell :size="20" />
</template>
{{ t('spreed', 'Send call notification') }}
</ActionButton>
Expand Down