Skip to content

Commit 2d22f21

Browse files
authored
Merge pull request #12294 from Armansiddiqui9/refactor-css
refactor: replace hardcoded spacing values with semantic tokens
2 parents 402c267 + 117a4cb commit 2d22f21

23 files changed

Lines changed: 106 additions & 101 deletions

bundlesize.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
},
6868
{
6969
"path": "static/build/css/page-book.css",
70-
"maxSize": "15.5KB"
70+
"maxSize": "15.7KB"
7171
},
7272
{
7373
"path": "static/build/css/page-edit.css",

static/css/base/common.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ td {
2727
padding: 0;
2828
}
2929
h1 {
30-
margin: 20px 0;
30+
margin: var(--spacing-stack-lg) 0;
3131
}
3232
body,
3333
p,
@@ -81,8 +81,8 @@ h6 {
8181
font-weight: 600;
8282
}
8383
div.head {
84-
margin-bottom: 10px;
85-
margin-top: 20px;
84+
margin-bottom: var(--spacing-stack-sm);
85+
margin-top: var(--spacing-stack-lg);
8686
}
8787
div.head span {
8888
font-size: var(--font-size-label-medium);

static/css/base/dl.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@ dt {
99
clear: both;
1010
}
1111
dl {
12-
margin: 10px 0;
12+
margin: var(--spacing-stack-sm) 0;
1313
}
1414
dl:after {
1515
content: "";
1616
display: block;
1717
clear: both;
1818
}
1919
dl dt {
20-
padding: 0 15px 10px 0;
20+
padding: 0 var(--spacing-inset-md) var(--spacing-inset-sm) 0;
2121
width: 120px;
2222
}
2323
dd {
2424
max-width: 270px;
2525
}
2626
dd + dd {
27-
padding-left: 8px;
27+
padding-left: var(--spacing-inset-sm);
2828
}

static/css/base/headings.css

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ h2.publisher {
3939
background-color: var(--lightest-grey);
4040
}
4141
h2.edition-title {
42-
margin: 7px 0 0;
42+
margin: var(--spacing-stack-sm) 0 0;
4343
color: var(--grey);
4444
font-family: var(--font-family-title);
4545
font-weight: normal;
@@ -73,8 +73,8 @@ h3.Question {
7373
font-size: 1.2em;
7474
font-weight: normal;
7575
color: var(--brown);
76-
margin-top: 10px;
77-
padding-top: 10px;
76+
margin-top: var(--spacing-stack-sm);
77+
padding-top: var(--spacing-inset-sm);
7878
border-top: 1px dotted var(--lighter-grey);
7979
}
8080

@@ -96,7 +96,7 @@ h4.facetHead {
9696
padding: 0;
9797
display: inline-flex;
9898
align-items: center;
99-
gap: 4px;
99+
gap: var(--spacing-inline-sm);
100100
}
101101
h4.facetHead .facet-icon {
102102
flex-shrink: 0;
@@ -107,6 +107,7 @@ h4.facetHead span.merge {
107107
font-size: var(--font-size-label-small);
108108
font-weight: normal !important;
109109
text-transform: none !important;
110+
/* Not tokenized: must exceed the 16px icon width to avoid text overlap */
110111
padding-left: 22px;
111112
background: url(/images/icons/icon_merge-sm.png) no-repeat 0 0;
112113
min-height: 16px;

static/css/base/helpers-common.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#offline-info {
3131
text-align: center;
32-
padding: 10px 5px;
32+
padding: var(--spacing-inset-sm) var(--spacing-inset-xs);
3333
display: none;
3434
background-color: var(--grey);
3535
color: var(--white);
@@ -43,7 +43,7 @@
4343
.clearfix {
4444
width: 100%;
4545
clear: both;
46-
padding: 5px;
46+
padding: var(--spacing-inset-xs);
4747
}
4848
/* To be used for shifting content so its accessible to screen readers
4949
but not visible to anyone else. */
@@ -61,5 +61,5 @@ a.hoverlink {
6161
color: var(--dark-green);
6262
font-size: var(--font-size-label-small);
6363
text-align: center;
64-
padding: 5px 0 0;
64+
padding: var(--spacing-inset-xs) 0 0;
6565
}

static/css/base/helpers-misc.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ button.larger {
5050

5151
.adminOnly {
5252
background-color: var(--orange) !important;
53-
padding: 4px;
53+
padding: var(--spacing-inset-xs);
5454
border-radius: 4px;
5555
}
5656

@@ -74,7 +74,7 @@ button.larger {
7474
}
7575

7676
.valid {
77-
padding: 5px 0 0 29px !important;
77+
padding: var(--spacing-inset-xs) 0 0 29px !important;
7878
}
7979

8080
.noborder {

static/css/components/admin-table.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
.measurements {
22
width: 100%;
3-
margin: 10px 0 30px;
3+
margin: var(--spacing-stack-sm) 0 var(--spacing-stack-xl);
44
color: var(--dark-grey);
55
}
66
.measurements th {
77
font-family: var(--font-family-body);
88
font-size: 0.6875em;
99
text-align: right;
1010
vertical-align: bottom;
11-
padding: 0 8px;
11+
padding: 0 var(--spacing-inset-sm);
1212
}
1313
.measurements td {
14-
padding: 8px;
14+
padding: var(--spacing-inset-sm);
1515
text-align: right;
1616
vertical-align: bottom;
1717
font-size: 0.75em;

static/css/components/author-infobox.css

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
line-height: 1.5em;
44
background-color: var(--grey-fafafa);
55
border-radius: 5px;
6-
padding: 10px;
7-
margin-bottom: 3px;
6+
padding: var(--spacing-inset-sm);
7+
margin-bottom: var(--spacing-stack-xs);
88
border-bottom: 1px solid var(--light-beige);
99
}
1010
.infobox .illustration {
@@ -18,17 +18,17 @@
1818
background-color: transparent;
1919
}
2020
.infobox tr td:first-child {
21-
padding-right: 5px;
21+
padding-right: var(--spacing-inset-xs);
2222
}
2323
.infobox table {
2424
/* Without this page-user.css makes the table very compact */
2525
border-collapse: unset;
26-
border-spacing: 3px;
26+
border-spacing: var(--spacing-inset-xs);
2727
}
2828
.infobox .profile-icon-container {
2929
display: flex;
3030
justify-content: center;
31-
gap: 0.25rem;
31+
gap: var(--spacing-inline-sm);
3232
flex-wrap: wrap;
3333
}
3434
.infobox .profile-icon-container .profile-icon {
@@ -37,5 +37,5 @@
3737
}
3838
.infobox-name {
3939
text-align: center;
40-
margin-bottom: 10px;
40+
margin-bottom: var(--spacing-stack-sm);
4141
}

static/css/components/book.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.book > .cta-button-group,
44
.book > .cta-btn,
55
.book form .cta-button-group {
6-
margin-top: 10px;
6+
margin-top: var(--spacing-stack-sm);
77
}
88

99
.book .book-cover {

static/css/components/buttonBtn.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/* This button should be used for now on */
55
.btn {
66
text-align: center;
7-
padding: 5px 10px;
7+
padding: var(--spacing-inset-xs) var(--spacing-inset-sm);
88
}
99

1010
.btn.primary {
@@ -22,7 +22,7 @@ a.btn {
2222

2323
/* These should be in their own chip.css file */
2424
.chip {
25-
padding: 4px 12px;
25+
padding: var(--spacing-inset-xs) var(--spacing-inset-md);
2626
border: 1px solid var(--mid-grey);
2727
border-radius: 16px;
2828
user-select: none;

0 commit comments

Comments
 (0)