Skip to content

Commit 29c1480

Browse files
committed
Minor cross-theme visual tweakings.
1 parent 736548c commit 29c1480

File tree

3 files changed

+19
-14
lines changed

3 files changed

+19
-14
lines changed

src/common/themes.css

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,18 @@
3434
--line-size: 1.7em;
3535
--popup-size: 640px;
3636

37+
--bg-preset-color: var(--form-color2);
3738
--bg-focused-row: linear-gradient(to bottom, var(--form-color1) 0, var(--form-color2) 70%, var(--bg-color1) 100%) no-repeat;
3839
--bg-odd-row: var(--bg-color2);
39-
--bg-even-row: var(--form-color1);
40+
--bg-even-row: var(--tab-color1);
4041
--border-row-sep: none;
4142
}
4243

4344

4445
.__NoScript_Theme__.vintage {
4546

4647
--focus-color-light: #8cf8 !important;
47-
--focus-color-dark: #0468 !important;
48+
--focus-color-dark: #2488 !important;
4849

4950
--img-noscript-options: url(/img/vintage/noscript-options.png);
5051
--img-ui-revoke-temp: url(/img/vintage/ui-revoke-temp64.png);
@@ -72,13 +73,9 @@
7273
--line-size: 1.5em;
7374
--popup-size: 600px;
7475

75-
--bg-focused-row: var(--focus-color);
76-
--bg-odd-row: var(--bg-color2);
77-
--bg-even-row: var(--bg-color1);
78-
--border-row-sep: none;
76+
--bg-focused-row: linear-gradient(to bottom, transparent 0, transparent 60%, var(--focus-color) 100%);
7977
}
8078

81-
8279
.__NoScript_Theme__, .__NoScript_Theme__[data-theme="dark"] {
8380
color-scheme: dark;
8481
--accent-color: #d12027;
@@ -90,7 +87,7 @@
9087
--form-color1: #333;
9188
--form-color2: #111;
9289
--focus-color: var(--focus-color-dark);
93-
--tab-color1: #6668;
90+
--tab-color1: #334;
9491
--tab-color2: #3348;
9592
--form-check-color: var(--accent-color);
9693
--form-control-color: var(--form-color2);
@@ -112,7 +109,7 @@
112109
--bg-color2: #fff;
113110
--form-color1: #ccc;
114111
--form-color2: #eee;
115-
--tab-color1: #ddda;
112+
--tab-color1: #ddd;
116113
--tab-color2: #8888;
117114
--focus-color: var(--focus-color-light);
118115
}

src/ui/popup.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ html:not(.mobile) #scrollable {
241241
}
242242

243243
#sites {
244-
margin: 0.5em 0.25em;
244+
margin: 0;
245245
}
246246

247247
#content {

src/ui/ui.css

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,12 @@ input[type="checkbox"] {
180180
border-collapse: collapse;
181181
border-spacing: 0;
182182
width: 100%;
183-
background-color: var(--bg-odd-row);
184183
image-rendering: -webkit-optimize-contrast;
185184
}
185+
.vintage .sites {
186+
image-rendering: auto;
187+
}
188+
186189
.sites tr, .sites td {
187190
margin: 0;
188191
padding: 0;
@@ -192,7 +195,7 @@ input[type="checkbox"] {
192195
}
193196

194197
html:not(.mobile) .sites > tr.site:not(.customizing):is(:focus-within, :hover) {
195-
background: var(--bg-focused-row);
198+
background-image: var(--bg-focused-row);
196199
border-color: transparent;
197200
}
198201

@@ -201,10 +204,15 @@ html:not(.mobile) .sites > tr.site:not(.customizing):is(:focus-within, :hover) {
201204
border-top: var(--border-row-sep);
202205
}
203206

204-
.sites > tr.site:nth-child(even):not(.customizing) {
207+
.sites > tr.site:nth-of-type(even):not(.customizing) {
205208
background-color: var(--bg-even-row);
206209
}
207210

211+
.sites > tr.site:nth-of-type(odd):not(.customizing) {
212+
background-color: var(--bg-odd-row);
213+
}
214+
215+
208216
.sites > tr.site:first-of-type, tr.site:focus-within + tr, .sites > tr.customizing, .sites > tr.customizing + tr.site, .customizer, .customizer + tr.site {
209217
border-color: transparent;
210218
}
@@ -364,7 +372,7 @@ span.preset {
364372
}
365373

366374
:not(#presets) > .sites .site:not(.customizing) .presets input.preset:checked + label.preset {
367-
background-image: linear-gradient(to right, transparent calc(var(--line-size) * 1.5), var(--form-color2) 50%);
375+
background-image: linear-gradient(to right, transparent calc(var(--line-size) * 1.5), var(--bg-preset-color) 50%);
368376
border-radius: calc(var(--line-size) / 2);
369377
}
370378

0 commit comments

Comments
 (0)