Skip to content

Commit 9a995e0

Browse files
committed
Fix too wide CSS scope bleeding into page style (issue #232, thanks SuperPat45 for report).
1 parent da95e86 commit 9a995e0

File tree

1 file changed

+55
-52
lines changed

1 file changed

+55
-52
lines changed

src/common/themes.css

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7,54 +7,7 @@
77
.__NoScript_Theme__ {
88
--focus-color-dark: #8007;
99
--focus-color-light: #f787;
10-
}
11-
12-
.__NoScript_Theme__, .__NoScript_Theme__[data-theme="dark"] {
13-
color-scheme: dark;
14-
--accent-color: #d12027;
15-
--fg-color1: #ccc;
16-
--fg-color2: #fff;
17-
--text-color: #ddd;
18-
--bg-color1: #000;
19-
--bg-color2: #212026;
20-
--form-color1: #333;
21-
--form-color2: #111;
22-
--focus-color: var(--focus-color-dark);
23-
--tab-color1: #6668;
24-
--tab-color2: #3348;
25-
--form-check-color: var(--accent-color);
26-
--form-control-color: var(--form-color2);
27-
--hilite-color: #f008;
28-
}
29-
30-
.__NoScript_Theme__.vintage:not([data-theme="light"]) :is(input.preset, .icon) {
31-
filter: brightness(85%);
32-
}
33-
34-
35-
@media (prefers-color-scheme: light) {
36-
.__NoScript_Theme__ {
37-
color-scheme: light;
38-
--fg-color1: #555;
39-
--fg-color2: #000;
40-
--text-color: #333;
41-
--bg-color1: #ddd;
42-
--bg-color2: #fff;
43-
--form-color1: #ccc;
44-
--form-color2: #eee;
45-
--tab-color1: #ddda;
46-
--tab-color2: #8888;
47-
--focus-color: var(--focus-color-light);
48-
}
4910

50-
.__NoScript_Theme__.vintage[data-theme="dark"] :is(input.preset, .icon) {
51-
filter: brightness(85%);
52-
}
53-
54-
}
55-
56-
57-
:root {
5811
--img-noscript-options: url(/img/noscript-options.png);
5912
--img-ui-revoke-temp: url(/img/ui-revoke-temp64.png);
6013
--img-ui-temp-all: url(/img/ui-temp-all64.png);
@@ -84,10 +37,15 @@
8437
--bg-focused-row: linear-gradient(to bottom, var(--form-color1) 0, var(--form-color2) 70%, var(--bg-color1) 100%) no-repeat;
8538
--bg-odd-row: var(--bg-color2);
8639
--bg-even-row: var(--form-color1);
87-
--border-row-sep: none; /* 2px dotted var(--form-color2); */
40+
--border-row-sep: none;
8841
}
8942

90-
.vintage {
43+
44+
.__NoScript_Theme__.vintage {
45+
46+
--focus-color-light: #8cf8 !important;
47+
--focus-color-dark: #0468 !important;
48+
9149
--img-noscript-options: url(/img/vintage/noscript-options.png);
9250
--img-ui-revoke-temp: url(/img/vintage/ui-revoke-temp64.png);
9351
--img-ui-temp-all: url(/img/vintage/ui-temp-all64.png);
@@ -114,12 +72,57 @@
11472
--line-size: 1.5em;
11573
--popup-size: 600px;
11674

117-
--focus-color-light: #8cf8 !important;
118-
--focus-color-dark: #0468 !important;
119-
12075
--bg-focused-row: var(--focus-color);
12176
--bg-odd-row: var(--bg-color2);
12277
--bg-even-row: var(--bg-color1);
12378
--border-row-sep: none;
12479
}
12580

81+
82+
.__NoScript_Theme__, .__NoScript_Theme__[data-theme="dark"] {
83+
color-scheme: dark;
84+
--accent-color: #d12027;
85+
--fg-color1: #ccc;
86+
--fg-color2: #fff;
87+
--text-color: #ddd;
88+
--bg-color1: #000;
89+
--bg-color2: #212026;
90+
--form-color1: #333;
91+
--form-color2: #111;
92+
--focus-color: var(--focus-color-dark);
93+
--tab-color1: #6668;
94+
--tab-color2: #3348;
95+
--form-check-color: var(--accent-color);
96+
--form-control-color: var(--form-color2);
97+
--hilite-color: #f008;
98+
}
99+
100+
.__NoScript_Theme__.vintage:not([data-theme="light"]) :is(input.preset, .icon) {
101+
filter: brightness(85%);
102+
}
103+
104+
105+
@media (prefers-color-scheme: light) {
106+
.__NoScript_Theme__ {
107+
color-scheme: light;
108+
--fg-color1: #555;
109+
--fg-color2: #000;
110+
--text-color: #333;
111+
--bg-color1: #ddd;
112+
--bg-color2: #fff;
113+
--form-color1: #ccc;
114+
--form-color2: #eee;
115+
--tab-color1: #ddda;
116+
--tab-color2: #8888;
117+
--focus-color: var(--focus-color-light);
118+
}
119+
120+
.__NoScript_Theme__.vintage[data-theme="dark"] :is(input.preset, .icon) {
121+
filter: brightness(85%);
122+
}
123+
124+
}
125+
126+
127+
128+

0 commit comments

Comments
 (0)