Merge remote-tracking branch 'origin/develop' into various-css-fixes
* origin/develop: remove 'md' size that doesn't exist
This commit is contained in:
commit
994b49ddfe
|
@ -16,7 +16,6 @@
|
||||||
@click.prevent="muteConversation"
|
@click.prevent="muteConversation"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
size="md"
|
|
||||||
fixed-width
|
fixed-width
|
||||||
icon="eye-slash"
|
icon="eye-slash"
|
||||||
/><span>{{ $t("status.mute_conversation") }}</span>
|
/><span>{{ $t("status.mute_conversation") }}</span>
|
||||||
|
@ -27,7 +26,6 @@
|
||||||
@click.prevent="unmuteConversation"
|
@click.prevent="unmuteConversation"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
size="md"
|
|
||||||
fixed-width
|
fixed-width
|
||||||
icon="eye-slash"
|
icon="eye-slash"
|
||||||
/><span>{{ $t("status.unmute_conversation") }}</span>
|
/><span>{{ $t("status.unmute_conversation") }}</span>
|
||||||
|
@ -39,7 +37,6 @@
|
||||||
@click="close"
|
@click="close"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
size="md"
|
|
||||||
fixed-width
|
fixed-width
|
||||||
icon="thumbtack"
|
icon="thumbtack"
|
||||||
/><span>{{ $t("status.pin") }}</span>
|
/><span>{{ $t("status.pin") }}</span>
|
||||||
|
@ -51,7 +48,6 @@
|
||||||
@click="close"
|
@click="close"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
size="md"
|
|
||||||
fixed-width
|
fixed-width
|
||||||
icon="thumbtack"
|
icon="thumbtack"
|
||||||
/><span>{{ $t("status.unpin") }}</span>
|
/><span>{{ $t("status.unpin") }}</span>
|
||||||
|
@ -63,7 +59,6 @@
|
||||||
@click="close"
|
@click="close"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
size="md"
|
|
||||||
fixed-width
|
fixed-width
|
||||||
:icon="['far', 'bookmark']"
|
:icon="['far', 'bookmark']"
|
||||||
/><span>{{ $t("status.bookmark") }}</span>
|
/><span>{{ $t("status.bookmark") }}</span>
|
||||||
|
@ -75,7 +70,6 @@
|
||||||
@click="close"
|
@click="close"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
size="md"
|
|
||||||
fixed-width
|
fixed-width
|
||||||
icon="bookmark"
|
icon="bookmark"
|
||||||
/><span>{{ $t("status.unbookmark") }}</span>
|
/><span>{{ $t("status.unbookmark") }}</span>
|
||||||
|
@ -87,7 +81,6 @@
|
||||||
@click="close"
|
@click="close"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
size="md"
|
|
||||||
fixed-width
|
fixed-width
|
||||||
icon="times"
|
icon="times"
|
||||||
/><span>{{ $t("status.delete") }}</span>
|
/><span>{{ $t("status.delete") }}</span>
|
||||||
|
@ -98,7 +91,6 @@
|
||||||
@click="close"
|
@click="close"
|
||||||
>
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
size="md"
|
|
||||||
fixed-width
|
fixed-width
|
||||||
icon="share-alt"
|
icon="share-alt"
|
||||||
/><span>{{ $t("status.copy_link") }}</span>
|
/><span>{{ $t("status.copy_link") }}</span>
|
||||||
|
@ -109,7 +101,6 @@
|
||||||
<FAIcon
|
<FAIcon
|
||||||
class="ExtraButtons fa-scale-110 fa-old-padding"
|
class="ExtraButtons fa-scale-110 fa-old-padding"
|
||||||
icon="ellipsis-h"
|
icon="ellipsis-h"
|
||||||
size="md"
|
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
</Popover>
|
</Popover>
|
||||||
|
|
Loading…
Reference in New Issue