sjw/pleroma-fe
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2024-12-21 16:52:32 +01:00
Code Issues Releases Wiki Activity

Merge branch '638' into 'develop'

Browse Source 
Fix inconsistent space bug between panels

Closes #638

See merge request pleroma/pleroma-fe!916
This commit is contained in:
Shpuld Shpludson 2019-08-12 18:42:58 +00:00
commit 58b9b6c0a2
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/App.js
View File

@ -89,7 +89,11 @@ export default {
sitename () { return this.$store.state.instance.name },
chat () { return this.$store.state.chat.channel.state === 'joined' },
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 },
isMobileLayout () { return this.$store.state.interface.mobileLayout }
},

3
src/components/instance_specific_panel/instance_specific_panel.js
View File

@ -2,9 +2,6 @@ const InstanceSpecificPanel = {
computed: {
instanceSpecificPanelContent () {
return this.$store.state.instance.instanceSpecificPanelContent
},
show () {
return !this.$store.state.config.hideISP
}
}
}

8
src/components/instance_specific_panel/instance_specific_panel.vue
View File

@ -1,8 +1,5 @@
<template>
<div
v-if="show"
class="instance-specific-panel"
>
<div class="instance-specific-panel">
<div class="panel panel-default">
<div class="panel-body">
<!-- eslint-disable vue/no-v-html -->
@ -14,6 +11,3 @@
</template>
<script src="./instance_specific_panel.js" ></script>
<style lang="scss">
</style>