check for betterShadow support in the userAvatar instead of its parents
This commit is contained in:
parent
28955d8444
commit
fa76be2f9a
10 changed files with 5 additions and 22 deletions
|
@ -66,7 +66,6 @@ const ChatMessage = {
|
||||||
return this.message.attachments.length > 0
|
return this.message.attachments.length > 0
|
||||||
},
|
},
|
||||||
...mapState({
|
...mapState({
|
||||||
betterShadow: state => state.interface.browserSupport.cssFilter,
|
|
||||||
currentUser: state => state.users.currentUser,
|
currentUser: state => state.users.currentUser,
|
||||||
restrictedNicknames: state => state.instance.restrictedNicknames
|
restrictedNicknames: state => state.instance.restrictedNicknames
|
||||||
}),
|
}),
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
>
|
>
|
||||||
<UserAvatar
|
<UserAvatar
|
||||||
:compact="true"
|
:compact="true"
|
||||||
:better-shadow="betterShadow"
|
|
||||||
:user="author"
|
:user="author"
|
||||||
/>
|
/>
|
||||||
</UserPopover>
|
</UserPopover>
|
||||||
|
|
|
@ -18,7 +18,7 @@ export default {
|
||||||
{
|
{
|
||||||
component: 'Root',
|
component: 'Root',
|
||||||
directives: {
|
directives: {
|
||||||
'--defaultInputBevel': 'shadow | $borderSide(#FFFFFF bottom 0.2), $borderSide(#000000 top 0.2)',
|
'--defaultInputBevel': 'shadow | $borderSide(#FFFFFF bottom 0.2), $borderSide(#000000 top 0.2), inset 0 0 2 #000000 / 0.15',
|
||||||
'--defaultInputHoverGlow': 'shadow | 0 0 4 --text / 0.5',
|
'--defaultInputHoverGlow': 'shadow | 0 0 4 --text / 0.5',
|
||||||
'--defaultInputFocusGlow': 'shadow | 0 0 4 4 --link / 0.5'
|
'--defaultInputFocusGlow': 'shadow | 0 0 4 4 --link / 0.5'
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,6 @@ const Notification = {
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
statusExpanded: false,
|
statusExpanded: false,
|
||||||
betterShadow: this.$store.state.interface.browserSupport.cssFilter,
|
|
||||||
unmuted: false,
|
unmuted: false,
|
||||||
showingApproveConfirmDialog: false,
|
showingApproveConfirmDialog: false,
|
||||||
showingDenyConfirmDialog: false
|
showingDenyConfirmDialog: false
|
||||||
|
|
|
@ -48,7 +48,6 @@
|
||||||
<UserAvatar
|
<UserAvatar
|
||||||
class="post-avatar"
|
class="post-avatar"
|
||||||
:compact="true"
|
:compact="true"
|
||||||
:better-shadow="betterShadow"
|
|
||||||
:user="notification.from_profile"
|
:user="notification.from_profile"
|
||||||
/>
|
/>
|
||||||
</UserPopover>
|
</UserPopover>
|
||||||
|
|
|
@ -416,9 +416,6 @@ const Status = {
|
||||||
currentUser () {
|
currentUser () {
|
||||||
return this.$store.state.users.currentUser
|
return this.$store.state.users.currentUser
|
||||||
},
|
},
|
||||||
betterShadow () {
|
|
||||||
return this.$store.state.interface.browserSupport.cssFilter
|
|
||||||
},
|
|
||||||
mergedConfig () {
|
mergedConfig () {
|
||||||
return this.$store.getters.mergedConfig
|
return this.$store.getters.mergedConfig
|
||||||
},
|
},
|
||||||
|
|
|
@ -65,7 +65,6 @@
|
||||||
v-if="retweet"
|
v-if="retweet"
|
||||||
class="left-side repeater-avatar"
|
class="left-side repeater-avatar"
|
||||||
:show-actor-type-indicator="showActorTypeIndicator"
|
:show-actor-type-indicator="showActorTypeIndicator"
|
||||||
:better-shadow="betterShadow"
|
|
||||||
:user="statusoid.user"
|
:user="statusoid.user"
|
||||||
/>
|
/>
|
||||||
<div class="right-side faint">
|
<div class="right-side faint">
|
||||||
|
@ -120,7 +119,6 @@
|
||||||
class="post-avatar"
|
class="post-avatar"
|
||||||
:show-actor-type-indicator="showActorTypeIndicator"
|
:show-actor-type-indicator="showActorTypeIndicator"
|
||||||
:compact="compact"
|
:compact="compact"
|
||||||
:better-shadow="betterShadow"
|
|
||||||
:user="status.user"
|
:user="status.user"
|
||||||
/>
|
/>
|
||||||
</UserPopover>
|
</UserPopover>
|
||||||
|
|
|
@ -15,14 +15,14 @@ library.add(
|
||||||
const UserAvatar = {
|
const UserAvatar = {
|
||||||
props: [
|
props: [
|
||||||
'user',
|
'user',
|
||||||
'betterShadow',
|
|
||||||
'compact',
|
'compact',
|
||||||
'showActorTypeIndicator'
|
'showActorTypeIndicator'
|
||||||
],
|
],
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
showPlaceholder: false,
|
showPlaceholder: false,
|
||||||
defaultAvatar: `${this.$store.state.instance.server + this.$store.state.instance.defaultAvatar}`
|
defaultAvatar: `${this.$store.state.instance.server + this.$store.state.instance.defaultAvatar}`,
|
||||||
|
betterShadow: this.$store.state.interface.browserSupport.cssFilter
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
|
|
|
@ -48,7 +48,6 @@ export default {
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
followRequestInProgress: false,
|
followRequestInProgress: false,
|
||||||
betterShadow: this.$store.state.interface.browserSupport.cssFilter,
|
|
||||||
showingConfirmMute: false,
|
showingConfirmMute: false,
|
||||||
muteExpiryAmount: 0,
|
muteExpiryAmount: 0,
|
||||||
muteExpiryUnit: 'minutes'
|
muteExpiryUnit: 'minutes'
|
||||||
|
|
|
@ -16,10 +16,7 @@
|
||||||
class="user-info-avatar -link"
|
class="user-info-avatar -link"
|
||||||
@click="zoomAvatar"
|
@click="zoomAvatar"
|
||||||
>
|
>
|
||||||
<UserAvatar
|
<UserAvatar :user="user" />
|
||||||
:better-shadow="betterShadow"
|
|
||||||
:user="user"
|
|
||||||
/>
|
|
||||||
<div class="user-info-avatar -link -overlay">
|
<div class="user-info-avatar -link -overlay">
|
||||||
<FAIcon
|
<FAIcon
|
||||||
class="fa-scale-110 fa-old-padding"
|
class="fa-scale-110 fa-old-padding"
|
||||||
|
@ -30,7 +27,6 @@
|
||||||
<UserAvatar
|
<UserAvatar
|
||||||
v-else-if="typeof avatarAction === 'function'"
|
v-else-if="typeof avatarAction === 'function'"
|
||||||
class="user-info-avatar"
|
class="user-info-avatar"
|
||||||
:better-shadow="betterShadow"
|
|
||||||
:user="user"
|
:user="user"
|
||||||
@click="avatarAction"
|
@click="avatarAction"
|
||||||
/>
|
/>
|
||||||
|
@ -38,10 +34,7 @@
|
||||||
v-else
|
v-else
|
||||||
:to="userProfileLink(user)"
|
:to="userProfileLink(user)"
|
||||||
>
|
>
|
||||||
<UserAvatar
|
<UserAvatar :user="user" />
|
||||||
:better-shadow="betterShadow"
|
|
||||||
:user="user"
|
|
||||||
/>
|
|
||||||
</router-link>
|
</router-link>
|
||||||
<div class="user-summary">
|
<div class="user-summary">
|
||||||
<div class="top-line">
|
<div class="top-line">
|
||||||
|
|
Loading…
Add table
Reference in a new issue