Skip to content

Commit 67e01ed

Browse files
Merge pull request #6983 from nextcloud/fix/6936-Place-menubar-at-the-bottom-on-mobile
fix(files): Place menubar at the bottom on mobile
2 parents 1476d05 + 8766c11 commit 67e01ed

6 files changed

Lines changed: 27 additions & 4 deletions

File tree

-1.32 KB
Loading
-455 Bytes
Loading

src/components/Editor/ContentContainer.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,13 @@ export default {
4444
<style scoped lang="scss">
4545
.editor__content {
4646
max-width: min(var(--text-editor-max-width), calc(100vw - 16px));
47-
margin: auto;
47+
margin: 0 auto;
4848
position: relative;
4949
width: 100%;
50+
:deep([contenteditable]) {
51+
// drop off obsolete server styles
52+
margin: 0 !important;
53+
}
5054
}
5155
5256
.ie {
@@ -59,6 +63,8 @@ export default {
5963
--side-width: calc((100% - var(--text-editor-max-width)) / 2);
6064
display: grid;
6165
grid-template-columns: 1fr auto;
66+
overflow: auto;
67+
flex: 1;
6268
&.--show-outline {
6369
grid-template-columns: var(--side-width) auto var(--side-width);
6470
}

src/components/Editor/MediaHandler.vue

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<template>
77
<div class="editor editor-media-handler"
88
data-text-el="editor-media-handler"
9-
:class="{ draggedOver }"
9+
:class="{ draggedOver, 'editor--mobile': isMobile }"
1010
@image-paste="onPaste"
1111
@dragover.prevent.stop="setDraggedOver(true)"
1212
@dragleave.prevent.stop="setDraggedOver(false)"
@@ -28,6 +28,7 @@ import { getCurrentUser } from '@nextcloud/auth'
2828
import { showError } from '@nextcloud/dialogs'
2929
import { emit } from '@nextcloud/event-bus'
3030
import { logger } from '../../helpers/logger.js'
31+
import { useIsMobile } from '@nextcloud/vue/composables/useIsMobile'
3132
3233
import {
3334
useEditorMixin,
@@ -63,6 +64,12 @@ export default {
6364
6465
return val
6566
},
67+
setup() {
68+
const isMobile = useIsMobile()
69+
return {
70+
isMobile,
71+
}
72+
},
6673
data() {
6774
return {
6875
lastFilePath: null,
@@ -199,3 +206,14 @@ export default {
199206
},
200207
}
201208
</script>
209+
210+
<style scoped lang="scss">
211+
212+
.editor--mobile {
213+
display: flex;
214+
flex-direction: column-reverse;
215+
height: 100%;
216+
overflow: auto;
217+
}
218+
219+
</style>

src/components/Menu/MenuBar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
:class="{
1313
'text-menubar--ready': isReady,
1414
'text-menubar--hide': isHidden,
15-
'text-menubar--is-workspace': $isRichWorkspace
15+
'text-menubar--is-workspace': $isRichWorkspace,
1616
}">
1717
<HelpModal v-if="displayHelp" @close="hideHelp" />
1818

src/components/SuggestionsBar.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ export default {
190190
191191
.container-suggestions {
192192
display: flex;
193-
flex-grow: 1;
194193
margin-left: max(0px, (100% - var(--text-editor-max-width)) / 2);
195194
}
196195

0 commit comments

Comments
 (0)