Skip to content

Commit ef90118

Browse files
authored
Migrate inset colors (code and tab background) (#8081)
1 parent aaca5b9 commit ef90118

File tree

7 files changed

+19
-23
lines changed

7 files changed

+19
-23
lines changed

pkg/web_css/lib/src/_base.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ strong {
148148

149149
.markdown-body code,
150150
code {
151-
background: var(--pub-code-background-color);
151+
background: var(--pub-inset-bgColor);
152152
border: none;
153153
border-radius: 4px;
154154
font-family: var(--pub-code-text-font_family);
@@ -159,7 +159,7 @@ code {
159159
.dark-theme .hljs,
160160
.markdown-body pre,
161161
pre {
162-
background: var(--pub-code-background-color);
162+
background: var(--pub-inset-bgColor);
163163
color: var(--pub-code-text-color);
164164
}
165165

pkg/web_css/lib/src/_detail_page.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $detail-tabs-tablet-width: calc(100% - 240px);
1313
.-wide-header-detail-page {
1414
.detail-header,
1515
.detail-tabs-wide-header {
16-
background: var(--pub-code-background-color);
16+
background: var(--pub-inset-bgColor);
1717
color: var(--pub-default-text-color);
1818
}
1919

@@ -300,7 +300,7 @@ $detail-tabs-tablet-width: calc(100% - 240px);
300300
margin: 0 0 24px -12px;
301301
padding: 0;
302302

303-
background: var(--pub-detail_tab-background-color);
303+
background: var(--pub-inset-bgColor);
304304
display: flex;
305305
align-items: center;
306306
flex-wrap: wrap;

pkg/web_css/lib/src/_form.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@
6161
border-width: 0px;
6262

6363
.mdc-data-table__row {
64-
border-top-color: var(--pub-code-background-color);
64+
border-top-color: var(--pub-inset-bgColor);
6565

6666
&:hover {
6767
background: inherit;
6868
}
6969

7070
&:nth-child(even) {
71-
background: var(--pub-code-background-color);
71+
background: var(--pub-inset-bgColor);
7272
}
7373
}
7474

pkg/web_css/lib/src/_home.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181
&.home-block-ff,
8282
&.home-block-pow {
83-
background: var(--pub-code-background-color);
83+
background: var(--pub-inset-bgColor);
8484
}
8585

8686
.home-block-image {

pkg/web_css/lib/src/_list.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
}
3737

3838
.count {
39-
background: var(--pub-code-background-color);
39+
background: var(--pub-inset-bgColor);
4040
display: inline-block;
4141
font-size: 12px;
4242
font-family: monospace;
@@ -334,7 +334,7 @@
334334
display: inline-block;
335335
text-transform: uppercase;
336336
color: var(--pub-pagination-active-color);
337-
background: var(--pub-pagination-background-color);
337+
background: var(--pub-inset-bgColor);
338338
font-size: 14px;
339339
border-radius: 3px;
340340
margin-top: 40px;
@@ -346,7 +346,7 @@
346346

347347
&.-active {
348348
pointer-events: none;
349-
color: var(--pub-pagination-background-color);
349+
color: var(--pub-inset-bgColor);
350350
background: var(--pub-pagination-active-color);
351351
}
352352

@@ -427,7 +427,7 @@
427427
cursor: pointer;
428428

429429
&:hover {
430-
background-color: var(--pub-code-background-color);
430+
background-color: var(--pub-inset-bgColor);
431431
}
432432

433433
a {

pkg/web_css/lib/src/_tags.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
/* Tags that are simple labels. */
1414
.package-tag {
15-
background: var(--pub-tag_simplebadge-background-color);
15+
background: var(--pub-inset-bgColor);
1616
text-transform: uppercase;
1717
color: var(--pub-tag_simplebadge-text-color);
1818
padding: 4px 8px;

pkg/web_css/lib/src/_variables.scss

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@
1616
// - `[property]` may be `color`, `opacity` for specific values, or a `value` for multi-part properties.
1717

1818
:root {
19-
--pub-color-white: #ffffff;
19+
--pub-color-white: #ffffff;
20+
--pub-color-smokeWhite: #f5f5f7; // slight deviation from official white-smoke (f5f5f5)
2021

2122
--pub-color-dangerRed: #ff4242;
2223

2324
--pub-neutral-bgColor: var(--pub-color-white);
25+
--pub-inset-bgColor: var(--pub-color-smokeWhite);
2426

2527
--pub-default-headline-font_family: "Google Sans Display", "Google Sans", "Roboto", sans-serif;
2628
--pub-default-text-color: hsl(0, 0%, 29%);
2729
--pub-default-text-font_family: "Google Sans Text", "Google Sans", "Roboto", sans-serif;
28-
--pub-code-background-color: #f5f5f7;
2930
--pub-code-text-color: var(--pub-default-text-color);
3031
--pub-link-text-color: #0175c2;
3132
--pub-code-text-font_family: "Google Sans Mono", "Roboto Mono", "Source Code Pro", Menlo, "Bitstream Vera Sans Mono", "DejaVu Sans Mono", Monaco, Consolas, monospace;
@@ -39,7 +40,6 @@
3940
--pub-collections_icon-background-color: #aeaeae;
4041
--pub-thumbnail_container-background-color: var(--pub-color-white); // same in dark mode
4142
--pub-copy_feedback-background-color: #fafaff;
42-
--pub-detail_tab-background-color: var(--pub-code-background-color);
4343
--pub-detail_tab-text-color: var(--pub-default-text-color);
4444
--pub-detail_tab-underline-color: #dddddd;
4545
--pub-detail_tab-active-color: #1967d2;
@@ -56,7 +56,6 @@
5656
--pub-home_card_hover-background-color: #fafafa;
5757
--pub-home_card_hover-box_shadow-color: rgba(0, 0, 0, 0.4);
5858
--pub-home_card_hover_fadeout-background-value: linear-gradient(transparent 90%, var(--pub-home_card_hover-background-color));
59-
--pub-pagination-background-color: var(--pub-code-background-color);
6059
--pub-pagination-active-color: var(--pub-link-text-color);
6160
--pub-pagination-inactive-color: #aaaaaa;
6261
--pub-input-placeholder-color: #888;
@@ -88,7 +87,6 @@
8887
--pub-sort_control_selected-text-color: var(--pub-default-text-color);
8988
--pub-spinner_frame-background-color: rgba(0, 0, 0, 0.2);
9089
--pub-summary_hover-background-color: color-mix(in srgb, var(--pub-link-text-color), var(--pub-neutral-bgColor) 80%);
91-
--pub-tag_simplebadge-background-color: #f0f0f0;
9290
--pub-tag_simplebadge-text-color: #444444;
9391
--pub_tag_simplebadge_warning-background-color: #c0392b;
9492
--pub_tag_simplebadge_warning-text-color: #f8f8f8;
@@ -111,41 +109,39 @@
111109

112110
.dark-theme {
113111
--pub-color-darkGunmetal: #1f262a; // close to #1d2026
112+
--pub-color-anchorBlack: #41424c;
114113

115114
--pub-neutral-bgColor: var(--pub-color-darkGunmetal);
115+
--pub-inset-bgColor: var(--pub-color-anchorBlack);
116116

117117
--pub-default-text-color: #e0e0e0;
118-
--pub-code-background-color: #474747;
119118
--pub-code-text-color: var(--pub-default-text-color);
120119
--pub-link-text-color: #40c4ff;
121120
--pub-badge-default-color: var(--pub-link-text-color);
122121
--pub-badge-red-color: var(--pub-color-dangerRed);
123122
--pub-copy_feedback-background-color: #404040;
124-
--pub-detail_tab-background-color: var(--pub-code-background-color);
125123
--pub-detail_tab-text-color: var(--pub-default-text-color);
126124
--pub-detail_tab-underline-color: #888888;
127-
--pub-detail_tab-active-color: color-mix(in srgb, var(--pub-link-text-color), var(--pub-detail_tab-background-color) 20%);
125+
--pub-detail_tab-active-color: color-mix(in srgb, var(--pub-link-text-color), var(--pub-inset-bgColor) 20%);
128126
--pub-detail_tab-admin-color: #e03030;
129127
--pub-home_title-text-color: #31b0fc;
130128
--pub-home_card-box_shadow-color: rgba(255, 255, 255, 0.2);
131129
--pub-home_card_title-text-color: var(--pub-home_title-text-color);
132130
--pub-home_card_hover-background-color: #383838;
133131
--pub-home_card_hover-box_shadow-color: rgba(255, 255, 255, 0.3);
134132
--pub-home_card_hover_fadeout-background-value: linear-gradient(transparent 90%, var(--pub-home_card_hover-background-color));
135-
--pub-pagination-background-color: var(--pub-code-background-color);
136133
--pub-pagination-active-color: var(--pub-link-text-color);
137134
--pub-pagination-inactive-color: #aaaaaa;
138135
--pub-pkg_list_item_hover-background-color: #333333;
139136
--pub-report-hover-background-color: #333333;
140137
--pub-score_label-text-color: #a0b0b8;
141138
--pub-score_value-text-color: var(--pub-link-text-color);
142139
--pub-sort_control-text-color: var(--pub-default-text-color);
143-
--pub-sort_control_hover-background-color: var(--pub-code-background-color);
140+
--pub-sort_control_hover-background-color: #333333;
144141
--pub-sort_control_hover-text-color: var(--pub-default-text-color);
145142
--pub-sort_control_selected-background-color: #206080;
146143
--pub-sort_control_selected-text-color: var(--pub-default-text-color);
147144
--pub-summary_hover-background-color: color-mix(in srgb, var(--pub-link-text-color), var(--pub-neutral-bgColor) 80%);
148-
--pub-tag_simplebadge-background-color: var(--pub-code-background-color);
149145
--pub-tag_simplebadge-text-color: var(--pub-default-text-color);
150146
--pub-tag_sdkbadge-background-color: #206080;
151147
--pub-tag_sdkbadge-separator-color: var(--pub-default-text-color);

0 commit comments

Comments
 (0)