mirror of
https://github.com/streetwriters/notesnook.git
synced 2026-02-23 19:49:56 +01:00
Merge pull request #9170 from streetwriters/editor/fix-line-height-css-issues
editor: fix icons not aligning in outline,task,check lists & callouts because of custom line height
This commit is contained in:
@@ -882,8 +882,7 @@ const Tiptap = ({
|
||||
|
||||
<div
|
||||
style={{
|
||||
display: tab.session?.locked ? "none" : "block",
|
||||
lineHeight: settings.defaultLineHeight
|
||||
display: tab.session?.locked ? "none" : "block"
|
||||
}}
|
||||
ref={contentPlaceholderRef}
|
||||
className="theme-scope-editor"
|
||||
@@ -947,6 +946,7 @@ const TiptapProvider = (): JSX.Element => {
|
||||
editorContainer.style.padding = "0px 16px";
|
||||
editorContainer.style.color = colors.primary.paragraph;
|
||||
editorContainer.style.fontSize = `${settings.fontSize}px`;
|
||||
editorContainer.style.lineHeight = `${settings.defaultLineHeight}`;
|
||||
editorContainer.style.fontFamily =
|
||||
getFontById(settings.fontFamily)?.font || "sans-serif";
|
||||
contentRef.current = editorContainer;
|
||||
@@ -966,8 +966,9 @@ const TiptapProvider = (): JSX.Element => {
|
||||
contentRef.current.style.fontSize = `${settings.fontSize}px`;
|
||||
contentRef.current.style.fontFamily =
|
||||
getFontById(settings.fontFamily)?.font || "sans-serif";
|
||||
contentRef.current.style.lineHeight = `${settings.defaultLineHeight}`;
|
||||
}
|
||||
}, [settings.fontSize, settings.fontFamily]);
|
||||
}, [settings.fontSize, settings.fontFamily, settings.defaultLineHeight]);
|
||||
|
||||
return <Tiptap settings={settings} getContentDiv={getContentDiv} />;
|
||||
};
|
||||
|
||||
@@ -93,7 +93,7 @@ export function TaskItemComponent(
|
||||
cursor: "grab",
|
||||
mr: "0.2rem",
|
||||
fontFamily: "inherit",
|
||||
marginTop: "0.065rem"
|
||||
marginTop: "calc((1lh - 18px) / 2)"
|
||||
}}
|
||||
size={isMobile ? "2.46ch" : "2.22ch"}
|
||||
/>
|
||||
@@ -117,7 +117,7 @@ export function TaskItemComponent(
|
||||
borderColor: "accent"
|
||||
},
|
||||
fontFamily: "inherit",
|
||||
marginTop: "0.13rem"
|
||||
marginTop: "calc((1lh - 16px) / 2)"
|
||||
}}
|
||||
onMouseDown={(e) => {
|
||||
if (globalThis.keyboardShown) {
|
||||
@@ -155,7 +155,7 @@ export function TaskItemComponent(
|
||||
bg: "background",
|
||||
opacity: 0,
|
||||
alignSelf: "flex-start",
|
||||
marginTop: "0.16rem"
|
||||
marginTop: "calc((1lh - 14px) / 2)"
|
||||
}}
|
||||
>
|
||||
{editor.isEditable && (
|
||||
|
||||
@@ -604,7 +604,7 @@ p > *::selection {
|
||||
|
||||
.outline-list > li::before {
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
top: calc((1lh - 18px) / 2);
|
||||
cursor: pointer;
|
||||
content: "";
|
||||
background-size: 18px;
|
||||
@@ -729,7 +729,7 @@ p > *::selection {
|
||||
|
||||
.simple-checklist > li::after {
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
top: calc((1lh - 18px) / 2);
|
||||
cursor: pointer;
|
||||
content: "";
|
||||
background-size: 18px;
|
||||
@@ -747,7 +747,7 @@ p > *::selection {
|
||||
|
||||
.simple-checklist > li.checked::before {
|
||||
position: absolute;
|
||||
top: 2px;
|
||||
top: calc((1lh - 14px) / 2);
|
||||
cursor: pointer;
|
||||
content: "";
|
||||
background-size: 18px;
|
||||
@@ -790,7 +790,7 @@ p > *::selection {
|
||||
|
||||
.ProseMirror div.callout > :first-child::after {
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
top: calc((1lh - 18px) / 2);
|
||||
right: 0px;
|
||||
cursor: pointer;
|
||||
content: "";
|
||||
|
||||
Reference in New Issue
Block a user