Skip to content

fix: Tiptap editor and heading styles #2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
enjeck merged 2 commits into from
Sep 5, 2025
Merged

fix: Tiptap editor and heading styles #2041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1344da4
fix: Tiptap editor and heading styles
enjeck Sep 2, 2025
d30d96c
enh: Remove style comment
enjeck Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions css/tiptap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
* SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
.tiptap-wrapper div[contenteditable=true] {
.tables-tiptap-wrapper div[contenteditable=true] {
width: 100% !important;
min-height: 150px;
}

.tiptap-wrapper .is-active {
.tables-tiptap-wrapper .is-active {
background-color: var(--color-primary) !important;
}

.tiptap-wrapper {
.tables-tiptap-wrapper {
width: 100%;
}

.tiptap-wrapper .menuBar button {
.tables-tiptap-wrapper .menuBar button {
position: relative;
width: 35px;
height: 35px;
Expand All @@ -29,10 +29,10 @@
vertical-align: top;
}

.tiptap-wrapper .menuBar button:hover, .tiptap-wrapper .menuBar button:focus, .tiptap-wrapper .menuBar button:active {
.tables-tiptap-wrapper .menuBar button:hover, .tables-tiptap-wrapper .menuBar button:focus, .tables-tiptap-wrapper .menuBar button:active {
background-color: var(--color-background-dark);
}

.tiptap-wrapper em, .tabulator-cell em {
.tables-tiptap-wrapper em, .tabulator-cell em {
font-style: italic;
}
4 changes: 4 additions & 0 deletions src/pages/Context.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,8 @@ export default {
padding-left: 0px;
}
}
:deep(h1) {
font-size: unset;
font-size: revert;
}
</style>
5 changes: 5 additions & 0 deletions src/pages/Table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ export default {
min-width: var(--app-content-width, 100%);
}

:deep(h1) {
font-size: unset;
font-size: revert;
}

@page {
size: auto;
margin: 5mm;
Expand Down
4 changes: 4 additions & 0 deletions src/pages/View.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,8 @@ export default {
width: max-content;
min-width: var(--app-content-width, 100%);
}
:deep(h1) {
font-size: unset;
font-size: revert;
}
</style>
6 changes: 3 additions & 3 deletions src/shared/components/ncTable/partials/TableCellHtml.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- SPDX-License-Identifier: AGPL-3.0-or-later
-->
<template>
<div class="cell-editor">
<div class="cell-editor tables-tiptap-wrapper">
<div v-if="!isEditing" @click="handleStartEditing">
<EditorContent :editor="editor" />
</div>
Expand Down Expand Up @@ -118,7 +118,7 @@ export default {

// Check if the click is outside our editing container
if (this.$refs.editingContainer && !this.$refs.editingContainer.contains(event.target)) {
const isEditorRelated = event.target.closest('.tiptap-wrapper')
const isEditorRelated = event.target.closest('.tables-tiptap-wrapper')
|| event.target.closest('.ProseMirror')
|| event.target.closest('[contenteditable]')
|| event.target.closest('.text-menubar')
Expand Down Expand Up @@ -220,7 +220,7 @@ export default {
}
}

:deep(.tiptap-wrapper) {
:deep(.tables-tiptap-wrapper) {
.menuBar {
padding: 8px;
border-bottom: 1px solid var(--color-border);
Expand Down
22 changes: 14 additions & 8 deletions src/shared/components/ncTable/partials/TiptapMenuBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
- SPDX-License-Identifier: AGPL-3.0-or-later
-->
<template>
<div class="tiptap-wrapper">
<div class="tables-tiptap-wrapper">
<div v-if="editor" class="menuBar">
<NcButton type="tertiary-no-background" :aria-label="t('tables', 'Undo')" @click="editor.chain().focus().undo().run()">
<template #icon>
Expand Down Expand Up @@ -201,7 +201,7 @@ export default {
}
</script>

<style lang="scss" scoped>
<style lang="scss">

.character-count {
display: flex;
Expand All @@ -215,10 +215,7 @@ export default {
}

/* Basic editor styles */
.tiptap-wrapper .ProseMirror, .tabulator-cell .ProseMirror {
> * + * {
/*margin-top: 0.75em;*/
}
.tables-tiptap-wrapper .ProseMirror, .tabulator-cell .ProseMirror {

ul,
ol {
Expand All @@ -232,6 +229,8 @@ export default {
h5,
h6 {
line-height: 1.1;
font-size: unset;
font-size: revert;
}

pre {
Expand All @@ -257,7 +256,7 @@ export default {
}
}

.tiptap-wrapper ul[data-type='taskList'], .tabulator-cell ul[data-type='taskList'] {
.tables-tiptap-wrapper ul[data-type='taskList'], .tabulator-cell ul[data-type='taskList'] {
list-style: none;
padding: 0;
p {
Expand All @@ -277,7 +276,14 @@ export default {
}
}

.tiptap-wrapper ul, .tabulator-cell ul {
.tables-tiptap-wrapper ol, .tabulator-cell ol {
li {
list-style-type: decimal;
margin-left: 15px;
}
}

.tables-tiptap-wrapper ul, .tabulator-cell ul {
li {
list-style-type: disc;
margin-left: 15px;
Expand Down
Loading