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
This commit is contained in:
Shpuld Shpludson 2019-05-06 17:13:47 +00:00
commit 01552d0b45

View file

@ -18,12 +18,13 @@
</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>
<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>
@ -33,6 +34,7 @@
</div>
</div>
</div>
</div>
<div class="main">
<div v-if="!currentUser" class="login-hint panel panel-default">
<router-link :to="{ name: 'login' }" class="panel-body">