diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-08-12 18:42:58 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-08-12 18:42:58 +0000 |
| commit | 58b9b6c0a2005a7f3ad2d3b8791635fd10d0ea36 (patch) | |
| tree | 8fbc841f63104a56a268b28d2d9958a493b98e48 /src/components/instance_specific_panel | |
| parent | 07086ec9aef06e22733a007c9d2691571c2d1cb3 (diff) | |
| parent | 0bce615fe8bd0c219c66c2bc6459444df5f52ff5 (diff) | |
Merge branch '638' into 'develop'
Fix inconsistent space bug between panels
Closes #638
See merge request pleroma/pleroma-fe!916
Diffstat (limited to 'src/components/instance_specific_panel')
| -rw-r--r-- | src/components/instance_specific_panel/instance_specific_panel.js | 3 | ||||
| -rw-r--r-- | src/components/instance_specific_panel/instance_specific_panel.vue | 8 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/components/instance_specific_panel/instance_specific_panel.js b/src/components/instance_specific_panel/instance_specific_panel.js index 9bb5e945..09e3d055 100644 --- a/src/components/instance_specific_panel/instance_specific_panel.js +++ b/src/components/instance_specific_panel/instance_specific_panel.js @@ -2,9 +2,6 @@ const InstanceSpecificPanel = { computed: { instanceSpecificPanelContent () { return this.$store.state.instance.instanceSpecificPanelContent - }, - show () { - return !this.$store.state.config.hideISP } } } diff --git a/src/components/instance_specific_panel/instance_specific_panel.vue b/src/components/instance_specific_panel/instance_specific_panel.vue index a7cf6b48..7448ca06 100644 --- a/src/components/instance_specific_panel/instance_specific_panel.vue +++ b/src/components/instance_specific_panel/instance_specific_panel.vue @@ -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> |