commit: 01552d0b45797513cdcb437589d17d7e92d8171d
parent: 4819009d21692a1f14fee1e1dfd9b690bb952a6a
Author: Shpuld Shpludson <shp@cock.li>
Date: Mon, 6 May 2019 17:13:47 +0000
Merge branch '520' into 'develop'
Fix Tweet input box wiped bug when window's width shrunk
Closes #520
See merge request pleroma/pleroma-fe!783
Diffstat:
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/App.vue b/src/App.vue
@@ -18,17 +18,19 @@
</div>
</div>
</nav>
- <div v-if="" class="container" id="content">
- <div class="sidebar-flexer mobile-hidden" v-if="!isMobileLayout">
+ <div class="container" id="content">
+ <div class="sidebar-flexer mobile-hidden">
<div class="sidebar-bounds">
<div class="sidebar-scroller">
<div class="sidebar">
<user-panel></user-panel>
- <nav-panel></nav-panel>
- <instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel>
- <features-panel v-if="!currentUser && showFeaturesPanel"></features-panel>
- <who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel>
- <notifications v-if="currentUser"></notifications>
+ <div v-if="!isMobileLayout">
+ <nav-panel></nav-panel>
+ <instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel>
+ <features-panel v-if="!currentUser && showFeaturesPanel"></features-panel>
+ <who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel>
+ <notifications v-if="currentUser"></notifications>
+ </div>
</div>
</div>
</div>