Skip to content

Commit df63854

Browse files
committed
harmonize ul li margin/padding with code from furos _lists.sass
1 parent e1a8446 commit df63854

File tree

2 files changed

+53
-23
lines changed

2 files changed

+53
-23
lines changed

src/crate/theme/rtd/crate/static/css/custom.css

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -534,11 +534,6 @@ div.sidebar {
534534
background-color: white;
535535
}
536536

537-
.contents ul ul,
538-
.contents ul ol {
539-
margin-bottom: 0;
540-
}
541-
542537
.wrapper-content-right ul,
543538
.wrapper-content-right ol {
544539
margin-bottom: 16px;
@@ -1576,24 +1571,6 @@ div.code-block-caption:hover > a.headerlink {
15761571
visibility: visible;
15771572
}
15781573

1579-
/* adjust margin from paragraphs in ul & ol li's */
1580-
ol, ul {
1581-
margin-bottom: 1rem;
1582-
margin-top: 1rem;
1583-
padding-left: 1.2rem;
1584-
}
1585-
1586-
main ol li > p:first-child,
1587-
main ul li > p:first-child {
1588-
margin-bottom: .25rem;
1589-
margin-top: .25rem;
1590-
}
1591-
1592-
main ol li > p:last-child,
1593-
main ul li > p:last-child {
1594-
margin-top: .25rem;
1595-
}
1596-
15971574
article {
15981575
line-height: 1.5;
15991576
}

src/crate/theme/rtd/crate/static/css/ng/furo.scss

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,56 @@
3939
position: unset;
4040
}
4141
}
42+
43+
// Migrate new converted ul/ol styles from _lists.sass
44+
ul,
45+
ol {
46+
padding-left: 1.2rem;
47+
48+
// Space lists out like paragraphs
49+
margin-top: 1rem;
50+
margin-bottom: 1rem;
51+
// reduce margins within li.
52+
li {
53+
> p:first-child {
54+
margin-top: 0.25rem;
55+
margin-bottom: 0.25rem;
56+
}
57+
> p:last-child {
58+
margin-top: 0.25rem;
59+
}
60+
> ul,
61+
> ol {
62+
margin-top: 0.5rem;
63+
margin-bottom: 0.5rem;
64+
}
65+
}
66+
}
67+
ol {
68+
&.arabic {
69+
list-style: decimal;
70+
}
71+
&.loweralpha {
72+
list-style: lower-alpha;
73+
}
74+
&.upperalpha {
75+
list-style: upper-alpha;
76+
}
77+
&.lowerroman {
78+
list-style: lower-roman;
79+
}
80+
&.upperroman {
81+
list-style: upper-roman;
82+
}
83+
// Don't space lists out when they're "simple" or in a `.. toctree::`
84+
}
85+
.simple,
86+
.toctree-wrapper {
87+
li {
88+
> ul,
89+
> ol {
90+
margin-top: 0;
91+
margin-bottom: 0;
92+
}
93+
}
94+
}

0 commit comments

Comments
 (0)