forked from AkkomaGang/akkoma-fe
Merge branch '638' into 'develop'
Fix inconsistent space bug between panels Closes #638 See merge request pleroma/pleroma-fe!916
This commit is contained in:
commit
58b9b6c0a2
3 changed files with 6 additions and 11 deletions
|
@ -89,7 +89,11 @@ export default {
|
||||||
sitename () { return this.$store.state.instance.name },
|
sitename () { return this.$store.state.instance.name },
|
||||||
chat () { return this.$store.state.chat.channel.state === 'joined' },
|
chat () { return this.$store.state.chat.channel.state === 'joined' },
|
||||||
suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled },
|
suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled },
|
||||||
showInstanceSpecificPanel () { return this.$store.state.instance.showInstanceSpecificPanel },
|
showInstanceSpecificPanel () {
|
||||||
|
return this.$store.state.instance.showInstanceSpecificPanel &&
|
||||||
|
!this.$store.state.config.hideISP &&
|
||||||
|
this.$store.state.instance.instanceSpecificPanelContent
|
||||||
|
},
|
||||||
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
|
showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
|
||||||
isMobileLayout () { return this.$store.state.interface.mobileLayout }
|
isMobileLayout () { return this.$store.state.interface.mobileLayout }
|
||||||
},
|
},
|
||||||
|
|
|
@ -2,9 +2,6 @@ const InstanceSpecificPanel = {
|
||||||
computed: {
|
computed: {
|
||||||
instanceSpecificPanelContent () {
|
instanceSpecificPanelContent () {
|
||||||
return this.$store.state.instance.instanceSpecificPanelContent
|
return this.$store.state.instance.instanceSpecificPanelContent
|
||||||
},
|
|
||||||
show () {
|
|
||||||
return !this.$store.state.config.hideISP
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<div
|
<div class="instance-specific-panel">
|
||||||
v-if="show"
|
|
||||||
class="instance-specific-panel"
|
|
||||||
>
|
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<!-- eslint-disable vue/no-v-html -->
|
<!-- eslint-disable vue/no-v-html -->
|
||||||
|
@ -14,6 +11,3 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script src="./instance_specific_panel.js" ></script>
|
<script src="./instance_specific_panel.js" ></script>
|
||||||
|
|
||||||
<style lang="scss">
|
|
||||||
</style>
|
|
||||||
|
|
Loading…
Reference in a new issue