Merge branch '638' into 'develop'

Fix inconsistent space bug between panels

Closes #638

See merge request pleroma/pleroma-fe!916

1 files changed, 5 insertions, 1 deletions

diff --git a/src/App.js b/src/App.js
index 3624171e..e9cd5917 100644
--- a/src/App.js
+++ b/src/App.js
@@ -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 }
   },