Merge branch 'various-css-fixes' into shigusegubu
* various-css-fixes: fix build warnings lint remove 'md' size that doesn't exist
This commit is contained in:
commit
5ab02e1668
10 changed files with 45 additions and 49 deletions
|
@ -37,7 +37,7 @@ export default {
|
||||||
GlobalNoticeList
|
GlobalNoticeList
|
||||||
},
|
},
|
||||||
data: () => ({
|
data: () => ({
|
||||||
mobileActivePanel: 'timeline',
|
mobileActivePanel: 'timeline'
|
||||||
}),
|
}),
|
||||||
created () {
|
created () {
|
||||||
// Load the locale from the storage
|
// Load the locale from the storage
|
||||||
|
|
|
@ -69,7 +69,7 @@ export default {
|
||||||
hideSitename () { return this.$store.state.instance.hideSitename },
|
hideSitename () { return this.$store.state.instance.hideSitename },
|
||||||
logoLeft () { return this.$store.state.instance.logoLeft },
|
logoLeft () { return this.$store.state.instance.logoLeft },
|
||||||
currentUser () { return this.$store.state.users.currentUser },
|
currentUser () { return this.$store.state.users.currentUser },
|
||||||
privateMode () { return this.$store.state.instance.private },
|
privateMode () { return this.$store.state.instance.private }
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
scrollToTop () {
|
scrollToTop () {
|
||||||
|
@ -84,6 +84,6 @@ export default {
|
||||||
},
|
},
|
||||||
openSettingsModal () {
|
openSettingsModal () {
|
||||||
this.$store.dispatch('openSettingsModal')
|
this.$store.dispatch('openSettingsModal')
|
||||||
},
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -18,6 +18,8 @@ import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
|
||||||
library.add(
|
library.add(
|
||||||
faCircleNotch
|
faCircleNotch
|
||||||
)
|
)
|
||||||
|
|
||||||
|
export default {}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
|
|
@ -87,7 +87,8 @@
|
||||||
</a>
|
</a>
|
||||||
<div
|
<div
|
||||||
v-show="previewLoading"
|
v-show="previewLoading"
|
||||||
class="preview-spinner">
|
class="preview-spinner"
|
||||||
|
>
|
||||||
<FAIcon
|
<FAIcon
|
||||||
class="fa-old-padding"
|
class="fa-old-padding"
|
||||||
spin
|
spin
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
>
|
>
|
||||||
<div class="reaction-picker-filter">
|
<div class="reaction-picker-filter">
|
||||||
<input
|
<input
|
||||||
size="1"
|
|
||||||
v-model="filterWord"
|
v-model="filterWord"
|
||||||
|
size="1"
|
||||||
:placeholder="$t('emoji.search_emoji')"
|
:placeholder="$t('emoji.search_emoji')"
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
class="SearchBar"
|
class="SearchBar"
|
||||||
:class="{ '-expanded': !hidden }"
|
:class="{ '-expanded': !hidden }"
|
||||||
>
|
>
|
||||||
|
|
|
@ -126,6 +126,8 @@ library.add(
|
||||||
faRetweet,
|
faRetweet,
|
||||||
faReply
|
faReply
|
||||||
)
|
)
|
||||||
|
|
||||||
|
export default {}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
|
Loading…
Add table
Reference in a new issue