From 9c2bf946ce2e9fa9bc76b1b0527eb976b68526c9 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Wed, 17 Apr 2024 20:21:33 +0530 Subject: [PATCH] Revert "chore: add and fix margins inside super note content [skip e2e]" This reverts commit 562e1bef17c98b5d53be3793801c7d78834a98ea. --- .../SuperEditor/Lexical/Theme/base.scss | 22 +------------------ .../SuperEditor/Lexical/Theme/editor.scss | 14 +++++++++--- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/base.scss b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/base.scss index 2eac3fa0f..ab8934bf7 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/base.scss +++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/base.scss @@ -23,7 +23,7 @@ hr { padding: 2px 0px; border: none; - margin: 0.825em 0; + margin: 1em 0; cursor: pointer; } @@ -40,23 +40,3 @@ user-select: none; } } - -.ContentEditable__root, -.Collapsible__content { - > *:not(:first-child) { - margin-block-start: 0.825em; - } - - // Remove extra margin around empty paragraphs - .Lexical__paragraph:has(br:first-child) { - margin-block-start: 0; - - & + * { - margin-block-start: 0; - } - } - - .Lexical__listItem { - margin-block-end: 0.325em; - } -} diff --git a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/editor.scss b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/editor.scss index ec2ef9dca..f9cec26db 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/editor.scss +++ b/packages/web/src/javascripts/Components/SuperEditor/Lexical/Theme/editor.scss @@ -7,10 +7,13 @@ text-align: right; } .Lexical__paragraph { + margin: 0; position: relative; } .Lexical__quote { + margin: 0; margin-left: 20px; + margin-bottom: 10px; color: var(--sn-stylekit-passive-color-1); border-left-color: var(--sn-stylekit-passive-color-1); border-left-width: 4px; @@ -28,18 +31,21 @@ } } .Lexical__h1 { - font-size: 1.75em; + font-size: 26px; color: var(--sn-stylekit-editor-foreground-color); font-weight: 700; + margin: 0; } .Lexical__h2 { - font-size: 1.5em; + font-size: 22px; color: var(--sn-stylekit-editor-foreground-color); font-weight: 700; + margin: 0; } .Lexical__h3 { - font-size: 1.3em; + font-size: 19px; font-weight: 700; + margin: 0; } .Lexical__textBold { font-weight: bold; @@ -88,6 +94,7 @@ font-family: var(--sn-stylekit-monospace-font), monospace; display: block; padding: 1.25rem 1.35rem; + margin: 0.5rem 0; tab-size: 2; overflow-x: auto; position: relative; @@ -105,6 +112,7 @@ overflow-y: scroll; table-layout: fixed; width: calc(100% - 25px); + margin: 0.5rem 0; color: var(--sn-stylekit-contrast-foreground-color); } .Lexical__tableSelection *::selection {