Merge pull request #4647 from nextcloud/backport/4644/stable27

[stable27] fix: Use default font size
nextcloud · Aug 8, 2023 · 555fa38 · 555fa38
2 parents 034eaa3 + 048b3bc
commit 555fa38
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 21 deletions.
diff --git a/css/prosemirror.scss b/css/prosemirror.scss
@@ -10,7 +10,7 @@ div.ProseMirror {
 	font-variant-ligatures: none;
 	padding: 4px 8px 200px 14px;
 	line-height: 150%;
-	font-size: 14px;
+	font-size: var(--default-font-size);
 	outline: none;
 
 	:target {
@@ -28,7 +28,7 @@ div.ProseMirror {
 		opacity: 1;
 		-webkit-user-select: text;
 		user-select: text;
-		font-size: 14px;
+		font-size: var(--default-font-size);
 
 		&:not(.collaboration-cursor__caret) {
 			border: none !important;
@@ -145,7 +145,7 @@ div.ProseMirror {
 	}
 
 	h6 {
-		font-size: 14px;
+		font-size: var(--default-font-size);
 	}
 
 	img {

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