Merge branch '627' into 'develop'

Fix "Post status modal disappearing on mobile landscape mode"

Closes #627

See merge request pleroma/pleroma-fe!899
This commit is contained in:
Shpuld Shpludson 2019-08-08 10:10:23 +00:00
commit 74cf601094
4 changed files with 10 additions and 7 deletions

View File

@ -107,6 +107,7 @@
:floating="true" :floating="true"
class="floating-chat mobile-hidden" class="floating-chat mobile-hidden"
/> />
<MobilePostStatusModal />
<UserReportingModal /> <UserReportingModal />
<portal-target name="modal" /> <portal-target name="modal" />
</div> </div>

View File

@ -1,14 +1,12 @@
import SideDrawer from '../side_drawer/side_drawer.vue' import SideDrawer from '../side_drawer/side_drawer.vue'
import Notifications from '../notifications/notifications.vue' import Notifications from '../notifications/notifications.vue'
import MobilePostStatusModal from '../mobile_post_status_modal/mobile_post_status_modal.vue'
import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils' import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
import GestureService from '../../services/gesture_service/gesture_service' import GestureService from '../../services/gesture_service/gesture_service'
const MobileNav = { const MobileNav = {
components: { components: {
SideDrawer, SideDrawer,
Notifications, Notifications
MobilePostStatusModal
}, },
data: () => ({ data: () => ({
notificationsCloseGesture: undefined, notificationsCloseGesture: undefined,

View File

@ -70,7 +70,6 @@
ref="sideDrawer" ref="sideDrawer"
:logout="logout" :logout="logout"
/> />
<MobilePostStatusModal />
</div> </div>
</template> </template>

View File

@ -34,14 +34,19 @@
@import '../../_variables.scss'; @import '../../_variables.scss';
.post-form-modal-view { .post-form-modal-view {
max-height: 100%; align-items: flex-start;
display: block;
} }
.post-form-modal-panel { .post-form-modal-panel {
flex-shrink: 0; flex-shrink: 0;
margin: 25% 0 4em 0; margin-top: 25%;
margin-bottom: 2em;
width: 100%; width: 100%;
max-width: 700px;
@media (orientation: landscape) {
margin-top: 8%;
}
} }
.new-status-button { .new-status-button {