Merge remote-tracking branch 'origin/develop' into optimize
This commit is contained in:
commit
3bf558089f
11 changed files with 39 additions and 5 deletions
12
src/App.js
12
src/App.js
|
|
@ -158,13 +158,23 @@ export default {
|
|||
userBackground() {
|
||||
return this.currentUser.background_image
|
||||
},
|
||||
foreignProfileBackground() {
|
||||
return (
|
||||
useMergedConfigStore().mergedConfig.allowForeignUserBackground &&
|
||||
useInterfaceStore().foreignProfileBackground
|
||||
)
|
||||
},
|
||||
instanceBackground() {
|
||||
return useMergedConfigStore().mergedConfig.hideInstanceWallpaper
|
||||
? null
|
||||
: this.instanceBackgroundUrl
|
||||
},
|
||||
background() {
|
||||
return this.userBackground || this.instanceBackground
|
||||
return (
|
||||
this.foreignProfileBackground ||
|
||||
this.userBackground ||
|
||||
this.instanceBackground
|
||||
)
|
||||
},
|
||||
bgStyle() {
|
||||
if (this.background) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue