Merge pull request #4345 from nextcloud/fix/invalid-sass

nextcloud · Jun 22, 2023 · 270b21b · 270b21b
2 parents 9b000f3 + e806141
commit 270b21b
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 20 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/css/prosemirror.scss b/src/css/prosemirror.scss
@@ -245,7 +245,7 @@ div.ProseMirror {
 		table-layout: auto;
 		white-space: normal; // force text to wrapping
 		margin-bottom: 1em;
-		+ & {
+		&+ * {
 			margin-top: 1em;
 		}
 

diff --git a/src/nodes/Callout.vue b/src/nodes/Callout.vue
@@ -80,7 +80,7 @@ export default {
 	align-items: center;
 	justify-content: flex-start;
 
-	+ & {
+	&+ * {
 		margin-top: 0.5em;
 	}