Skip to content

Commit c80e4d8

Browse files
committed
improved system(light and dark), oled. Add new theme glass,...
New theme: - Glass - Sunset - Neon
1 parent e229902 commit c80e4d8

File tree

3 files changed

+156
-69
lines changed

3 files changed

+156
-69
lines changed

src/sidebarApps/extensions/style.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
display: flex;
147147
align-items: center;
148148
justify-content: center;
149-
box-shadow: 0 1px 3px var(--box-shadow-color);
150149

151150
&:hover {
152151
background-color: var(--active-icon-color);

src/theme/preInstalled.js

Lines changed: 151 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,47 @@ const WHITE = "rgb(255, 255, 255)";
99
const BLACK = "rgb(0, 0, 0)";
1010

1111
const dark = createBuiltInTheme("Dark", "dark", "free");
12-
dark.primaryColor = "rgb(49, 49, 49)";
13-
dark.primaryTextColor = WHITE;
14-
dark.darkenedPrimaryColor = "rgb(29, 29, 29)";
15-
dark.secondaryColor = "rgb(37, 37, 37)";
16-
dark.secondaryTextColor = WHITE;
17-
dark.activeColor = "rgb(51, 153, 255)";
18-
dark.linkTextColor = "rgb(181, 180, 233)";
19-
dark.borderColor = "rgba(230, 230, 230, 0.2)";
20-
dark.popupIconColor = WHITE;
21-
dark.popupBackgroundColor = "rgb(49, 49, 49)";
22-
dark.popupTextColor = WHITE;
23-
dark.popupActiveColor = "rgb(255, 215, 0)";
12+
dark.primaryColor = "rgb(35, 39, 42)";
13+
dark.primaryTextColor = "rgb(245, 245, 245)";
14+
dark.darkenedPrimaryColor = "rgb(24, 27, 30)";
15+
dark.secondaryColor = "rgb(45, 49, 52)";
16+
dark.secondaryTextColor = "rgb(228, 228, 228)";
17+
dark.activeColor = "rgb(66, 133, 244)";
18+
dark.linkTextColor = "rgb(138, 180, 248)";
19+
dark.borderColor = "rgba(188, 188, 188, 0.15)";
20+
dark.popupIconColor = "rgb(245, 245, 245)";
21+
dark.popupBackgroundColor = "rgb(35, 39, 42)";
22+
dark.popupTextColor = "rgb(245, 245, 245)";
23+
dark.popupActiveColor = "rgb(66, 133, 244)";
24+
dark.activeTextColor = "rgb(255, 255, 255)";
25+
dark.errorTextColor = "rgb(255, 185, 92)";
26+
dark.dangerColor = "rgb(220, 38, 38)";
27+
dark.scrollbarColor = "rgba(255, 255, 255, 0.2)";
2428

2529
const oled = createBuiltInTheme("OLED");
2630
oled.primaryColor = "rgb(0, 0, 0)";
27-
oled.primaryTextColor = WHITE;
31+
oled.primaryTextColor = "rgb(255, 255, 255)";
2832
oled.darkenedPrimaryColor = "rgb(0, 0, 0)";
29-
oled.secondaryColor = "rgb(0, 0, 0)";
30-
oled.secondaryTextColor = WHITE;
31-
oled.activeColor = "rgb(56, 56, 56)";
32-
oled.activeIconColor = "rgba(255, 255, 255, 0.2)";
33-
oled.linkTextColor = "rgb(181, 180, 233)";
34-
oled.borderColor = "rgb(124, 124, 124)";
35-
oled.popupIconColor = WHITE;
33+
oled.secondaryColor = "rgb(8, 8, 8)";
34+
oled.secondaryTextColor = "rgb(240, 240, 240)";
35+
oled.activeColor = "rgb(0, 122, 255)";
36+
oled.activeIconColor = "rgba(0, 122, 255, 0.8)";
37+
oled.linkTextColor = "rgb(10, 132, 255)";
38+
oled.borderColor = "rgba(255, 255, 255, 0.08)";
39+
oled.popupIconColor = "rgb(255, 255, 255)";
3640
oled.popupBackgroundColor = "rgb(0, 0, 0)";
37-
oled.popupTextColor = WHITE;
38-
oled.popupActiveColor = "rgb(121, 103, 0)";
39-
oled.popupBorderColor = "rgba(255, 255, 255, 0.4)";
40-
oled.boxShadowColor = BLACK;
41+
oled.popupTextColor = "rgb(255, 255, 255)";
42+
oled.popupActiveColor = "rgb(0, 122, 255)";
43+
oled.popupBorderColor = "rgba(255, 255, 255, 0.1)";
44+
oled.boxShadowColor = "rgba(0, 0, 0, 0.8)";
45+
oled.buttonBackgroundColor = "rgb(0, 122, 255)";
46+
oled.buttonTextColor = "rgb(255, 255, 255)";
47+
oled.buttonActiveColor = "rgb(10, 132, 255)";
48+
oled.preferredEditorTheme = "ace/theme/monokai";
49+
oled.activeTextColor = "rgb(255, 255, 255)";
50+
oled.errorTextColor = "rgb(255, 69, 58)";
51+
oled.dangerColor = "rgb(255, 69, 58)";
52+
oled.scrollbarColor = "rgba(255, 255, 255, 0.1)";
4153

4254
const ocean = createBuiltInTheme("Ocean");
4355
ocean.darkenedPrimaryColor = "rgb(19, 19, 26)";
@@ -159,17 +171,24 @@ menes.buttonTextColor = "rgb(144, 184, 248)";
159171
menes.buttonActiveColor = "rgb(0, 145, 153)";
160172

161173
const light = createBuiltInTheme("Light", "light");
162-
light.darkenedPrimaryColor = "rgb(153, 153, 153)";
163-
light.primaryColor = WHITE;
164-
light.primaryTextColor = "rgb(51, 62, 89)";
165-
light.secondaryColor = WHITE;
166-
light.secondaryTextColor = "rgb(51, 62, 89)";
167-
light.activeColor = "rgb(51, 153, 255)";
168-
light.linkTextColor = "rgb(104, 103, 149)";
169-
light.borderColor = "rgb(153, 153, 153)";
170-
light.popupIconColor = "rgb(51, 62, 89)";
171-
172-
const system = createBuiltInTheme("System");
174+
light.darkenedPrimaryColor = "rgb(247, 250, 252)";
175+
light.primaryColor = "rgb(255, 255, 255)";
176+
light.primaryTextColor = "rgb(15, 23, 42)";
177+
light.secondaryColor = "rgb(248, 250, 252)";
178+
light.secondaryTextColor = "rgb(51, 65, 85)";
179+
light.activeColor = "rgb(59, 130, 246)";
180+
light.linkTextColor = "rgb(37, 99, 235)";
181+
light.borderColor = "rgb(226, 232, 240)";
182+
light.popupIconColor = "rgb(15, 23, 42)";
183+
light.popupBackgroundColor = "rgb(255, 255, 255)";
184+
light.popupTextColor = "rgb(15, 23, 42)";
185+
light.popupActiveColor = "rgb(59, 130, 246)";
186+
light.activeTextColor = "rgb(255, 255, 255)";
187+
light.errorTextColor = "rgb(185, 28, 28)";
188+
light.dangerColor = "rgb(220, 38, 38)";
189+
light.scrollbarColor = "rgba(0, 0, 0, 0.2)";
190+
191+
const system = createBuiltInTheme("System", "dark", "free");
173192

174193
export function getSystemEditorTheme(darkTheme) {
175194
if (darkTheme) {
@@ -181,35 +200,35 @@ export function getSystemEditorTheme(darkTheme) {
181200

182201
export function updateSystemTheme(darkTheme) {
183202
if (darkTheme) {
184-
system.primaryColor = "rgb(49, 49, 49)";
185-
system.primaryTextColor = WHITE;
186-
system.darkenedPrimaryColor = "rgb(29, 29, 29)";
187-
system.secondaryColor = "rgb(37, 37, 37)";
188-
system.secondaryTextColor = WHITE;
189-
system.activeColor = "rgb(51, 153, 255)";
190-
system.linkTextColor = "rgb(181, 180, 233)";
191-
system.borderColor = "rgba(230, 230, 230, 0.2)";
192-
system.popupIconColor = WHITE;
193-
194-
system.popupBackgroundColor = "rgb(49, 49, 49)";
195-
system.popupTextColor = WHITE;
196-
system.popupActiveColor = "rgb(255, 215, 0)";
203+
system.primaryColor = "rgb(35, 39, 42)";
204+
system.primaryTextColor = "rgb(245, 245, 245)";
205+
system.darkenedPrimaryColor = "rgb(24, 27, 30)";
206+
system.secondaryColor = "rgb(45, 49, 52)";
207+
system.secondaryTextColor = "rgb(228, 228, 228)";
208+
system.activeColor = "rgb(66, 133, 244)";
209+
system.linkTextColor = "rgb(138, 180, 248)";
210+
system.borderColor = "rgba(188, 188, 188, 0.15)";
211+
system.popupIconColor = "rgb(245, 245, 245)";
212+
213+
system.popupBackgroundColor = "rgb(35, 39, 42)";
214+
system.popupTextColor = "rgb(245, 245, 245)";
215+
system.popupActiveColor = "rgb(66, 133, 244)";
197216
system.type = "dark";
198217
} else {
199218
system.type = "light";
200-
system.darkenedPrimaryColor = "rgb(153, 153, 153)";
201-
system.primaryColor = WHITE;
202-
system.primaryTextColor = "rgb(51, 62, 89)";
203-
system.secondaryColor = WHITE;
204-
system.secondaryTextColor = "rgb(51, 62, 89)";
205-
system.activeColor = "rgb(51, 153, 255)";
206-
system.linkTextColor = BLACK;
207-
system.borderColor = "rgb(153, 153, 153)";
208-
system.popupIconColor = "rgb(51, 62, 89)";
209-
210-
system.popupBackgroundColor = WHITE;
211-
system.popupTextColor = BLACK;
212-
system.popupActiveColor = "rgb(255, 215, 0)";
219+
system.darkenedPrimaryColor = "rgb(247, 250, 252)";
220+
system.primaryColor = "rgb(255, 255, 255)";
221+
system.primaryTextColor = "rgb(15, 23, 42)";
222+
system.secondaryColor = "rgb(248, 250, 252)";
223+
system.secondaryTextColor = "rgb(51, 65, 85)";
224+
system.activeColor = "rgb(59, 130, 246)";
225+
system.linkTextColor = "rgb(37, 99, 235)";
226+
system.borderColor = "rgb(226, 232, 240)";
227+
system.popupIconColor = "rgb(15, 23, 42)";
228+
229+
system.popupBackgroundColor = "rgb(255, 255, 255)";
230+
system.popupTextColor = "rgb(15, 23, 42)";
231+
system.popupActiveColor = "rgb(59, 130, 246)";
213232
}
214233

215234
system.preferredEditorTheme = getSystemEditorTheme(darkTheme);
@@ -226,13 +245,83 @@ export function updateSystemTheme(darkTheme) {
226245

227246
updateSystemTheme(isDeviceDarkTheme());
228247

248+
const glass = createBuiltInTheme("Glass");
249+
glass.darkenedPrimaryColor = "rgb(250, 250, 255)";
250+
glass.primaryColor = "rgb(255, 255, 255)";
251+
glass.primaryTextColor = "rgb(17, 24, 39)";
252+
glass.secondaryColor = "rgba(255, 255, 255, 0.8)";
253+
glass.secondaryTextColor = "rgb(55, 65, 81)";
254+
glass.activeColor = "rgb(99, 102, 241)";
255+
glass.linkTextColor = "rgb(79, 70, 229)";
256+
glass.borderColor = "rgba(99, 102, 241, 0.2)";
257+
glass.popupIconColor = "rgb(17, 24, 39)";
258+
glass.popupBackgroundColor = "rgba(255, 255, 255, 0.95)";
259+
glass.popupTextColor = "rgb(17, 24, 39)";
260+
glass.popupActiveColor = "rgb(99, 102, 241)";
261+
glass.buttonBackgroundColor = "rgb(99, 102, 241)";
262+
glass.buttonTextColor = "rgb(255, 255, 255)";
263+
glass.buttonActiveColor = "rgb(79, 70, 229)";
264+
glass.boxShadowColor = "rgba(0, 0, 0, 0.1)";
265+
glass.activeTextColor = "rgb(255, 255, 255)";
266+
glass.errorTextColor = "rgb(185, 28, 28)";
267+
glass.dangerColor = "rgb(220, 38, 38)";
268+
glass.scrollbarColor = "rgba(0, 0, 0, 0.15)";
269+
270+
const neon = createBuiltInTheme("Neon");
271+
neon.darkenedPrimaryColor = "rgb(9, 9, 11)";
272+
neon.primaryColor = "rgb(15, 15, 17)";
273+
neon.primaryTextColor = "rgb(10, 255, 200)";
274+
neon.secondaryColor = "rgb(24, 24, 27)";
275+
neon.secondaryTextColor = "rgb(255, 255, 255)";
276+
neon.activeColor = "rgb(255, 20, 147)";
277+
neon.linkTextColor = "rgb(0, 255, 255)";
278+
neon.borderColor = "rgba(10, 255, 200, 0.3)";
279+
neon.popupIconColor = "rgb(10, 255, 200)";
280+
neon.popupBackgroundColor = "rgb(15, 15, 17)";
281+
neon.popupTextColor = "rgb(10, 255, 200)";
282+
neon.popupActiveColor = "rgb(255, 20, 147)";
283+
neon.buttonBackgroundColor = "rgb(255, 20, 147)";
284+
neon.buttonTextColor = "rgb(0, 0, 0)";
285+
neon.buttonActiveColor = "rgb(0, 255, 255)";
286+
neon.boxShadowColor = "rgba(10, 255, 200, 0.2)";
287+
neon.preferredEditorTheme = "ace/theme/monokai";
288+
neon.activeTextColor = "rgb(0, 0, 0)";
289+
neon.errorTextColor = "rgb(255, 20, 147)";
290+
neon.dangerColor = "rgb(255, 20, 147)";
291+
neon.scrollbarColor = "rgba(10, 255, 200, 0.3)";
292+
293+
const sunset = createBuiltInTheme("Sunset");
294+
sunset.darkenedPrimaryColor = "rgb(251, 243, 235)";
295+
sunset.primaryColor = "rgb(255, 251, 247)";
296+
sunset.primaryTextColor = "rgb(124, 45, 18)";
297+
sunset.secondaryColor = "rgb(254, 235, 217)";
298+
sunset.secondaryTextColor = "rgb(154, 52, 18)";
299+
sunset.activeColor = "rgb(251, 146, 60)";
300+
sunset.linkTextColor = "rgb(234, 88, 12)";
301+
sunset.borderColor = "rgb(253, 186, 116)";
302+
sunset.popupIconColor = "rgb(124, 45, 18)";
303+
sunset.popupBackgroundColor = "rgb(255, 251, 247)";
304+
sunset.popupTextColor = "rgb(124, 45, 18)";
305+
sunset.popupActiveColor = "rgb(251, 146, 60)";
306+
sunset.buttonBackgroundColor = "rgb(251, 146, 60)";
307+
sunset.buttonTextColor = "rgb(255, 255, 255)";
308+
sunset.buttonActiveColor = "rgb(234, 88, 12)";
309+
sunset.activeTextColor = "rgb(255, 255, 255)";
310+
sunset.errorTextColor = "rgb(185, 28, 28)";
311+
sunset.dangerColor = "rgb(220, 38, 38)";
312+
sunset.scrollbarColor = "rgba(124, 45, 18, 0.2)";
313+
229314
const custom = createBuiltInTheme("Custom");
230315
custom.autoDarkened = true;
231316

232317
export default [
233318
system,
234-
createBuiltInTheme("default", "dark", "free"),
319+
createBuiltInTheme("Legacy", "dark", "free"),
235320
dark,
321+
light,
322+
glass,
323+
neon,
324+
sunset,
236325
oled,
237326
ocean,
238327
bump,
@@ -241,6 +330,5 @@ export default [
241330
atticus,
242331
tomyris,
243332
menes,
244-
light,
245333
custom,
246334
];

www/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,17 +165,17 @@
165165

166166
<title>Acode</title>
167167
<!--styles-->
168+
<link rel="stylesheet" href="./css/build/263.css">
169+
<link rel="stylesheet" href="./css/build/31.css">
170+
<link rel="stylesheet" href="./css/build/439.css">
171+
<link rel="stylesheet" href="./css/build/490.css">
172+
<link rel="stylesheet" href="./css/build/626.css">
168173
<link rel="stylesheet" href="./css/build/about.css">
169174
<link rel="stylesheet" href="./css/build/customTheme.css">
170175
<link rel="stylesheet" href="./css/build/donate.css">
171176
<link rel="stylesheet" href="./css/build/fileBrowser.css">
172177
<link rel="stylesheet" href="./css/build/main.css">
173178
<link rel="stylesheet" href="./css/build/plugins.css">
174-
<link rel="stylesheet" href="./css/build/src_pages_quickTools_quickTools_js.css">
175-
<link rel="stylesheet" href="./css/build/src_sidebarApps_extensions_index_js.css">
176-
<link rel="stylesheet" href="./css/build/src_sidebarApps_files_index_js.css">
177-
<link rel="stylesheet" href="./css/build/src_sidebarApps_notification_index_js.css">
178-
<link rel="stylesheet" href="./css/build/src_sidebarApps_searchInFiles_index_js.css">
179179
<link rel="stylesheet" href="./css/build/themeSetting.css">
180180
<!--styles_end-->
181181
</head>

0 commit comments

Comments
 (0)