Skip to content

Commit a3ab6e9

Browse files
wash2jackpot51
wash2
authored and
jackpot51
committed
chore: update theme colors
1 parent b9bd414 commit a3ab6e9

File tree

4 files changed

+54
-45
lines changed

4 files changed

+54
-45
lines changed

‎cosmic-theme/src/model/cosmic_palette.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ pub struct CosmicPaletteInner<C> {
105105

106106
/// System Neutrals
107107
/// A wider spread of dark colors for more general use.
108+
pub neutral_0: C,
109+
/// A wider spread of dark colors for more general use.
108110
pub neutral_1: C,
109111
/// A wider spread of dark colors for more general use.
110112
pub neutral_2: C,
@@ -166,6 +168,7 @@ impl From<CosmicPaletteInner<CssColor>> for CosmicPaletteInner<Srgba> {
166168
gray_1: p.gray_1.into(),
167169
gray_2: p.gray_2.into(),
168170
gray_3: p.gray_3.into(),
171+
neutral_0: p.neutral_0.into(),
169172
neutral_1: p.neutral_1.into(),
170173
neutral_2: p.neutral_2.into(),
171174
neutral_3: p.neutral_3.into(),

‎cosmic-theme/src/model/dark.ron‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,43 @@ Dark (
1414
c: "#FFF19E",
1515
),
1616
gray_1: (
17-
c: "#1E1E1E",
17+
c: "#1B1B1B",
1818
),
1919
gray_2: (
20-
c: "#292929",
20+
c: "#262626",
2121
),
2222
gray_3: (
23-
c: "#2E2E2E",
23+
c: "#303030",
2424
),
25-
neutral_1: (
25+
neutral_0: (
2626
c: "#000000",
2727
),
28+
neutral_1: (
29+
c: "#1B1B1B",
30+
),
2831
neutral_2: (
29-
c: "#272727",
32+
c: "#303030",
3033
),
3134
neutral_3: (
32-
c: "#424242",
35+
c: "#474747",
3336
),
3437
neutral_4: (
35-
c: "#5D5D5D",
38+
c: "#5E5E5E",
3639
),
3740
neutral_5: (
38-
c: "#787878",
41+
c: "#777777",
3942
),
4043
neutral_6: (
41-
c: "#939393",
44+
c: "#919191",
4245
),
4346
neutral_7: (
44-
c: "#AEAEAE",
47+
c: "#ABABAB",
4548
),
4649
neutral_8: (
47-
c: "#C9C9C9",
50+
c: "#C6C6C6",
4851
),
4952
neutral_9: (
50-
c: "#E4E4E4",
53+
c: "#E2E2E2",
5154
),
5255
neutral_10: (
5356
c: "#FFFFFF",

‎cosmic-theme/src/model/derivation.rs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ where
334334
match (p, t) {
335335
(CosmicPalette::Dark(p), ComponentType::Background) => Self::component(
336336
p.gray_1,
337-
p.neutral_1,
337+
p.neutral_0,
338338
p.neutral_10,
339339
0.08,
340340
p.blue,
@@ -344,7 +344,7 @@ where
344344

345345
(CosmicPalette::Dark(p), ComponentType::Primary) => Self::component(
346346
p.gray_2,
347-
p.neutral_1,
347+
p.neutral_0,
348348
p.neutral_10,
349349
0.08,
350350
p.blue,
@@ -354,7 +354,7 @@ where
354354

355355
(CosmicPalette::Dark(p), ComponentType::Secondary) => Self::component(
356356
p.gray_3,
357-
p.neutral_1,
357+
p.neutral_0,
358358
p.neutral_10,
359359
0.08,
360360
p.blue,
@@ -363,7 +363,7 @@ where
363363
),
364364
(CosmicPalette::HighContrastDark(p), ComponentType::Background) => Self::component(
365365
p.gray_1,
366-
p.neutral_1,
366+
p.neutral_0,
367367
p.neutral_10,
368368
0.08,
369369
p.blue,
@@ -372,7 +372,7 @@ where
372372
),
373373
(CosmicPalette::HighContrastDark(p), ComponentType::Primary) => Self::component(
374374
p.gray_2,
375-
p.neutral_1,
375+
p.neutral_0,
376376
p.neutral_10,
377377
0.08,
378378
p.blue,
@@ -381,7 +381,7 @@ where
381381
),
382382
(CosmicPalette::HighContrastDark(p), ComponentType::Secondary) => Self::component(
383383
p.gray_3,
384-
p.neutral_1,
384+
p.neutral_0,
385385
p.neutral_10.clone(),
386386
0.08,
387387
p.blue,
@@ -391,26 +391,26 @@ where
391391

392392
(CosmicPalette::Light(p), ComponentType::Background) => Component::component(
393393
p.gray_1.clone(),
394-
p.neutral_1.clone(),
395-
p.neutral_1,
394+
p.neutral_0.clone(),
395+
p.neutral_0,
396396
0.75,
397397
p.blue.clone(),
398398
p.neutral_8,
399399
false,
400400
),
401401
(CosmicPalette::Light(p), ComponentType::Primary) => Component::component(
402402
p.gray_2.clone(),
403-
p.neutral_1.clone(),
404-
p.neutral_1,
403+
p.neutral_0.clone(),
404+
p.neutral_0,
405405
0.9,
406406
p.blue.clone(),
407407
p.neutral_8,
408408
false,
409409
),
410410
(CosmicPalette::Light(p), ComponentType::Secondary) => Component::component(
411411
p.gray_3.clone(),
412-
p.neutral_1.clone(),
413-
p.neutral_1,
412+
p.neutral_0.clone(),
413+
p.neutral_0,
414414
1.0,
415415
p.blue.clone(),
416416
p.neutral_8,
@@ -419,8 +419,8 @@ where
419419
(CosmicPalette::HighContrastLight(p), ComponentType::Background) => {
420420
Component::component(
421421
p.gray_1.clone(),
422-
p.neutral_1.clone(),
423-
p.neutral_1,
422+
p.neutral_0.clone(),
423+
p.neutral_0,
424424
0.75,
425425
p.blue.clone(),
426426
p.neutral_9,
@@ -429,8 +429,8 @@ where
429429
}
430430
(CosmicPalette::HighContrastLight(p), ComponentType::Primary) => Component::component(
431431
p.gray_2.clone(),
432-
p.neutral_1.clone(),
433-
p.neutral_1,
432+
p.neutral_0.clone(),
433+
p.neutral_0,
434434
0.9,
435435
p.blue.clone(),
436436
p.neutral_9,
@@ -439,8 +439,8 @@ where
439439
(CosmicPalette::HighContrastLight(p), ComponentType::Secondary) => {
440440
Component::component(
441441
p.gray_3.clone(),
442-
p.neutral_1.clone(),
443-
p.neutral_1,
442+
p.neutral_0.clone(),
443+
p.neutral_0,
444444
1.0,
445445
p.blue.clone(),
446446
p.neutral_9,
@@ -459,21 +459,21 @@ where
459459
| (CosmicPalette::Light(p), ComponentType::Warning)
460460
| (CosmicPalette::HighContrastLight(p), ComponentType::Warning)
461461
| (CosmicPalette::HighContrastDark(p), ComponentType::Warning) => {
462-
Component::colored_component(p.yellow.clone(), p.neutral_1, p.blue.clone())
462+
Component::colored_component(p.yellow.clone(), p.neutral_0, p.blue.clone())
463463
}
464464

465465
(CosmicPalette::Dark(p), ComponentType::Success)
466466
| (CosmicPalette::Light(p), ComponentType::Success)
467467
| (CosmicPalette::HighContrastLight(p), ComponentType::Success)
468468
| (CosmicPalette::HighContrastDark(p), ComponentType::Success) => {
469-
Component::colored_component(p.green.clone(), p.neutral_1, p.blue.clone())
469+
Component::colored_component(p.green.clone(), p.neutral_0, p.blue.clone())
470470
}
471471

472472
(CosmicPalette::Dark(p), ComponentType::Accent)
473473
| (CosmicPalette::Light(p), ComponentType::Accent)
474474
| (CosmicPalette::HighContrastDark(p), ComponentType::Accent)
475475
| (CosmicPalette::HighContrastLight(p), ComponentType::Accent) => {
476-
Component::colored_component(p.blue.clone(), p.neutral_1, p.blue.clone())
476+
Component::colored_component(p.blue.clone(), p.neutral_0, p.blue.clone())
477477
}
478478
}
479479
}

‎cosmic-theme/src/model/light.ron‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,43 @@ Light (
1414
c: "#966800",
1515
),
1616
gray_1: (
17-
c: "#DEDEDE",
17+
c: "#DDDDDD",
1818
),
1919
gray_2: (
20-
c: "#E9E9E9",
20+
c: "#E8E8E8",
2121
),
2222
gray_3: (
23-
c: "#F4F4F4",
23+
c: "#F3F3F3",
2424
),
25-
neutral_1: (
25+
neutral_0: (
2626
c: "#FFFFFF",
2727
),
28+
neutral_1: (
29+
c: "#E2E2E2",
30+
),
2831
neutral_2: (
29-
c: "#E4E4E4",
32+
c: "#C6C6C6",
3033
),
3134
neutral_3: (
32-
c: "#C9C9C9",
35+
c: "#ABABAB",
3336
),
3437
neutral_4: (
35-
c: "#AEAEAE",
38+
c: "#919191",
3639
),
3740
neutral_5: (
38-
c: "#939393",
41+
c: "#777777",
3942
),
4043
neutral_6: (
41-
c: "#787878",
44+
c: "#5E5E5E",
4245
),
4346
neutral_7: (
44-
c: "#5D5D5D",
47+
c: "#474747",
4548
),
4649
neutral_8: (
47-
c: "#424242",
50+
c: "#303030",
4851
),
4952
neutral_9: (
50-
c: "#272727",
53+
c: "#1B1B1B",
5154
),
5255
neutral_10: (
5356
c: "#000000",

0 commit comments

Comments
 (0)