diff --git a/src/Collectives.vue b/src/Collectives.vue index d65b06b15..424b751f2 100644 --- a/src/Collectives.vue +++ b/src/Collectives.vue @@ -108,12 +108,11 @@ export default { overflow-y: auto; } -@page { - size: auto; - margin: 5mm; -} - @media print { + @page { + margin: 10mm !important; + } + html, body { background: var(--color-main-background, white) !important; } @@ -128,16 +127,16 @@ export default { } #content-vue { - display: block !important; + margin: unset; } - /* TODO: remove first selector once removing LegacyEditor.vue+Reader.vue */ - #text-wrapper #text .content-wrapper, [data-collectives-el='editor'] .content-wrapper, [data-collectives-el='reader'] .content-wrapper { - display: block; + // Required to prevent newline between page title and content (due to `display: grid`) + display: block !important; div.ProseMirror { + height: unset; margin-top: 0; margin-bottom: 0; padding-top: 0; diff --git a/src/components/Page/TextEditor.vue b/src/components/Page/TextEditor.vue index 2cff4e943..8de2d6bb0 100644 --- a/src/components/Page/TextEditor.vue +++ b/src/components/Page/TextEditor.vue @@ -194,7 +194,7 @@ export default { .collectives-text-container { // Required for search dialog to stick to the bottom flex-grow: 1; - overflow: scroll; + overflow: auto; } .text-container-heading { @@ -210,6 +210,10 @@ export default { .text-container-heading { display: none !important; } + + .collectives-text-container { + overflow: visible; + } } diff --git a/src/components/PagePrint.vue b/src/components/PagePrint.vue index 3ff8be609..5a5bd5258 100644 --- a/src/components/PagePrint.vue +++ b/src/components/PagePrint.vue @@ -94,15 +94,4 @@ export default { :deep(.text-menubar) { display: none; } - -:deep([data-collectives-el='reader'] .content-wrapper) { - display: block !important; - - div.ProseMirror { - margin-top: 0; - margin-bottom: 0; - padding-top: 0; - padding-bottom: 0; - } -} diff --git a/src/components/SearchDialog.vue b/src/components/SearchDialog.vue index 5ce59124d..6152766f6 100644 --- a/src/components/SearchDialog.vue +++ b/src/components/SearchDialog.vue @@ -157,6 +157,12 @@ $button-gap: calc(var(--default-grid-baseline) * 3); background-color: var(--color-main-background); } +@media print { + .search-dialog__container { + display: none; + } +} + .search-dialog__info { margin: 0 calc(var(--default-grid-baseline) * 6); font-weight: bold; diff --git a/src/css/editor.scss b/src/css/editor.scss index de1d1b8c4..5845ee23e 100644 --- a/src/css/editor.scss +++ b/src/css/editor.scss @@ -59,6 +59,7 @@ [data-collectives-el='editor'], [data-collectives-el='reader'] { max-width: unset; + min-width: var(--text-editor-max-width); margin: auto; .text-menubar { @@ -77,8 +78,13 @@ } @media print { + .sheet-view { + margin: unset !important; + } + .page-title, .document-status, .editor__content { - margin: 0 !important; + margin: unset !important; max-width: unset !important; + min-width: var(--text-editor-max-width); } }