branch: externals/doric-themes
commit d0efee9a9e91b1150b3fe2c15b512a55414e9a5d
Author: Protesilaos Stavrou <i...@protesilaos.com>
Commit: Protesilaos Stavrou <i...@protesilaos.com>
Introduce fg-neutral colour and make the necessary adjustments
---
contrasts.org | 232 +++++++++++++++++++++++++-----------------------
doric-cherry-theme.el | 3 +-
doric-dark-theme.el | 3 +-
doric-earth-theme.el | 3 +-
doric-fire-theme.el | 3 +-
doric-light-theme.el | 3 +-
doric-marble-theme.el | 3 +-
doric-obsidian-theme.el | 1 +
doric-plum-theme.el | 1 +
doric-themes.el | 10 +--
doric-water-theme.el | 1 +
doric-wind-theme.el | 7 +-
12 files changed, 145 insertions(+), 125 deletions(-)
diff --git a/contrasts.org b/contrasts.org
index 298bb1ad92..203e2b26c6 100644
--- a/contrasts.org
+++ b/contrasts.org
@@ -52,27 +52,28 @@ C1 and C2 are color values written in hexadecimal RGB."
:END:
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #f7edf1 | #e5dde0 | #dfd0d9 |
#cc95b7 | #edcae5 |
+| Name | | #f7edf1 | #e5dde0 | #d7c9d0 |
#cc95b7 | #edcae5 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-main | #35292f | 12.15 | 10.43 | 9.38 |
5.66 | 9.39 |
-| fg-shadow-subtle | #675462 | 6.07 | 5.21 | 4.69 |
2.83 | 4.69 |
-| fg-shadow-intense | #683455 | 8.29 | 7.12 | 6.41 |
3.87 | 6.41 |
-| fg-accent | #77266e | 8.02 | 6.89 | 6.19 |
3.74 | 6.20 |
+| fg-main | #35292f | 12.15 | 10.43 | 8.71 |
5.66 | 9.39 |
+| fg-shadow-subtle | #675462 | 6.07 | 5.21 | 4.35 |
2.83 | 4.69 |
+| fg-neutral | #5a4c5f | 6.96 | 5.98 | 4.99 |
3.25 | 5.38 |
+| fg-shadow-intense | #683455 | 8.29 | 7.12 | 5.95 |
3.87 | 6.41 |
+| fg-accent | #77266e | 8.02 | 6.89 | 5.75 |
3.74 | 6.20 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-faint-red | #750000 | 10.44 | 8.97 | 8.06 |
4.87 | 8.07 |
-| fg-faint-green | #056100 | 6.75 | 5.80 | 5.21 |
3.15 | 5.22 |
-| fg-faint-yellow | #5f4602 | 7.76 | 6.66 | 5.99 |
3.62 | 6.00 |
-| fg-faint-blue | #353362 | 10.18 | 8.74 | 7.86 |
4.75 | 7.87 |
-| fg-faint-magenta | #553372 | 8.72 | 7.49 | 6.73 |
4.07 | 6.74 |
-| fg-faint-cyan | #35485e | 8.19 | 7.03 | 6.32 |
3.82 | 6.33 |
+| fg-faint-red | #750000 | 10.44 | 8.97 | 7.49 |
4.87 | 8.07 |
+| fg-faint-green | #056100 | 6.75 | 5.80 | 4.84 |
3.15 | 5.22 |
+| fg-faint-yellow | #5f4602 | 7.76 | 6.66 | 5.57 |
3.62 | 6.00 |
+| fg-faint-blue | #353362 | 10.18 | 8.74 | 7.30 |
4.75 | 7.87 |
+| fg-faint-magenta | #553372 | 8.72 | 7.49 | 6.26 |
4.07 | 6.74 |
+| fg-faint-cyan | #35485e | 8.19 | 7.03 | 5.87 |
3.82 | 6.33 |
#+TBLFM: $3='(Λ $2 @2$3);%.2f :: $4='(Λ $2 @2$4);%.2f :: $5='(Λ $2 @2$5);%.2f
:: $6='(Λ $2 @2$6);%.2f :: $7='(Λ $2 @2$7);%.2f
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #f7edf1 | #e5dde0 | #dfd0d9 |
#cc95b7 | #edcae5 |
+| Name | | #f7edf1 | #e5dde0 | #d7c9d0 |
#cc95b7 | #edcae5 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
| bg-main | #f7edf1 | 0 | 2591 | 6292 |
43766 | 5533 |
| bg-shadow-subtle | #e5dde0 | 2591 | 0 | 890 |
26336 | 1695 |
-| bg-neutral | #dfd0d9 | 6292 | 890 | 0 |
17584 | 1022 |
+| bg-neutral | #d7c9d0 | 10521 | 2728 | 556 |
12616 | 2351 |
| bg-shadow-intense | #cc95b7 | 43766 | 26336 | 17584 |
0 | 19021 |
| bg-accent | #edcae5 | 5533 | 1695 | 1022 |
19021 | 0 |
#+TBLFM: $3='(Δ $2 @2$3) :: $4='(Δ $2 @2$4) :: $5='(Δ $2 @2$5) :: $6='(Δ $2
@2$6) :: $7='(Δ $2 @2$7)
@@ -83,29 +84,30 @@ C1 and C2 are color values written in hexadecimal RGB."
:END:
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #f0eddf | #dfdfce | #d7d3c2 |
#c09fa0 | #e7d5b9 |
+| Name | | #f0eddf | #dfdfce | #d1ceb6 |
#c09fa0 | #e7d5b9 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-main | #30232e | 12.72 | 11.09 | 9.95 |
6.20 | 10.40 |
-| fg-shadow-subtle | #635650 | 6.01 | 5.23 | 4.70 |
2.92 | 4.91 |
-| fg-shadow-intense | #58383f | 8.71 | 7.59 | 6.81 |
4.24 | 7.12 |
-| fg-accent | #74321f | 8.06 | 7.02 | 6.30 |
3.93 | 6.59 |
+| fg-main | #30232e | 12.72 | 11.09 | 9.40 |
6.20 | 10.40 |
+| fg-shadow-subtle | #635650 | 6.01 | 5.23 | 4.44 |
2.92 | 4.91 |
+| fg-neutral | #604d48 | 6.74 | 5.88 | 4.98 |
3.28 | 5.51 |
+| fg-shadow-intense | #58383f | 8.71 | 7.59 | 6.44 |
4.24 | 7.12 |
+| fg-accent | #74321f | 8.06 | 7.02 | 5.96 |
3.93 | 6.59 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-faint-red | #750000 | 10.18 | 8.87 | 7.96 |
4.96 | 8.32 |
-| fg-faint-green | #056100 | 6.58 | 5.74 | 5.15 |
3.21 | 5.38 |
-| fg-faint-yellow | #5f4602 | 7.57 | 6.59 | 5.92 |
3.68 | 6.18 |
-| fg-faint-blue | #353362 | 9.93 | 8.65 | 7.76 |
4.83 | 8.11 |
-| fg-faint-magenta | #553372 | 8.51 | 7.41 | 6.65 |
4.14 | 6.95 |
-| fg-faint-cyan | #35485e | 7.98 | 6.96 | 6.24 |
3.89 | 6.53 |
+| fg-faint-red | #750000 | 10.18 | 8.87 | 7.52 |
4.96 | 8.32 |
+| fg-faint-green | #056100 | 6.58 | 5.74 | 4.87 |
3.21 | 5.38 |
+| fg-faint-yellow | #5f4602 | 7.57 | 6.59 | 5.59 |
3.68 | 6.18 |
+| fg-faint-blue | #353362 | 9.93 | 8.65 | 7.34 |
4.83 | 8.11 |
+| fg-faint-magenta | #553372 | 8.51 | 7.41 | 6.28 |
4.14 | 6.95 |
+| fg-faint-cyan | #35485e | 7.98 | 6.96 | 5.90 |
3.89 | 6.53 |
#+TBLFM: $3='(Λ $2 @2$3);%.2f :: $4='(Λ $2 @2$4);%.2f :: $5='(Λ $2 @2$5);%.2f
:: $6='(Λ $2 @2$6);%.2f :: $7='(Λ $2 @2$7);%.2f
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #f0eddf | #dfdfce | #d7d3c2 |
#c09fa0 | #e7d5b9 |
+| Name | | #f0eddf | #dfdfce | #d1ceb6 |
#c09fa0 | #e7d5b9 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| bg-main | #f0eddf | 0 | 2246 | 6333 |
39749 | 5582 |
-| bg-shadow-subtle | #dfdfce | 2246 | 0 | 1075 |
23899 | 1527 |
-| bg-neutral | #d7d3c2 | 6333 | 1075 | 0 |
14957 | 931 |
-| bg-shadow-intense | #c09fa0 | 39749 | 23899 | 14957 |
0 | 17459 |
-| bg-accent | #e7d5b9 | 5582 | 1527 | 931 |
17459 | 0 |
+| bg-main | #f0eddf | 0 | 2246 | 10254 |
39749 | 5582 |
+| bg-shadow-subtle | #dfdfce | 2246 | 0 | 2977 |
23899 | 1527 |
+| bg-neutral | #d1ceb6 | 10254 | 2977 | 0 |
10796 | 1613 |
+| bg-shadow-intense | #c09fa0 | 39749 | 23899 | 10796 |
0 | 17459 |
+| bg-accent | #e7d5b9 | 5582 | 1527 | 1613 |
17459 | 0 |
#+TBLFM: $3='(Δ $2 @2$3) :: $4='(Δ $2 @2$4) :: $5='(Δ $2 @2$5) :: $6='(Δ $2
@2$6) :: $7='(Δ $2 @2$7)
** Doric Light
@@ -114,27 +116,28 @@ C1 and C2 are color values written in hexadecimal RGB."
:END:
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #ffffff | #efeff2 | #e1e4e5 |
#a0bcd0 | #d8f1f3 |
+| Name | | #ffffff | #efeff2 | #dbdce1 |
#a0bcd0 | #d8f1f3 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-main | #000000 | 21.00 | 18.30 | 16.43 |
10.60 | 17.80 |
-| fg-shadow-subtle | #455058 | 8.26 | 7.20 | 6.47 |
4.17 | 7.00 |
-| fg-shadow-intense | #213067 | 12.48 | 10.87 | 9.76 |
6.30 | 10.57 |
-| fg-accent | #084092 | 9.73 | 8.48 | 7.61 |
4.91 | 8.24 |
+| fg-main | #000000 | 21.00 | 18.30 | 15.34 |
10.60 | 17.80 |
+| fg-shadow-subtle | #455058 | 8.26 | 7.20 | 6.03 |
4.17 | 7.00 |
+| fg-neutral | #4f5559 | 7.56 | 6.59 | 5.52 |
3.82 | 6.41 |
+| fg-shadow-intense | #213067 | 12.48 | 10.87 | 9.11 |
6.30 | 10.57 |
+| fg-accent | #084092 | 9.73 | 8.48 | 7.10 |
4.91 | 8.24 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-faint-red | #750000 | 11.96 | 10.42 | 9.35 |
6.03 | 10.13 |
-| fg-faint-green | #056100 | 7.73 | 6.74 | 6.05 |
3.90 | 6.55 |
-| fg-faint-yellow | #5f4602 | 8.89 | 7.74 | 6.95 |
4.48 | 7.53 |
-| fg-faint-blue | #353362 | 11.66 | 10.16 | 9.12 |
5.88 | 9.88 |
-| fg-faint-magenta | #553372 | 9.99 | 8.70 | 7.81 |
5.04 | 8.46 |
-| fg-faint-cyan | #35485e | 9.38 | 8.17 | 7.34 |
4.73 | 7.94 |
+| fg-faint-red | #750000 | 11.96 | 10.42 | 8.73 |
6.03 | 10.13 |
+| fg-faint-green | #056100 | 7.73 | 6.74 | 5.65 |
3.90 | 6.55 |
+| fg-faint-yellow | #5f4602 | 8.89 | 7.74 | 6.49 |
4.48 | 7.53 |
+| fg-faint-blue | #353362 | 11.66 | 10.16 | 8.51 |
5.88 | 9.88 |
+| fg-faint-magenta | #553372 | 9.99 | 8.70 | 7.29 |
5.04 | 8.46 |
+| fg-faint-cyan | #35485e | 9.38 | 8.17 | 6.85 |
4.73 | 7.94 |
#+TBLFM: $3='(Λ $2 @2$3);%.2f :: $4='(Λ $2 @2$4);%.2f :: $5='(Λ $2 @2$5);%.2f
:: $6='(Λ $2 @2$6);%.2f :: $7='(Λ $2 @2$7);%.2f
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #ffffff | #efeff2 | #e1e4e5 |
#a0bcd0 | #d8f1f3 |
+| Name | | #ffffff | #efeff2 | #dbdce1 |
#a0bcd0 | #d8f1f3 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
| bg-main | #ffffff | 0 | 2143 | 7009 |
48556 | 5572 |
| bg-shadow-subtle | #efeff2 | 2143 | 0 | 1418 |
30569 | 1560 |
-| bg-neutral | #e1e4e5 | 7009 | 1418 | 0 |
19178 | 1336 |
+| bg-neutral | #dbdce1 | 10642 | 3235 | 396 |
14408 | 2504 |
| bg-shadow-intense | #a0bcd0 | 48556 | 30569 | 19178 |
0 | 22768 |
| bg-accent | #d8f1f3 | 5572 | 1560 | 1336 |
22768 | 0 |
#+TBLFM: $3='(Δ $2 @2$3) :: $4='(Δ $2 @2$4) :: $5='(Δ $2 @2$5) :: $6='(Δ $2
@2$6) :: $7='(Δ $2 @2$7)
@@ -145,29 +148,30 @@ C1 and C2 are color values written in hexadecimal RGB."
:END:
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #ededed | #dfdfdf | #d5d5d5 |
#b0b0b0 | #e5d7c5 |
+| Name | | #ededed | #dfdfdf | #cdcdcd |
#b0b0b0 | #e5d7c5 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-main | #202020 | 13.92 | 12.23 | 11.10 |
7.51 | 11.53 |
-| fg-shadow-subtle | #595959 | 5.98 | 5.26 | 4.77 |
3.23 | 4.96 |
-| fg-shadow-intense | #404040 | 8.86 | 7.78 | 7.06 |
4.78 | 7.34 |
-| fg-accent | #603d3a | 8.06 | 7.08 | 6.43 |
4.35 | 6.67 |
+| fg-main | #202020 | 13.92 | 12.23 | 10.25 |
7.51 | 11.53 |
+| fg-shadow-subtle | #595959 | 5.98 | 5.26 | 4.41 |
3.23 | 4.96 |
+| fg-neutral | #505050 | 6.89 | 6.05 | 5.07 |
3.72 | 5.70 |
+| fg-shadow-intense | #404040 | 8.86 | 7.78 | 6.52 |
4.78 | 7.34 |
+| fg-accent | #603d3a | 8.06 | 7.08 | 5.93 |
4.35 | 6.67 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-faint-red | #750000 | 10.21 | 8.97 | 8.15 |
5.51 | 8.46 |
-| fg-faint-green | #056100 | 6.60 | 5.80 | 5.27 |
3.56 | 5.47 |
-| fg-faint-yellow | #5f4602 | 7.59 | 6.67 | 6.05 |
4.10 | 6.29 |
-| fg-faint-blue | #353362 | 9.96 | 8.75 | 7.94 |
5.38 | 8.25 |
-| fg-faint-magenta | #553372 | 8.53 | 7.49 | 6.80 |
4.60 | 7.07 |
-| fg-faint-cyan | #35485e | 8.01 | 7.04 | 6.39 |
4.32 | 6.63 |
+| fg-faint-red | #750000 | 10.21 | 8.97 | 7.52 |
5.51 | 8.46 |
+| fg-faint-green | #056100 | 6.60 | 5.80 | 4.86 |
3.56 | 5.47 |
+| fg-faint-yellow | #5f4602 | 7.59 | 6.67 | 5.59 |
4.10 | 6.29 |
+| fg-faint-blue | #353362 | 9.96 | 8.75 | 7.33 |
5.38 | 8.25 |
+| fg-faint-magenta | #553372 | 8.53 | 7.49 | 6.28 |
4.60 | 7.07 |
+| fg-faint-cyan | #35485e | 8.01 | 7.04 | 5.90 |
4.32 | 6.63 |
#+TBLFM: $3='(Λ $2 @2$3);%.2f :: $4='(Λ $2 @2$4);%.2f :: $5='(Λ $2 @2$5);%.2f
:: $6='(Λ $2 @2$6);%.2f :: $7='(Λ $2 @2$7);%.2f
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #ededed | #dfdfdf | #d5d5d5 |
#b0b0b0 | #e5d7c5 |
+| Name | | #ededed | #dfdfdf | #cdcdcd |
#b0b0b0 | #e5d7c5 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| bg-main | #ededed | 0 | 1777 | 5224 |
33751 | 5503 |
-| bg-shadow-subtle | #dfdfdf | 1777 | 0 | 907 |
20036 | 1802 |
-| bg-neutral | #d5d5d5 | 5224 | 907 | 0 |
12417 | 1306 |
-| bg-shadow-intense | #b0b0b0 | 33751 | 20036 | 12417 |
0 | 15022 |
-| bg-accent | #e5d7c5 | 5503 | 1802 | 1306 |
15022 | 0 |
+| bg-main | #ededed | 0 | 1777 | 9288 |
33751 | 5503 |
+| bg-shadow-subtle | #dfdfdf | 1777 | 0 | 2938 |
20036 | 1802 |
+| bg-neutral | #cdcdcd | 9288 | 2938 | 0 |
7628 | 2196 |
+| bg-shadow-intense | #b0b0b0 | 33751 | 20036 | 7628 |
0 | 15022 |
+| bg-accent | #e5d7c5 | 5503 | 1802 | 2196 |
15022 | 0 |
#+TBLFM: $3='(Δ $2 @2$3) :: $4='(Δ $2 @2$4) :: $5='(Δ $2 @2$5) :: $6='(Δ $2
@2$6) :: $7='(Δ $2 @2$7)
** Doric Wind
@@ -176,29 +180,30 @@ C1 and C2 are color values written in hexadecimal RGB."
:END:
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #e8f0e9 | #d8e4df | #ced9db |
#94c2bf | #c9e0ba |
+| Name | | #e8f0e9 | #d5e1d9 | #c2ced0 |
#94c2bf | #c9e0ba |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-main | #000f0f | 16.81 | 14.96 | 13.55 |
9.98 | 13.82 |
-| fg-shadow-subtle | #4c4f52 | 7.09 | 6.31 | 5.72 |
4.21 | 5.83 |
-| fg-shadow-intense | #104038 | 9.97 | 8.87 | 8.04 |
5.92 | 8.20 |
-| fg-accent | #3f5900 | 6.84 | 6.09 | 5.52 |
4.06 | 5.63 |
+| fg-main | #000f0f | 16.81 | 14.51 | 12.12 |
9.98 | 13.82 |
+| fg-shadow-subtle | #565962 | 6.02 | 5.20 | 4.34 |
3.57 | 4.95 |
+| fg-neutral | #4f4f58 | 6.97 | 6.02 | 5.03 |
4.14 | 5.73 |
+| fg-shadow-intense | #104038 | 9.97 | 8.61 | 7.19 |
5.92 | 8.20 |
+| fg-accent | #3f5900 | 6.84 | 5.91 | 4.94 |
4.06 | 5.63 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-faint-red | #750000 | 10.29 | 9.16 | 8.30 |
6.11 | 8.46 |
-| fg-faint-green | #006500 | 6.65 | 5.92 | 5.36 |
3.95 | 5.47 |
-| fg-faint-yellow | #5f4602 | 7.65 | 6.80 | 6.17 |
4.54 | 6.29 |
-| fg-faint-blue | #353362 | 10.03 | 8.93 | 8.09 |
5.96 | 8.25 |
-| fg-faint-magenta | #553372 | 8.59 | 7.65 | 6.93 |
5.10 | 7.06 |
-| fg-faint-cyan | #35485e | 8.07 | 7.18 | 6.51 |
4.79 | 6.63 |
+| fg-faint-red | #750000 | 10.29 | 8.88 | 7.42 |
6.11 | 8.46 |
+| fg-faint-green | #006500 | 6.32 | 5.45 | 4.55 |
3.75 | 5.19 |
+| fg-faint-yellow | #5f4602 | 7.65 | 6.60 | 5.51 |
4.54 | 6.29 |
+| fg-faint-blue | #353362 | 10.03 | 8.66 | 7.24 |
5.96 | 8.25 |
+| fg-faint-magenta | #553372 | 8.59 | 7.42 | 6.20 |
5.10 | 7.06 |
+| fg-faint-cyan | #35485e | 8.07 | 6.96 | 5.82 |
4.79 | 6.63 |
#+TBLFM: $3='(Λ $2 @2$3);%.2f :: $4='(Λ $2 @2$4);%.2f :: $5='(Λ $2 @2$5);%.2f
:: $6='(Λ $2 @2$6);%.2f :: $7='(Λ $2 @2$7);%.2f
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #e8f0e9 | #d8e4df | #ced9db |
#94c2bf | #c9e0ba |
+| Name | | #e8f0e9 | #d5e1d9 | #c2ced0 |
#94c2bf | #c9e0ba |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| bg-main | #e8f0e9 | 0 | 1536 | 4503 |
32059 | 8580 |
-| bg-shadow-subtle | #d8e4df | 1536 | 0 | 807 |
19666 | 3714 |
-| bg-neutral | #ced9db | 4503 | 807 | 0 |
13088 | 2684 |
-| bg-shadow-intense | #94c2bf | 32059 | 19666 | 13088 |
0 | 11285 |
-| bg-accent | #c7e2c1 | 7387 | 2818 | 1967 |
11163 | 136 |
+| bg-main | #e8f0e9 | 0 | 2501 | 10149 |
32059 | 8580 |
+| bg-shadow-subtle | #d5e1d9 | 2501 | 0 | 2653 |
16965 | 2531 |
+| bg-neutral | #c2ced0 | 10149 | 2653 | 0 |
6954 | 2528 |
+| bg-shadow-intense | #94c2bf | 32059 | 16965 | 6954 |
0 | 11285 |
+| bg-accent | #c7e2c1 | 7387 | 1831 | 2187 |
11163 | 136 |
#+TBLFM: $3='(Δ $2 @2$3) :: $4='(Δ $2 @2$4) :: $5='(Δ $2 @2$5) :: $6='(Δ $2
@2$6) :: $7='(Δ $2 @2$7)
* Dark themes
@@ -211,29 +216,30 @@ C1 and C2 are color values written in hexadecimal RGB."
:END:
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #000000 | #332d38 | #3c3843 |
#50447f | #521e40 |
+| Name | | #000000 | #332d38 | #43404c |
#50447f | #521e40 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-main | #ffffff | 21.00 | 13.35 | 11.42 |
8.49 | 12.97 |
-| fg-shadow-subtle | #a2a0b2 | 8.21 | 5.22 | 4.46 |
3.32 | 5.07 |
-| fg-shadow-intense | #cfcff8 | 13.93 | 8.86 | 7.58 |
5.63 | 8.61 |
-| fg-accent | #cda4df | 9.97 | 6.34 | 5.42 |
4.03 | 6.16 |
+| fg-main | #ffffff | 21.00 | 13.35 | 10.11 |
8.49 | 12.97 |
+| fg-shadow-subtle | #a2a0b2 | 8.21 | 5.22 | 3.95 |
3.32 | 5.07 |
+| fg-neutral | #aeabbc | 9.35 | 5.94 | 4.50 |
3.78 | 5.78 |
+| fg-shadow-intense | #cfcff8 | 13.93 | 8.86 | 6.71 |
5.63 | 8.61 |
+| fg-accent | #cda4df | 9.97 | 6.34 | 4.80 |
4.03 | 6.16 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-faint-red | #dba2a2 | 9.70 | 6.17 | 5.28 |
3.92 | 5.99 |
-| fg-faint-green | #85c397 | 10.25 | 6.52 | 5.57 |
4.14 | 6.33 |
-| fg-faint-yellow | #c4a992 | 9.44 | 6.00 | 5.13 |
3.81 | 5.83 |
-| fg-faint-blue | #95afd2 | 9.34 | 5.94 | 5.08 |
3.77 | 5.77 |
-| fg-faint-magenta | #c5a3b2 | 9.26 | 5.88 | 5.03 |
3.74 | 5.72 |
-| fg-faint-cyan | #a5bfce | 10.94 | 6.96 | 5.95 |
4.42 | 6.76 |
+| fg-faint-red | #dba2a2 | 9.70 | 6.17 | 4.67 |
3.92 | 5.99 |
+| fg-faint-green | #85c397 | 10.25 | 6.52 | 4.94 |
4.14 | 6.33 |
+| fg-faint-yellow | #c4a992 | 9.44 | 6.00 | 4.55 |
3.81 | 5.83 |
+| fg-faint-blue | #95afd2 | 9.34 | 5.94 | 4.50 |
3.77 | 5.77 |
+| fg-faint-magenta | #c5a3b2 | 9.26 | 5.88 | 4.46 |
3.74 | 5.72 |
+| fg-faint-cyan | #a5bfce | 10.94 | 6.96 | 5.27 |
4.42 | 6.76 |
#+TBLFM: $3='(Λ $2 @2$3);%.2f :: $4='(Λ $2 @2$4);%.2f :: $5='(Λ $2 @2$5);%.2f
:: $6='(Λ $2 @2$6);%.2f :: $7='(Λ $2 @2$7);%.2f
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #000000 | #332d38 | #3c3843 |
#50447f | #521e40 |
+| Name | | #000000 | #332d38 | #43404c |
#50447f | #521e40 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| bg-main | #000000 | 0 | 22833 | 33365 |
78768 | 29991 |
-| bg-shadow-subtle | #332d38 | 22833 | 0 | 1008 |
17981 | 3273 |
-| bg-neutral | #3c3843 | 33365 | 1008 | 0 |
11385 | 3861 |
-| bg-shadow-intense | #50447f | 78768 | 17981 | 11385 |
0 | 16560 |
-| bg-accent | #521e40 | 29991 | 3273 | 3861 |
16560 | 0 |
+| bg-main | #000000 | 0 | 22833 | 42853 |
78768 | 29991 |
+| bg-shadow-subtle | #332d38 | 22833 | 0 | 3147 |
17981 | 3273 |
+| bg-neutral | #43404c | 42853 | 3147 | 0 |
7562 | 5572 |
+| bg-shadow-intense | #50447f | 78768 | 17981 | 7562 |
0 | 16560 |
+| bg-accent | #521e40 | 29991 | 3273 | 5572 |
16560 | 0 |
#+TBLFM: $3='(Δ $2 @2$3) :: $4='(Δ $2 @2$4) :: $5='(Δ $2 @2$5) :: $6='(Δ $2
@2$6) :: $7='(Δ $2 @2$7)
** Doric Fire
@@ -242,29 +248,30 @@ C1 and C2 are color values written in hexadecimal RGB."
:END:
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #2a281d | #40332f | #493c37 |
#601a2f | #52402f |
+| Name | | #2a281d | #40332f | #4f4542 |
#601a2f | #52402f |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-main | #f0e5e0 | 11.97 | 9.81 | 8.56 |
10.08 | 7.96 |
-| fg-shadow-subtle | #afa497 | 6.04 | 4.95 | 4.32 |
5.09 | 4.02 |
-| fg-shadow-intense | #e2b0a4 | 7.73 | 6.34 | 5.53 |
6.51 | 5.15 |
-| fg-accent | #e6a577 | 7.05 | 5.78 | 5.04 |
5.94 | 4.69 |
+| fg-main | #f0e5e0 | 11.97 | 9.81 | 7.51 |
10.08 | 7.96 |
+| fg-shadow-subtle | #afa497 | 6.04 | 4.95 | 3.79 |
5.09 | 4.02 |
+| fg-neutral | #bfb4a7 | 7.26 | 5.95 | 4.55 |
6.11 | 4.83 |
+| fg-shadow-intense | #e2b0a4 | 7.73 | 6.34 | 4.85 |
6.51 | 5.15 |
+| fg-accent | #e6a577 | 7.05 | 5.78 | 4.43 |
5.94 | 4.69 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| fg-faint-red | #d09090 | 5.69 | 4.66 | 4.07 |
4.79 | 3.78 |
-| fg-faint-green | #85c397 | 7.22 | 5.92 | 5.16 |
6.08 | 4.81 |
-| fg-faint-yellow | #c4a992 | 6.65 | 5.45 | 4.75 |
5.60 | 4.42 |
-| fg-faint-blue | #95afd2 | 6.58 | 5.39 | 4.71 |
5.54 | 4.38 |
-| fg-faint-magenta | #c5a3b2 | 6.52 | 5.34 | 4.66 |
5.49 | 4.34 |
-| fg-faint-cyan | #a5bfce | 7.71 | 6.32 | 5.51 |
6.49 | 5.13 |
+| fg-faint-red | #d09090 | 5.69 | 4.66 | 3.57 |
4.79 | 3.78 |
+| fg-faint-green | #85c397 | 7.22 | 5.92 | 4.53 |
6.08 | 4.81 |
+| fg-faint-yellow | #c4a992 | 6.65 | 5.45 | 4.17 |
5.60 | 4.42 |
+| fg-faint-blue | #95afd2 | 6.58 | 5.39 | 4.13 |
5.54 | 4.38 |
+| fg-faint-magenta | #c5a3b2 | 6.52 | 5.34 | 4.09 |
5.49 | 4.34 |
+| fg-faint-cyan | #a5bfce | 7.71 | 6.32 | 4.84 |
6.49 | 5.13 |
#+TBLFM: $3='(Λ $2 @2$3);%.2f :: $4='(Λ $2 @2$4);%.2f :: $5='(Λ $2 @2$5);%.2f
:: $6='(Λ $2 @2$6);%.2f :: $7='(Λ $2 @2$7);%.2f
| | | bg-main | bg-shadow-subtle | bg-neutral |
bg-shadow-intense | bg-accent |
-| Name | | #2a281d | #40332f | #493c37 |
#601a2f | #52402f |
+| Name | | #2a281d | #40332f | #4f4542 |
#601a2f | #52402f |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
-| bg-main | #2a281d | 0 | 2476 | 5658 |
8354 | 6839 |
-| bg-shadow-subtle | #40332f | 2476 | 0 | 687 |
4907 | 1427 |
-| bg-neutral | #493c37 | 5658 | 687 | 0 |
6075 | 426 |
-| bg-shadow-intense | #601a2f | 8354 | 4907 | 6075 |
0 | 6285 |
-| bg-accent | #52402f | 6839 | 1427 | 426 |
6285 | 0 |
+| bg-main | #2a281d | 0 | 2476 | 10288 |
8354 | 6839 |
+| bg-shadow-subtle | #40332f | 2476 | 0 | 2812 |
4907 | 1427 |
+| bg-neutral | #4f4542 | 10288 | 2812 | 0 |
9102 | 1098 |
+| bg-shadow-intense | #601a2f | 8354 | 4907 | 9102 |
0 | 6285 |
+| bg-accent | #52402f | 6839 | 1427 | 1098 |
6285 | 0 |
#+TBLFM: $3='(Δ $2 @2$3) :: $4='(Δ $2 @2$4) :: $5='(Δ $2 @2$5) :: $6='(Δ $2
@2$6) :: $7='(Δ $2 @2$7)
** Doric Obsidian
@@ -277,6 +284,7 @@ C1 and C2 are color values written in hexadecimal RGB."
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
| fg-main | #e7e7e7 | 14.36 | 10.83 | 9.20 |
6.52 | 10.12 |
| fg-shadow-subtle | #969696 | 6.00 | 4.53 | 3.85 |
2.73 | 4.23 |
+| fg-neutral | #a6a6a6 | 7.29 | 5.50 | 4.67 |
3.31 | 5.14 |
| fg-shadow-intense | #b0b0b0 | 8.19 | 6.17 | 5.24 |
3.72 | 5.77 |
| fg-accent | #b59487 | 6.38 | 4.81 | 4.09 |
2.90 | 4.50 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
@@ -308,6 +316,7 @@ C1 and C2 are color values written in hexadecimal RGB."
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
| fg-main | #e2d7e7 | 12.14 | 9.46 | 7.62 |
6.13 | 9.46 |
| fg-shadow-subtle | #a694b1 | 6.02 | 4.69 | 3.78 |
3.04 | 4.69 |
+| fg-neutral | #b3b1be | 7.99 | 6.23 | 5.02 |
4.03 | 6.23 |
| fg-shadow-intense | #cea6d0 | 8.03 | 6.25 | 5.04 |
4.05 | 6.26 |
| fg-accent | #c586ba | 6.02 | 4.69 | 3.78 |
3.04 | 4.69 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
@@ -339,6 +348,7 @@ C1 and C2 are color values written in hexadecimal RGB."
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
| fg-main | #edf0f8 | 12.54 | 9.54 | 7.56 |
5.58 | 8.43 |
| fg-shadow-subtle | #aea6b8 | 6.09 | 4.63 | 3.67 |
2.71 | 4.09 |
+| fg-neutral | #c3c4c8 | 8.20 | 6.24 | 4.95 |
3.65 | 5.51 |
| fg-shadow-intense | #c0ddf2 | 10.12 | 7.70 | 6.10 |
4.50 | 6.80 |
| fg-accent | #adade0 | 6.69 | 5.09 | 4.04 |
2.98 | 4.50 |
|-------------------+---------+---------+------------------+------------+-------------------+-----------|
diff --git a/doric-cherry-theme.el b/doric-cherry-theme.el
index 0df912b0dc..c45af718f2 100644
--- a/doric-cherry-theme.el
+++ b/doric-cherry-theme.el
@@ -50,7 +50,8 @@
(bg-shadow-subtle "#e5dde0")
(fg-shadow-subtle "#675462")
- (bg-neutral "#dfd0d9")
+ (bg-neutral "#d7c9d0")
+ (fg-neutral "#5a4c5f")
(bg-shadow-intense "#cc95b7")
(fg-shadow-intense "#683455")
diff --git a/doric-dark-theme.el b/doric-dark-theme.el
index 963924e01d..d6ecf50c62 100644
--- a/doric-dark-theme.el
+++ b/doric-dark-theme.el
@@ -50,7 +50,8 @@
(bg-shadow-subtle "#332d38")
(fg-shadow-subtle "#a2a0b2")
- (bg-neutral "#3c3843")
+ (bg-neutral "#43404c")
+ (fg-neutral "#aeabbc")
(bg-shadow-intense "#50447f")
(fg-shadow-intense "#cfcff8")
diff --git a/doric-earth-theme.el b/doric-earth-theme.el
index dfe76261a4..80968d4349 100644
--- a/doric-earth-theme.el
+++ b/doric-earth-theme.el
@@ -50,7 +50,8 @@
(bg-shadow-subtle "#dfdfce")
(fg-shadow-subtle "#635650")
- (bg-neutral "#d7d3c2")
+ (bg-neutral "#d1ceb6")
+ (fg-neutral "#604d48")
(bg-shadow-intense "#c09fa0")
(fg-shadow-intense "#58383f")
diff --git a/doric-fire-theme.el b/doric-fire-theme.el
index 39592f6ab0..84b9b801ec 100644
--- a/doric-fire-theme.el
+++ b/doric-fire-theme.el
@@ -50,7 +50,8 @@
(bg-shadow-subtle "#40332f")
(fg-shadow-subtle "#afa497")
- (bg-neutral "#493c37")
+ (bg-neutral "#4f4542")
+ (fg-neutral "#bfb4a7")
(bg-shadow-intense "#601a2f")
(fg-shadow-intense "#e2b0a4")
diff --git a/doric-light-theme.el b/doric-light-theme.el
index f6f3d5cc11..5f0590ac79 100644
--- a/doric-light-theme.el
+++ b/doric-light-theme.el
@@ -50,7 +50,8 @@
(bg-shadow-subtle "#efeff2")
(fg-shadow-subtle "#455058")
- (bg-neutral "#e1e4e5")
+ (bg-neutral "#dbdce1")
+ (fg-neutral "#4f5559")
(bg-shadow-intense "#a0bcd0")
(fg-shadow-intense "#213067")
diff --git a/doric-marble-theme.el b/doric-marble-theme.el
index 385fdeb8a6..e0d05559e5 100644
--- a/doric-marble-theme.el
+++ b/doric-marble-theme.el
@@ -50,7 +50,8 @@
(bg-shadow-subtle "#dfdfdf")
(fg-shadow-subtle "#595959")
- (bg-neutral "#d5d5d5")
+ (bg-neutral "#cdcdcd")
+ (fg-neutral "#505050")
(bg-shadow-intense "#b0b0b0")
(fg-shadow-intense "#404040")
diff --git a/doric-obsidian-theme.el b/doric-obsidian-theme.el
index 3bd0512b41..15308b4735 100644
--- a/doric-obsidian-theme.el
+++ b/doric-obsidian-theme.el
@@ -51,6 +51,7 @@
(fg-shadow-subtle "#969696")
(bg-neutral "#3a3a3a")
+ (fg-neutral "#a6a6a6")
(bg-shadow-intense "#505050")
(fg-shadow-intense "#b0b0b0")
diff --git a/doric-plum-theme.el b/doric-plum-theme.el
index 92fbe5bb44..93c22a48cb 100644
--- a/doric-plum-theme.el
+++ b/doric-plum-theme.el
@@ -51,6 +51,7 @@
(fg-shadow-subtle "#a694b1")
(bg-neutral "#423b53")
+ (fg-neutral "#b3b1be")
(bg-shadow-intense "#5e4170")
(fg-shadow-intense "#cea6d0")
diff --git a/doric-themes.el b/doric-themes.el
index 6df07d4a7a..3b481bf11d 100644
--- a/doric-themes.el
+++ b/doric-themes.el
@@ -400,7 +400,6 @@ Run `doric-themes-after-load-theme-hook' after loading a
theme."
header-line
magit-blame-heading
magit-blame-margin
- markdown-blockquote-face
match
menu
mu4e-region-code
@@ -1112,6 +1111,7 @@ Run `doric-themes-after-load-theme-hook' after loading a
theme."
magit-signature-revoked
magit-signature-untrusted
magit-mode-line-process-error
+ markdown-blockquote-face
markdown-inline-code-face
message-cited-text-1
message-cited-text-2
@@ -1432,7 +1432,7 @@ Run `doric-themes-after-load-theme-hook' after loading a
theme."
`(magit-section-highlight (( )))
`(markdown-code-face ((t :inherit fixed-pitch :background
,bg-shadow-subtle :extend t)))
- `(markdown-language-keyword-face ((t :inherit fixed-pitch
:background ,bg-neutral)))
+ `(markdown-language-keyword-face ((t :inherit fixed-pitch
:background ,bg-neutral :foreground ,fg-neutral)))
'(markdown-table-face ((t :inherit fixed-pitch)))
'(markup-meta-face ((t :inherit fixed-pitch)))
@@ -1457,7 +1457,7 @@ Run `doric-themes-after-load-theme-hook' after loading a
theme."
:overline ,fg-shadow-subtle)))
`(org-block ((t :inherit fixed-pitch :background ,bg-shadow-subtle
:extend t)))
- `(org-block-begin-line ((t :inherit fixed-pitch :background
,bg-neutral :foreground ,fg-shadow-intense :extend t)))
+ `(org-block-begin-line ((t :inherit fixed-pitch :background
,bg-neutral :foreground ,fg-neutral :extend t)))
`(org-block-end-line ((t :inherit org-block-begin-line)))
'(org-checkbox ((t :inherit fixed-pitch)))
`(org-column-title ((t :inherit fixed-pitch :foreground
,fg-shadow-subtle)))
@@ -1484,11 +1484,11 @@ Run `doric-themes-after-load-theme-hook' after loading
a theme."
`(spacious-padding-subtle-mode-line-inactive ((t :foreground
,bg-accent)))
`(tab-bar-tab ((t :inherit bold :background ,bg-main :foreground
,fg-main)))
- `(tab-bar-tab-inactive ((t :background ,bg-neutral :foreground
,fg-shadow-subtle)))
+ `(tab-bar-tab-inactive ((t :background ,bg-neutral :foreground
,fg-neutral)))
`(tab-line-tab ((t :inherit tab-line-tab-current)))
`(tab-line-tab-current ((t :inherit bold :background ,bg-main
:foreground ,fg-main)))
- `(tab-line-tab-inactive ((t :background ,bg-neutral :foreground
,fg-shadow-subtle)))
+ `(tab-line-tab-inactive ((t :background ,bg-neutral :foreground
,fg-neutral)))
`(tab-line-tab-inactive-alternate ((t :inherit
tab-line-tab-inactive)))
'(telega-webpage-fixed ((t :inherit fixed-pitch)))
diff --git a/doric-water-theme.el b/doric-water-theme.el
index 62b2217386..19b859275a 100644
--- a/doric-water-theme.el
+++ b/doric-water-theme.el
@@ -51,6 +51,7 @@
(fg-shadow-subtle "#aea6b8")
(bg-neutral "#4a4a5f")
+ (fg-neutral "##c3c4c8")
(bg-shadow-intense "#496278")
(fg-shadow-intense "#c0ddf2")
diff --git a/doric-wind-theme.el b/doric-wind-theme.el
index 56b2c22253..8d48730e14 100644
--- a/doric-wind-theme.el
+++ b/doric-wind-theme.el
@@ -47,10 +47,11 @@
(fg-main "#000f0f")
(border "#98a09a")
- (bg-shadow-subtle "#d8e4df")
- (fg-shadow-subtle "#4c4f52")
+ (bg-shadow-subtle "#d5e1d9")
+ (fg-shadow-subtle "#565962")
- (bg-neutral "#ced9db")
+ (bg-neutral "#c2ced0")
+ (fg-neutral "#404248")
(bg-shadow-intense "#94c2bf")
(fg-shadow-intense "#104038")
