Skip to content

Commit

Permalink
Merge pull request #4644 from nextcloud/bugfix/noid/default-font-size
Browse files Browse the repository at this point in the history
fix: Use default font size
  • Loading branch information
mejo- authored Aug 7, 2023
2 parents fc75c95 + 1bccffc commit 4d9ae39
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions js/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-editors.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-editors.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-files.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-files.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-public.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-text.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-viewer.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/css/prosemirror.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
Expand Down Expand Up @@ -145,7 +145,7 @@ div.ProseMirror {
}

h6 {
font-size: 14px;
font-size: var(--default-font-size);
}

img {
Expand Down

0 comments on commit 4d9ae39

Please sign in to comment.