Skip to content

Commit 159dbff

Browse files
committed
✨ style: Refactor markdown styles to simplify margin calculations
- Removed the use of a calculated variable for margins in markdown styles, replacing it with direct references to the base margin variable. - Cleaned up redundant CSS rules related to margin calculations for improved readability and maintainability. Signed-off-by: Innei <tukon479@gmail.com>
1 parent 3edcd5d commit 159dbff

File tree

1 file changed

+14
-41
lines changed

1 file changed

+14
-41
lines changed

src/Markdown/markdown.style.ts

Lines changed: 14 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,10 @@ export const styles = createStaticStyles(({ cssVar, css }) => {
77
--lobe-markdown-font-size: 16px;
88
--lobe-markdown-header-multiple: 1;
99
--lobe-markdown-margin-multiple: 2;
10-
--lobe-markdown-margin-multiple-cal: var(--lobe-markdown-margin-multiple);
1110
--lobe-markdown-line-height: 1.8;
1211
--lobe-markdown-border-radius: ${cssVar.borderRadiusLG};
1312
--lobe-markdown-border-color: ${cssVar.colorFillQuaternary};
1413
15-
@supports (text-box-trim: trim-both) {
16-
--lobe-markdown-margin-multiple-cal: calc(var(--lobe-markdown-margin-multiple) * 1.2);
17-
}
18-
1914
position: relative;
2015
2116
width: 100%;
@@ -38,7 +33,7 @@ export const styles = createStaticStyles(({ cssVar, css }) => {
3833

3934
const blockquote = css`
4035
blockquote {
41-
margin-block: calc(var(--lobe-markdown-margin-multiple-cal) * 0.5em);
36+
margin-block: calc(var(--lobe-markdown-margin-multiple) * 0.5em);
4237
margin-inline: 0;
4338
padding-block: 0;
4439
padding-inline: 1em;
@@ -79,7 +74,7 @@ export const styles = createStaticStyles(({ cssVar, css }) => {
7974

8075
const details = css`
8176
details {
82-
margin-block: calc(var(--lobe-markdown-margin-multiple-cal) * 0.5em);
77+
margin-block: calc(var(--lobe-markdown-margin-multiple) * 0.5em);
8378
padding-block: 0.75em;
8479
padding-inline: 1em;
8580
border-radius: calc(var(--lobe-markdown-border-radius) * 1px);
@@ -133,9 +128,7 @@ export const styles = createStaticStyles(({ cssVar, css }) => {
133128
h5,
134129
h6 {
135130
margin-block: max(
136-
calc(
137-
var(--lobe-markdown-header-multiple) * var(--lobe-markdown-margin-multiple-cal) * 0.4em
138-
),
131+
calc(var(--lobe-markdown-header-multiple) * var(--lobe-markdown-margin-multiple) * 0.4em),
139132
var(--lobe-markdown-font-size)
140133
);
141134
font-weight: bold;
@@ -172,7 +165,7 @@ export const styles = createStaticStyles(({ cssVar, css }) => {
172165
const hr = css`
173166
hr {
174167
width: 100%;
175-
margin-block: calc(var(--lobe-markdown-margin-multiple-cal) * 1.5em);
168+
margin-block: calc(var(--lobe-markdown-margin-multiple) * 1.5em);
176169
border-color: ${cssVar.colorBorder};
177170
border-style: dashed;
178171
border-width: 1px;
@@ -188,19 +181,15 @@ export const styles = createStaticStyles(({ cssVar, css }) => {
188181
189182
> img,
190183
> p > img {
191-
margin-block: calc(var(--lobe-markdown-margin-multiple-cal) * 0.5em);
184+
margin-block: calc(var(--lobe-markdown-margin-multiple) * 0.5em);
192185
border-radius: calc(var(--lobe-markdown-border-radius) * 1px);
193186
box-shadow: 0 0 0 1px var(--lobe-markdown-border-color);
194-
195-
@supports (text-box-trim: trim-both) {
196-
margin-block: calc(var(--lobe-markdown-margin-multiple-cal) * 1.5em);
197-
}
198187
}
199188
`;
200189

201190
const list = css`
202191
li {
203-
margin-block: calc(var(--lobe-markdown-margin-multiple-cal) * 0.33em);
192+
margin-block: calc(var(--lobe-markdown-margin-multiple) * 0.33em);
204193
205194
p:first-child {
206195
display: inline;
@@ -209,26 +198,18 @@ export const styles = createStaticStyles(({ cssVar, css }) => {
209198
210199
ul,
211200
ol {
212-
margin-block: calc(var(--lobe-markdown-margin-multiple-cal) * 0.5em);
201+
margin-block: calc(var(--lobe-markdown-margin-multiple) * 0.5em);
213202
margin-inline-start: 1em;
214203
padding-inline-start: 0;
215204
list-style-position: outside;
216205
217-
@supports (text-box-trim: trim-both) {
218-
line-height: 2;
219-
}
220-
221-
ul,
222-
ol {
206+
> ul,
207+
> ol {
223208
margin-block: 0;
224209
}
225210
226211
> li {
227212
margin-inline-start: 1em;
228-
229-
@supports (text-box-trim: trim-both) {
230-
margin-block: 0;
231-
}
232213
}
233214
}
234215
@@ -276,20 +257,12 @@ export const styles = createStaticStyles(({ cssVar, css }) => {
276257
line-height: var(--lobe-markdown-line-height);
277258
letter-spacing: 0.02em;
278259
279-
@supports (text-box-trim: trim-both) {
280-
text-box-trim: trim-both;
281-
text-edge: cap alphabetic;
282-
margin-block-start: calc(var(--lobe-markdown-margin-multiple-cal) * 0.5em);
283-
margin-block-end: calc(var(--lobe-markdown-margin-multiple-cal) * 0.5em);
284-
line-height: 2;
285-
}
286-
287260
&:not(:first-child) {
288-
margin-block-start: calc(var(--lobe-markdown-margin-multiple-cal) * 0.5em);
261+
margin-block-start: calc(var(--lobe-markdown-margin-multiple) * 0.5em);
289262
}
290263
291264
&:not(:last-child) {
292-
margin-block-end: calc(var(--lobe-markdown-margin-multiple-cal) * 0.5em);
265+
margin-block-end: calc(var(--lobe-markdown-margin-multiple) * 0.5em);
293266
}
294267
}
295268
`;
@@ -319,7 +292,7 @@ export const styles = createStaticStyles(({ cssVar, css }) => {
319292
box-sizing: border-box;
320293
width: max-content;
321294
max-width: 100%;
322-
margin-block: calc(var(--lobe-markdown-margin-multiple-cal) * 0.5em);
295+
margin-block: calc(var(--lobe-markdown-margin-multiple) * 0.5em);
323296
border-radius: calc(var(--lobe-markdown-border-radius) * 1px);
324297
325298
text-align: start;
@@ -355,7 +328,7 @@ export const styles = createStaticStyles(({ cssVar, css }) => {
355328
const video = css`
356329
> video,
357330
> p > video {
358-
margin-block: calc(var(--lobe-markdown-margin-multiple-cal) * 0.5em);
331+
margin-block: calc(var(--lobe-markdown-margin-multiple) * 0.5em);
359332
border-radius: calc(var(--lobe-markdown-border-radius) * 1px);
360333
box-shadow: 0 0 0 1px var(--lobe-markdown-border-color);
361334
}
@@ -367,7 +340,7 @@ export const styles = createStaticStyles(({ cssVar, css }) => {
367340

368341
const footnote = css`
369342
.footnotes {
370-
margin-block-start: calc(var(--lobe-markdown-margin-multiple-cal) * 1em);
343+
margin-block-start: calc(var(--lobe-markdown-margin-multiple) * 1em);
371344
font-size: smaller;
372345
color: #8b949e;
373346

0 commit comments

Comments
 (0)