diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-05-06 17:13:47 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-05-06 17:13:47 +0000 |
| commit | 01552d0b45797513cdcb437589d17d7e92d8171d (patch) | |
| tree | a4e243eab74f476d765a1016a705553a2521497a /src | |
| parent | 4819009d21692a1f14fee1e1dfd9b690bb952a6a (diff) | |
| parent | 489927bdc93d58ee3966609a60a25a38816aad6a (diff) | |
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 (limited to 'src')
| -rw-r--r-- | src/App.vue | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/App.vue b/src/App.vue index cb7e8d78..21abd694 100644 --- 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> |
