Update codemirror

deps/shui/shui-graph/pages/contents.md

@@ -20,10 +20,12 @@
 	- We want to make it easy to customize with themes
 	- We want to support as much old themes as possible
 	- var(--shui-button-color,
+	  collapsed:: true
 		- var(--logseq-button-primary-color,
+		  collapsed:: true
 			- var(--lx-color-6)))
 	- light and dark variants
-	- ```
+	- ```css
 	  :root {
 	    --lx-blue-1: #123456;
 	  }

resources/css/codemirror.lsradix.css

@@ -0,0 +1,173 @@
+/*
+lsradix theme for code-mirror
+http://ethanschoonover.com/lsradix
+*/
+
+/*
+lsradix color palette
+http://ethanschoonover.com/lsradix/img/lsradix-palette.png
+*/
+
+.lsradix.base03        { color: or(--lx-gray-01, #002b36); }
+.dark .lsradix.base03  { color: or(--lx-gray-02, #002b36); }
+.lsradix.base02        { color: or(--lx-gray-02, #073642); }
+.dark .lsradix.base02  { color: or(--lx-gray-01, #073642); }
+.lsradix.base01        { color: or(--lx-gray-03, #586e75); }
+.lsradix.base00        { color: or(--lx-gray-04, #657b83); }
+.lsradix.base0         { color: or(--lx-gray-09, #839496); }
+.lsradix.base1         { color: or(--lx-gray-10, #93a1a1); }
+.lsradix.base2         { color: or(--lx-gray-11, #eee8d5); }
+.lsradix.base3         { color: or(--lx-gray-12, #fdf6e3); }
+.lsradix.solar-yellow  { color: or(--rx-yellow-11, #b58900); }
+.lsradix.solar-orange  { color: or(--rx-orange-11, #cb4b16); }
+.lsradix.solar-red     { color: or(--rx-red-11, #dc322f); }
+.lsradix.solar-magenta { color: or(--rx-pink-11, #d33682); }
+.lsradix.solar-violet  { color: or(--rx-purple-11, #6c71c4); }
+.lsradix.solar-blue    { color: or(--rx-blue-11, #268bd2); }
+.lsradix.solar-cyan    { color: or(--rx-sky-11, #2aa198); }
+.lsradix.solar-green   { color: or(--rx-grass-11, #859900); }
+
+/* Color scheme for code-mirror */
+
+.cm-s-lsradix {
+  line-height: 1.45em;
+  color-profile: sRGB;
+  rendering-intent: auto;
+}
+.cm-s-lsradix.cm-s-dark {
+  /* color: or(--lx-gray-09, #839496); */
+  color: or(--lx-gray-11, #839496);
+  background-color: or(--lx-gray-01, #002b36);
+  text-shadow: #002b36 0 1px;
+}
+
+.dark .cm-s-lsradix.cm-s-dark {
+  background-color: or(--lx-gray-02, #002b36);
+}
+
+.cm-s-lsradix.cm-s-light {
+  /* background-color: or(--lx-gray-12, #fdf6e3); */
+  background-color: or(--lx-gray-11, #fdf6e3);
+  color: or(--lx-gray-01, #657b83);
+  text-shadow: #eee8d5 0 1px;
+}
+
+.cm-s-lsradix .CodeMirror-widget {
+  text-shadow: none;
+}
+
+.cm-s-lsradix .cm-header { color: or(--lx-gray-03, #586e75); }
+.cm-s-lsradix .cm-quote { color: or(--lx-gray-10, #93a1a1); }
+
+.cm-s-lsradix .cm-keyword { color: or(--rx-orange-11, #cb4b16); }
+.cm-s-lsradix .cm-atom { color: or(--rx-pink-11, #d33682); }
+.cm-s-lsradix .cm-number { color: or(--rx-pink-11, #d33682); }
+.cm-s-lsradix .cm-def { color: or(--rx-sky-11, #2aa198); }
+
+/* .cm-s-lsradix .cm-variable { color: or(--lx-gray-09, #839496); } */
+.cm-s-lsradix .cm-variable { color: or(--lx-gray-10, #839496); }
+.cm-s-lsradix .cm-variable-2 { color: or(--rx-yellow-11, #b58900); }
+.cm-s-lsradix .cm-variable-3, .cm-s-lsradix .cm-type { color: or(--rx-purple-11, #6c71c4); }
+
+.cm-s-lsradix .cm-property { color: or(--rx-sky-11, #2aa198); }
+.cm-s-lsradix .cm-operator { color: or(--rx-purple-11, #6c71c4); }
+
+.cm-s-lsradix .cm-comment { color: or(--lx-gray-03, #586e75); font-style:italic; }
+
+.cm-s-lsradix .cm-string { color: or(--rx-grass-11, #859900); }
+.cm-s-lsradix .cm-string-2 { color: or(--rx-yellow-11, #b58900); }
+
+.cm-s-lsradix .cm-meta { color: or(--rx-grass-11, #859900); }
+.cm-s-lsradix .cm-qualifier { color: or(--rx-yellow-11, #b58900); }
+.cm-s-lsradix .cm-builtin { color: or(--rx-pink-11, #d33682); }
+.cm-s-lsradix .cm-bracket { color: or(--rx-orange-11, #cb4b16); }
+.cm-s-lsradix .CodeMirror-matchingbracket { color: or(--rx-grass-11, #859900); }
+.cm-s-lsradix .CodeMirror-nonmatchingbracket { color: or(--rx-red-11, #dc322f); }
+.cm-s-lsradix .cm-tag { color: or(--lx-gray-10, #93a1a1); }
+.cm-s-lsradix .cm-attribute { color: or(--rx-sky-11, #2aa198); }
+.cm-s-lsradix .cm-hr {
+  color: transparent;
+  border-top: 1px solid or(--lx-gray-03, #586e75);
+  display: block;
+}
+.cm-s-lsradix .cm-link { color: or(--lx-gray-10, #93a1a1); cursor: pointer; }
+.cm-s-lsradix .cm-special { color: or(--rx-purple-11, #6c71c4); }
+.cm-s-lsradix .cm-em {
+  color: #999;
+  text-decoration: underline;
+  text-decoration-style: dotted;
+}
+.cm-s-lsradix .cm-error,
+.cm-s-lsradix .cm-invalidchar {
+  /* color: or(--lx-gray-03, #586e75); */
+  color: or(--lx-gray-10, #586e75);
+  border-bottom: 1px dotted or(--rx-red-11, #dc322f);
+}
+
+.cm-s-lsradix.cm-s-dark div.CodeMirror-selected { background: or(--lx-gray-02, #073642); }
+.cm-s-lsradix.cm-s-dark.CodeMirror ::selection { background: rgba(7, 54, 66, 0.99); }
+.cm-s-lsradix.cm-s-dark .CodeMirror-line::-moz-selection, .cm-s-dark .CodeMirror-line > span::-moz-selection, .cm-s-dark .CodeMirror-line > span > span::-moz-selection { background: rgba(7, 54, 66, 0.99); }
+
+.cm-s-lsradix.cm-s-light div.CodeMirror-selected { background: or(--lx-gray-11, #eee8d5); }
+.cm-s-lsradix.cm-s-light .CodeMirror-line::selection, .cm-s-light .CodeMirror-line > span::selection, .cm-s-light .CodeMirror-line > span > span::selection { background: or(--lx-gray-11, #eee8d5); }
+.cm-s-lsradix.cm-s-light .CodeMirror-line::-moz-selection, .cm-s-light .CodeMirror-line > span::-moz-selection, .cm-s-light .CodeMirror-line > span > span::-moz-selection { background: or(--lx-gray-11, #eee8d5); }
+
+/* Editor styling */
+
+
+/* Remove gutter border */
+.cm-s-lsradix .CodeMirror-gutters {
+  border-right: 0;
+}
+
+/* Gutter colors and line number styling based of color scheme (dark / light) */
+
+/* Dark */
+.cm-s-lsradix.cm-s-dark .CodeMirror-gutters {
+  background-color: or(--lx-gray-01, #073642);
+}
+
+.cm-s-lsradix.cm-s-dark .CodeMirror-linenumber {
+  color: or(--lx-gray-09, #586e75);
+  /* color: or(--lx-gray-03, #586e75); */
+  text-shadow: #021014 0 -1px;
+}
+
+/* Light */
+.cm-s-lsradix.cm-s-light .CodeMirror-gutters {
+  background-color: or(--lx-gray-02, #eee8d5);
+  /* background-color: or(--lx-gray-11, #eee8d5); */
+}
+
+.cm-s-lsradix.cm-s-light .CodeMirror-linenumber {
+  color: or(--lx-gray-09, #839496);
+}
+
+/* Common */
+.cm-s-lsradix .CodeMirror-linenumber {
+  padding: 0 5px;
+}
+.cm-s-lsradix .CodeMirror-guttermarker-subtle { color: or(--lx-gray-03, #586e75); }
+.cm-s-lsradix.cm-s-dark .CodeMirror-guttermarker { color: #ddd; }
+.cm-s-lsradix.cm-s-light .CodeMirror-guttermarker { color: or(--rx-orange-11, #cb4b16); }
+
+.cm-s-lsradix .CodeMirror-gutter .CodeMirror-gutter-text {
+  color: or(--lx-gray-03, #586e75);
+}
+
+/* Cursor */
+.cm-s-lsradix .CodeMirror-cursor { border-left: 1px solid #819090; }
+
+/* Fat cursor */
+.cm-s-lsradix.cm-s-light.cm-fat-cursor .CodeMirror-cursor { background: #77ee77; }
+.cm-s-lsradix.cm-s-light .cm-animate-fat-cursor { background-color: #77ee77; }
+.cm-s-lsradix.cm-s-dark.cm-fat-cursor .CodeMirror-cursor { background: or(--lx-gray-03, #586e75); }
+.cm-s-lsradix.cm-s-dark .cm-animate-fat-cursor { background-color: or(--lx-gray-03, #586e75); }
+
+/* Active line */
+.cm-s-lsradix.cm-s-dark .CodeMirror-activeline-background {
+  background: rgba(255, 255, 255, 0.06);
+}
+.cm-s-lsradix.cm-s-light .CodeMirror-activeline-background {
+  background: rgba(0, 0, 0, 0.06);
+}

resources/css/radix.css

@@ -1,5 +1,4 @@
 :root {
-  --rx-test: orange;
   --rx-amber-01: hsl(39, 70.0%, 99.0%);
   --rx-amber-02: hsl(40, 100%, 96.5%);
   --rx-amber-03: hsl(44, 100%, 91.7%);
@@ -339,30 +338,18 @@
 } 
 
 :root {
-  --rx-amber-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-amber-01-alpha: hsla(40, 94.9%, 38.7%, 0.016);
-  --rx-amber-02-alpha: hsla(31, 100%, 49.7%, 0.036);
   --rx-amber-02-alpha: hsla(40, 100%, 50.3%, 0.071);
-  --rx-amber-03-alpha: hsla(27, 100%, 49.9%, 0.094);
   --rx-amber-03-alpha: hsla(44, 100%, 50.1%, 0.165);
-  --rx-amber-04-alpha: hsla(29, 100%, 50.0%, 0.143);
   --rx-amber-04-alpha: hsla(43, 100%, 50.0%, 0.263);
-  --rx-amber-05-alpha: hsla(31, 100%, 50.0%, 0.192);
   --rx-amber-05-alpha: hsla(42, 100%, 50.0%, 0.365);
-  --rx-amber-06-alpha: hsla(35, 100%, 50.0%, 0.250);
   --rx-amber-06-alpha: hsla(38, 100%, 50.1%, 0.475);
-  --rx-amber-07-alpha: hsla(34, 99.6%, 52.9%, 0.331);
   --rx-amber-07-alpha: hsla(36, 99.9%, 46.2%, 0.612);
   --rx-amber-08-alpha: hsla(35, 99.8%, 46.0%, 0.832);
-  --rx-amber-08-alpha: hsla(36, 100%, 50.0%, 0.442);
   --rx-amber-09-alpha: hsla(39, 100%, 50.0%, 0.859);
-  --rx-amber-09-alpha: hsla(40, 100%, 57.2%, 0.980);
   --rx-amber-10-alpha: hsla(35, 100%, 50.0%, 0.891);
-  --rx-amber-10-alpha: hsla(44, 100%, 64.2%, 0.980);
   --rx-amber-11-alpha: hsla(29, 100%, 33.6%, 0.980);
-  --rx-amber-11-alpha: hsla(39, 99.9%, 52.7%, 0.938);
   --rx-amber-12-alpha: hsla(20, 99.8%, 14.1%, 0.965);
-  --rx-amber-12-alpha: hsla(45, 100%, 94.2%, 0.980);
   --rx-black-01-alpha: hsla(0, 0%, 0%, 0.012);
   --rx-black-02-alpha: hsla(0, 0%, 0%, 0.027);
   --rx-black-03-alpha: hsla(0, 0%, 0%, 0.047);
@@ -375,629 +362,317 @@
   --rx-black-10-alpha: hsla(0, 0%, 0%, 0.478);
   --rx-black-11-alpha: hsla(0, 0%, 0%, 0.565);
   --rx-black-12-alpha: hsla(0, 0%, 0%, 0.910);
-  --rx-blue-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-blue-01-alpha: hsla(210, 100%, 51.0%, 0.016);
   --rx-blue-02-alpha: hsla(210, 100%, 51.0%, 0.040);
-  --rx-blue-02-alpha: hsla(221, 97.8%, 52.4%, 0.059);
   --rx-blue-03-alpha: hsla(210, 100%, 50.3%, 0.071);
-  --rx-blue-03-alpha: hsla(215, 99.3%, 54.2%, 0.135);
   --rx-blue-04-alpha: hsla(210, 100%, 50.1%, 0.118);
-  --rx-blue-04-alpha: hsla(215, 99.3%, 53.8%, 0.198);
   --rx-blue-05-alpha: hsla(208, 99.1%, 47.1%, 0.189);
-  --rx-blue-05-alpha: hsla(213, 99.4%, 52.8%, 0.252);
   --rx-blue-06-alpha: hsla(209, 99.5%, 45.3%, 0.283);
-  --rx-blue-06-alpha: hsla(212, 99.9%, 51.7%, 0.323);
   --rx-blue-07-alpha: hsla(208, 99.9%, 43.8%, 0.412);
-  --rx-blue-07-alpha: hsla(211, 100%, 50.7%, 0.435);
   --rx-blue-08-alpha: hsla(206, 99.8%, 45.1%, 0.632);
-  --rx-blue-08-alpha: hsla(211, 99.8%, 50.9%, 0.597);
-  --rx-blue-09-alpha: hsla(205, 100%, 50.0%, 0.980);
   --rx-blue-09-alpha: hsla(206, 100%, 50.0%, 0.980);
   --rx-blue-10-alpha: hsla(208, 100%, 47.2%, 0.980);
-  --rx-blue-10-alpha: hsla(208, 100%, 60.7%, 0.980);
-  --rx-blue-11-alpha: hsla(209, 100%, 66.3%, 0.980);
   --rx-blue-11-alpha: hsla(212, 100%, 43.0%, 0.980);
-  --rx-blue-12-alpha: hsla(196, 100%, 96.8%, 0.980);
   --rx-blue-12-alpha: hsla(213, 100%, 14.4%, 0.980);
-  --rx-bronze-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-bronze-01-alpha: hsla(0, 89.3%, 18.3%, 0.012);
   --rx-bronze-02-alpha: hsla(17, 95.1%, 40.1%, 0.036);
-  --rx-bronze-02-alpha: hsla(20, 88.2%, 74.2%, 0.027);
-  --rx-bronze-03-alpha: hsla(10, 99.4%, 83.0%, 0.074);
   --rx-bronze-03-alpha: hsla(18, 98.3%, 29.8%, 0.067);
   --rx-bronze-04-alpha: hsla(17, 99.6%, 26.0%, 0.106);
-  --rx-bronze-04-alpha: hsla(18, 96.0%, 81.1%, 0.114);
-  --rx-bronze-05-alpha: hsla(18, 99.4%, 81.7%, 0.148);
   --rx-bronze-05-alpha: hsla(19, 99.6%, 23.8%, 0.157);
-  --rx-bronze-06-alpha: hsla(15, 98.1%, 82.4%, 0.192);
   --rx-bronze-06-alpha: hsla(17, 99.2%, 22.5%, 0.220);
-  --rx-bronze-07-alpha: hsla(16, 99.2%, 82.9%, 0.270);
   --rx-bronze-07-alpha: hsla(18, 99.7%, 21.6%, 0.310);
   --rx-bronze-08-alpha: hsla(17, 99.5%, 20.2%, 0.420);
-  --rx-bronze-08-alpha: hsla(18, 99.5%, 82.6%, 0.396);
-  --rx-bronze-09-alpha: hsla(18, 99.3%, 85.0%, 0.592);
   --rx-bronze-09-alpha: hsla(18, 99.9%, 16.7%, 0.553);
   --rx-bronze-10-alpha: hsla(17, 99.2%, 15.4%, 0.589);
-  --rx-bronze-10-alpha: hsla(18, 99.6%, 85.2%, 0.657);
   --rx-bronze-11-alpha: hsla(15, 99.9%, 13.2%, 0.655);
-  --rx-bronze-11-alpha: hsla(17, 99.9%, 86.1%, 0.774);
   --rx-bronze-12-alpha: hsla(12, 98.7%, 5.7%, 0.832);
-  --rx-bronze-12-alpha: hsla(20, 99.8%, 96.4%, 0.974);
-  --rx-brown-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-brown-01-alpha: hsla(30, 94.3%, 34.6%, 0.012);
-  --rx-brown-02-alpha: hsla(22, 99.6%, 53.6%, 0.035);
   --rx-brown-02-alpha: hsla(30, 94.3%, 34.6%, 0.036);
-  --rx-brown-03-alpha: hsla(18, 97.8%, 69.0%, 0.088);
   --rx-brown-03-alpha: hsla(30, 97.7%, 33.9%, 0.083);
-  --rx-brown-04-alpha: hsla(21, 98.2%, 71.0%, 0.123);
   --rx-brown-04-alpha: hsla(31, 98.5%, 34.2%, 0.134);
-  --rx-brown-05-alpha: hsla(25, 98.4%, 72.1%, 0.158);
   --rx-brown-05-alpha: hsla(29, 100%, 34.3%, 0.200);
-  --rx-brown-06-alpha: hsla(25, 98.7%, 73.5%, 0.206);
   --rx-brown-06-alpha: hsla(28, 99.2%, 34.6%, 0.291);
-  --rx-brown-07-alpha: hsla(25, 99.0%, 74.6%, 0.289);
   --rx-brown-07-alpha: hsla(29, 99.8%, 33.8%, 0.412);
   --rx-brown-08-alpha: hsla(28, 100%, 33.3%, 0.553);
-  --rx-brown-08-alpha: hsla(28, 99.2%, 75.3%, 0.407);
-  --rx-brown-09-alpha: hsla(28, 100%, 74.8%, 0.642);
   --rx-brown-09-alpha: hsla(28, 99.9%, 25.5%, 0.655);
   --rx-brown-10-alpha: hsla(27, 99.7%, 22.4%, 0.675);
-  --rx-brown-10-alpha: hsla(28, 99.9%, 74.9%, 0.712);
   --rx-brown-11-alpha: hsla(25, 99.8%, 17.3%, 0.714);
-  --rx-brown-11-alpha: hsla(28, 99.9%, 74.9%, 0.843);
   --rx-brown-12-alpha: hsla(21, 99.4%, 6.6%, 0.867);
-  --rx-brown-12-alpha: hsla(32, 98.2%, 95.7%, 0.979);
-  --rx-crimson-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-crimson-01-alpha: hsla(340, 100%, 51.0%, 0.012);
   --rx-crimson-02-alpha: hsla(330, 100%, 51.0%, 0.032);
-  --rx-crimson-02-alpha: hsla(336, 96.8%, 53.2%, 0.045);
   --rx-crimson-03-alpha: hsla(332, 99.1%, 47.1%, 0.063);
-  --rx-crimson-03-alpha: hsla(335, 98.7%, 59.3%, 0.138);
   --rx-crimson-04-alpha: hsla(331, 99.9%, 44.3%, 0.102);
-  --rx-crimson-04-alpha: hsla(336, 99.1%, 59.9%, 0.191);
   --rx-crimson-05-alpha: hsla(333, 99.9%, 42.3%, 0.153);
-  --rx-crimson-05-alpha: hsla(335, 99.4%, 59.4%, 0.244);
   --rx-crimson-06-alpha: hsla(333, 99.5%, 40.5%, 0.224);
-  --rx-crimson-06-alpha: hsla(335, 99.4%, 59.4%, 0.315);
   --rx-crimson-07-alpha: hsla(335, 99.7%, 39.1%, 0.322);
-  --rx-crimson-07-alpha: hsla(336, 99.5%, 57.8%, 0.439);
   --rx-crimson-08-alpha: hsla(336, 99.5%, 38.5%, 0.440);
-  --rx-crimson-08-alpha: hsla(336, 99.9%, 55.4%, 0.642);
   --rx-crimson-09-alpha: hsla(336, 99.9%, 44.3%, 0.761);
-  --rx-crimson-09-alpha: hsla(336, 99.9%, 62.8%, 0.903);
   --rx-crimson-10-alpha: hsla(336, 100%, 42.5%, 0.808);
-  --rx-crimson-10-alpha: hsla(339, 99.9%, 66.3%, 0.934);
   --rx-crimson-11-alpha: hsla(336, 99.8%, 40.3%, 0.883);
-  --rx-crimson-11-alpha: hsla(341, 99.9%, 69.5%, 0.965);
-  --rx-crimson-12-alpha: hsla(327, 100%, 97.1%, 0.980);
   --rx-crimson-12-alpha: hsla(340, 99.0%, 10.0%, 0.950);
-  --rx-cyan-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-cyan-01-alpha: hsla(195, 95.2%, 41.2%, 0.020);
   --rx-cyan-02-alpha: hsla(185, 99.9%, 42.3%, 0.051);
-  --rx-cyan-02-alpha: hsla(196, 100%, 50.0%, 0.031);
   --rx-cyan-03-alpha: hsla(186, 97.8%, 42.2%, 0.095);
-  --rx-cyan-03-alpha: hsla(192, 98.0%, 50.9%, 0.085);
   --rx-cyan-04-alpha: hsla(186, 99.9%, 38.5%, 0.153);
-  --rx-cyan-04-alpha: hsla(194, 99.6%, 51.3%, 0.133);
   --rx-cyan-05-alpha: hsla(187, 99.3%, 36.6%, 0.232);
-  --rx-cyan-05-alpha: hsla(192, 99.5%, 51.3%, 0.173);
   --rx-cyan-06-alpha: hsla(188, 99.4%, 35.4%, 0.334);
-  --rx-cyan-06-alpha: hsla(193, 99.7%, 50.4%, 0.226);
   --rx-cyan-07-alpha: hsla(189, 99.6%, 35.0%, 0.483);
-  --rx-cyan-07-alpha: hsla(192, 100%, 50.0%, 0.310);
   --rx-cyan-08-alpha: hsla(189, 99.9%, 37.6%, 0.761);
-  --rx-cyan-08-alpha: hsla(193, 100%, 50.0%, 0.425);
   --rx-cyan-09-alpha: hsla(190, 100%, 37.8%, 0.980);
-  --rx-cyan-09-alpha: hsla(190, 99.8%, 50.8%, 0.731);
-  --rx-cyan-10-alpha: hsla(188, 100%, 50.0%, 0.775);
   --rx-cyan-10-alpha: hsla(191, 99.9%, 34.6%, 0.969);
-  --rx-cyan-11-alpha: hsla(186, 100%, 49.9%, 0.824);
   --rx-cyan-11-alpha: hsla(192, 100%, 27.6%, 0.953);
-  --rx-cyan-12-alpha: hsla(185, 99.8%, 95.1%, 0.978);
   --rx-cyan-12-alpha: hsla(192, 100%, 11.0%, 0.980);
-  --rx-gold-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-gold-01-alpha: hsla(60, 89.3%, 18.3%, 0.012);
-  --rx-gold-02-alpha: hsla(40, 93.7%, 70.6%, 0.022);
   --rx-gold-02-alpha: hsla(47, 99.9%, 34.6%, 0.051);
-  --rx-gold-03-alpha: hsla(40, 97.5%, 80.6%, 0.065);
   --rx-gold-03-alpha: hsla(45, 97.0%, 27.9%, 0.087);
-  --rx-gold-04-alpha: hsla(40, 95.9%, 80.8%, 0.100);
   --rx-gold-04-alpha: hsla(46, 98.0%, 25.4%, 0.134);
-  --rx-gold-05-alpha: hsla(38, 97.3%, 82.1%, 0.130);
   --rx-gold-05-alpha: hsla(43, 98.4%, 22.6%, 0.185);
-  --rx-gold-06-alpha: hsla(39, 97.2%, 82.5%, 0.169);
   --rx-gold-06-alpha: hsla(41, 99.7%, 22.0%, 0.259);
-  --rx-gold-07-alpha: hsla(37, 99.3%, 82.4%, 0.246);
   --rx-gold-07-alpha: hsla(38, 99.8%, 21.5%, 0.357);
-  --rx-gold-08-alpha: hsla(35, 98.7%, 82.2%, 0.363);
   --rx-gold-08-alpha: hsla(36, 99.3%, 21.5%, 0.487);
-  --rx-gold-09-alpha: hsla(36, 99.7%, 82.8%, 0.552);
   --rx-gold-09-alpha: hsla(36, 99.9%, 16.2%, 0.604);
-  --rx-gold-10-alpha: hsla(35, 99.2%, 83.7%, 0.613);
   --rx-gold-10-alpha: hsla(36, 99.2%, 14.6%, 0.636);
   --rx-gold-11-alpha: hsla(35, 99.1%, 11.2%, 0.687);
-  --rx-gold-11-alpha: hsla(35, 99.3%, 85.3%, 0.725);
   --rx-gold-12-alpha: hsla(38, 98.0%, 3.8%, 0.832);
-  --rx-gold-12-alpha: hsla(49, 98.6%, 96.7%, 0.966);
-  --rx-grass-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-grass-01-alpha: hsla(120, 94.9%, 38.7%, 0.016);
-  --rx-grass-02-alpha: hsla(107, 97.2%, 61.9%, 0.022);
   --rx-grass-02-alpha: hsla(120, 94.9%, 38.7%, 0.048);
   --rx-grass-03-alpha: hsla(120, 98.0%, 35.5%, 0.079);
-  --rx-grass-03-alpha: hsla(128, 96.5%, 69.8%, 0.066);
   --rx-grass-04-alpha: hsla(120, 98.7%, 31.5%, 0.126);
-  --rx-grass-04-alpha: hsla(130, 100%, 70.2%, 0.100);
   --rx-grass-05-alpha: hsla(122, 98.5%, 29.9%, 0.193);
-  --rx-grass-05-alpha: hsla(130, 98.2%, 69.1%, 0.140);
   --rx-grass-06-alpha: hsla(125, 99.2%, 27.9%, 0.283);
-  --rx-grass-06-alpha: hsla(132, 99.9%, 69.3%, 0.187);
   --rx-grass-07-alpha: hsla(125, 99.9%, 27.0%, 0.408);
-  --rx-grass-07-alpha: hsla(132, 99.9%, 69.8%, 0.261);
-  --rx-grass-08-alpha: hsla(130, 99.6%, 70.5%, 0.370);
   --rx-grass-08-alpha: hsla(131, 100%, 27.6%, 0.604);
-  --rx-grass-09-alpha: hsla(130, 99.7%, 70.6%, 0.618);
   --rx-grass-09-alpha: hsla(131, 99.7%, 26.3%, 0.726);
-  --rx-grass-10-alpha: hsla(131, 100%, 73.5%, 0.674);
   --rx-grass-10-alpha: hsla(132, 99.9%, 24.0%, 0.761);
-  --rx-grass-11-alpha: hsla(130, 99.7%, 75.6%, 0.731);
   --rx-grass-11-alpha: hsla(133, 99.5%, 19.5%, 0.840);
   --rx-grass-12-alpha: hsla(128, 98.0%, 4.9%, 0.895);
-  --rx-grass-12-alpha: hsla(137, 100%, 95.8%, 0.980);
   --rx-gray-01-alpha: hsla(0, 0%, 0%, 0.012);
-  --rx-gray-01-alpha: hsla(0, 0%, 100%, 0);
   --rx-gray-02-alpha: hsla(0, 0%, 0%, 0.027);
-  --rx-gray-02-alpha: hsla(0, 0%, 100%, 0.026);
   --rx-gray-03-alpha: hsla(0, 0%, 0%, 0.047);
-  --rx-gray-03-alpha: hsla(0, 0%, 100%, 0.056);
   --rx-gray-04-alpha: hsla(0, 0%, 0%, 0.071);
-  --rx-gray-04-alpha: hsla(0, 0%, 100%, 0.077);
   --rx-gray-05-alpha: hsla(0, 0%, 0%, 0.090);
-  --rx-gray-05-alpha: hsla(0, 0%, 100%, 0.103);
   --rx-gray-06-alpha: hsla(0, 0%, 0%, 0.114);
-  --rx-gray-06-alpha: hsla(0, 0%, 100%, 0.129);
   --rx-gray-07-alpha: hsla(0, 0%, 0%, 0.141);
-  --rx-gray-07-alpha: hsla(0, 0%, 100%, 0.172);
   --rx-gray-08-alpha: hsla(0, 0%, 0%, 0.220);
-  --rx-gray-08-alpha: hsla(0, 0%, 100%, 0.249);
   --rx-gray-09-alpha: hsla(0, 0%, 0%, 0.439);
-  --rx-gray-09-alpha: hsla(0, 0%, 100%, 0.386);
   --rx-gray-10-alpha: hsla(0, 0%, 0%, 0.478);
-  --rx-gray-10-alpha: hsla(0, 0%, 100%, 0.446);
   --rx-gray-11-alpha: hsla(0, 0%, 0%, 0.565);
-  --rx-gray-11-alpha: hsla(0, 0%, 100%, 0.592);
   --rx-gray-12-alpha: hsla(0, 0%, 0%, 0.910);
-  --rx-gray-12-alpha: hsla(0, 0%, 100%, 0.923);
-  --rx-green-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-green-01-alpha: hsla(140, 94.9%, 38.7%, 0.016);
   --rx-green-02-alpha: hsla(138, 99.9%, 38.5%, 0.051);
-  --rx-green-02-alpha: hsla(169, 100%, 48.5%, 0.027);
   --rx-green-03-alpha: hsla(139, 97.7%, 36.9%, 0.087);
-  --rx-green-03-alpha: hsla(162, 98.7%, 57.9%, 0.070);
   --rx-green-04-alpha: hsla(139, 98.5%, 32.7%, 0.134);
-  --rx-green-04-alpha: hsla(158, 98.6%, 59.7%, 0.105);
   --rx-green-05-alpha: hsla(141, 100%, 30.4%, 0.200);
-  --rx-green-05-alpha: hsla(158, 98.6%, 60.7%, 0.140);
   --rx-green-06-alpha: hsla(142, 99.0%, 28.9%, 0.295);
-  --rx-green-06-alpha: hsla(156, 99.9%, 62.0%, 0.187);
   --rx-green-07-alpha: hsla(146, 99.5%, 27.6%, 0.428);
-  --rx-green-07-alpha: hsla(154, 99.5%, 63.1%, 0.257);
   --rx-green-08-alpha: hsla(151, 99.5%, 28.8%, 0.644);
-  --rx-green-08-alpha: hsla(152, 99.7%, 64.2%, 0.370);
-  --rx-green-09-alpha: hsla(151, 99.7%, 63.8%, 0.605);
   --rx-green-09-alpha: hsla(151, 99.9%, 28.0%, 0.812);
   --rx-green-10-alpha: hsla(152, 99.6%, 25.8%, 0.840);
-  --rx-green-10-alpha: hsla(152, 99.9%, 66.5%, 0.661);
-  --rx-green-11-alpha: hsla(151, 99.7%, 69.2%, 0.740);
   --rx-green-11-alpha: hsla(153, 99.9%, 21.0%, 0.906);
-  --rx-green-12-alpha: hsla(137, 100%, 95.8%, 0.980);
   --rx-green-12-alpha: hsla(155, 99.4%, 6.2%, 0.918);
-  --rx-indigo-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-indigo-01-alpha: hsla(240, 92.6%, 26.5%, 0.008);
   --rx-indigo-02-alpha: hsla(223, 100%, 51.0%, 0.028);
-  --rx-indigo-02-alpha: hsla(234, 97.4%, 59.9%, 0.059);
   --rx-indigo-03-alpha: hsla(224, 100%, 50.1%, 0.059);
-  --rx-indigo-03-alpha: hsla(228, 99.2%, 61.7%, 0.144);
   --rx-indigo-04-alpha: hsla(223, 98.0%, 48.5%, 0.099);
-  --rx-indigo-04-alpha: hsla(227, 99.7%, 62.0%, 0.211);
   --rx-indigo-05-alpha: hsla(225, 98.6%, 46.4%, 0.150);
-  --rx-indigo-05-alpha: hsla(227, 99.2%, 62.3%, 0.270);
   --rx-indigo-06-alpha: hsla(224, 99.5%, 44.9%, 0.224);
-  --rx-indigo-06-alpha: hsla(226, 99.9%, 62.1%, 0.350);
   --rx-indigo-07-alpha: hsla(225, 99.7%, 43.9%, 0.318);
-  --rx-indigo-07-alpha: hsla(226, 99.9%, 62.0%, 0.471);
   --rx-indigo-08-alpha: hsla(226, 99.5%, 43.1%, 0.448);
-  --rx-indigo-08-alpha: hsla(226, 99.9%, 62.1%, 0.655);
   --rx-indigo-09-alpha: hsla(226, 100%, 41.2%, 0.757);
-  --rx-indigo-09-alpha: hsla(226, 99.9%, 63.6%, 0.848);
   --rx-indigo-10-alpha: hsla(226, 99.8%, 37.1%, 0.773);
-  --rx-indigo-10-alpha: hsla(227, 99.8%, 67.7%, 0.893);
   --rx-indigo-11-alpha: hsla(226, 99.6%, 31.1%, 0.797);
-  --rx-indigo-11-alpha: hsla(227, 100%, 76.3%, 0.980);
-  --rx-indigo-12-alpha: hsla(226, 100%, 97.5%, 0.980);
   --rx-indigo-12-alpha: hsla(226, 99.3%, 11.4%, 0.938);
-  --rx-lime-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-lime-01-alpha: hsla(80, 93.8%, 31.4%, 0.020);
-  --rx-lime-02-alpha: hsla(75, 96.4%, 59.6%, 0.022);
   --rx-lime-02-alpha: hsla(85, 99.3%, 40.2%, 0.059);
   --rx-lime-03-alpha: hsla(84, 98.7%, 43.2%, 0.138);
-  --rx-lime-03-alpha: hsla(88, 98.0%, 70.4%, 0.061);
-  --rx-lime-04-alpha: hsla(81, 97.8%, 67.4%, 0.096);
   --rx-lime-04-alpha: hsla(84, 99.6%, 43.0%, 0.220);
-  --rx-lime-05-alpha: hsla(82, 98.4%, 65.6%, 0.135);
   --rx-lime-05-alpha: hsla(85, 99.8%, 41.8%, 0.310);
-  --rx-lime-06-alpha: hsla(79, 99.7%, 64.3%, 0.182);
   --rx-lime-06-alpha: hsla(82, 99.8%, 39.3%, 0.420);
-  --rx-lime-07-alpha: hsla(77, 99.1%, 62.1%, 0.252);
   --rx-lime-07-alpha: hsla(79, 99.7%, 34.6%, 0.585);
-  --rx-lime-08-alpha: hsla(75, 100%, 60.0%, 0.342);
   --rx-lime-08-alpha: hsla(76, 99.8%, 33.7%, 0.828);
   --rx-lime-09-alpha: hsla(81, 99.8%, 40.2%, 0.836);
-  --rx-lime-09-alpha: hsla(81, 99.8%, 59.7%, 0.819);
-  --rx-lime-10-alpha: hsla(75, 99.8%, 63.7%, 0.936);
   --rx-lime-10-alpha: hsla(80, 100%, 37.6%, 0.851);
   --rx-lime-11-alpha: hsla(75, 99.5%, 22.0%, 0.950);
-  --rx-lime-11-alpha: hsla(81, 99.9%, 58.7%, 0.719);
   --rx-lime-12-alpha: hsla(78, 99.6%, 8.4%, 0.965);
-  --rx-lime-12-alpha: hsla(83, 100%, 94.2%, 0.980);
-  --rx-mauve-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-mauve-01-alpha: hsla(300, 89.3%, 18.3%, 0.012);
-  --rx-mauve-02-alpha: hsla(240, 76.7%, 91.2%, 0.031);
   --rx-mauve-02-alpha: hsla(300, 78.1%, 9.0%, 0.028);
-  --rx-mauve-03-alpha: hsla(240, 86.0%, 95.8%, 0.061);
   --rx-mauve-03-alpha: hsla(300, 99.5%, 7.7%, 0.051);
-  --rx-mauve-04-alpha: hsla(240, 91.8%, 94.7%, 0.087);
   --rx-mauve-04-alpha: hsla(270, 90.5%, 6.1%, 0.071);
-  --rx-mauve-05-alpha: hsla(240, 91.5%, 95.8%, 0.113);
   --rx-mauve-05-alpha: hsla(270, 83.0%, 5.2%, 0.091);
-  --rx-mauve-06-alpha: hsla(240, 92.0%, 93.8%, 0.148);
   --rx-mauve-06-alpha: hsla(300, 93.5%, 3.7%, 0.114);
-  --rx-mauve-07-alpha: hsla(240, 94.8%, 95.3%, 0.191);
   --rx-mauve-07-alpha: hsla(270, 82.6%, 3.3%, 0.142);
-  --rx-mauve-08-alpha: hsla(249, 98.1%, 95.2%, 0.273);
   --rx-mauve-08-alpha: hsla(255, 95.2%, 3.7%, 0.220);
-  --rx-mauve-09-alpha: hsla(248, 97.6%, 96.2%, 0.416);
   --rx-mauve-09-alpha: hsla(255, 94.8%, 3.7%, 0.444);
-  --rx-mauve-10-alpha: hsla(248, 95.5%, 96.6%, 0.477);
   --rx-mauve-10-alpha: hsla(253, 96.5%, 3.8%, 0.483);
   --rx-mauve-11-alpha: hsla(247, 97.9%, 3.2%, 0.569);
-  --rx-mauve-11-alpha: hsla(250, 98.0%, 98.0%, 0.615);
-  --rx-mauve-12-alpha: hsla(240, 93.9%, 99.6%, 0.931);
   --rx-mauve-12-alpha: hsla(261, 98.7%, 3.0%, 0.918);
-  --rx-mint-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-mint-01-alpha: hsla(168, 95.4%, 42.8%, 0.024);
   --rx-mint-02-alpha: hsla(164, 99.1%, 47.1%, 0.063);
-  --rx-mint-02-alpha: hsla(180, 100%, 49.2%, 0.031);
   --rx-mint-03-alpha: hsla(164, 99.3%, 43.5%, 0.118);
-  --rx-mint-03-alpha: hsla(176, 100%, 49.7%, 0.070);
   --rx-mint-04-alpha: hsla(164, 99.3%, 41.3%, 0.177);
-  --rx-mint-04-alpha: hsla(173, 100%, 49.7%, 0.105);
   --rx-mint-05-alpha: hsla(165, 99.0%, 37.5%, 0.248);
-  --rx-mint-05-alpha: hsla(173, 100%, 49.8%, 0.144);
   --rx-mint-06-alpha: hsla(165, 100%, 35.0%, 0.353);
-  --rx-mint-06-alpha: hsla(172, 100%, 49.8%, 0.192);
   --rx-mint-07-alpha: hsla(166, 99.9%, 33.5%, 0.510);
-  --rx-mint-07-alpha: hsla(171, 100%, 49.9%, 0.266);
   --rx-mint-08-alpha: hsla(168, 99.6%, 34.6%, 0.750);
-  --rx-mint-08-alpha: hsla(169, 100%, 49.9%, 0.366);
-  --rx-mint-09-alpha: hsla(167, 99.8%, 75.0%, 0.870);
   --rx-mint-09-alpha: hsla(167, 99.9%, 39.5%, 0.561);
-  --rx-mint-10-alpha: hsla(163, 99.9%, 80.7%, 0.948);
   --rx-mint-10-alpha: hsla(167, 99.7%, 37.4%, 0.589);
-  --rx-mint-11-alpha: hsla(167, 99.9%, 58.7%, 0.796);
   --rx-mint-11-alpha: hsla(172, 99.8%, 22.4%, 0.922);
-  --rx-mint-12-alpha: hsla(169, 100%, 96.2%, 0.980);
   --rx-mint-12-alpha: hsla(172, 99.7%, 8.8%, 0.965);
-  --rx-olive-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-olive-01-alpha: hsla(120, 89.3%, 18.3%, 0.012);
   --rx-olive-02-alpha: hsla(120, 87.7%, 16.0%, 0.028);
-  --rx-olive-02-alpha: hsla(91, 97.0%, 84.0%, 0.026);
-  --rx-olive-03-alpha: hsla(101, 87.4%, 87.7%, 0.057);
   --rx-olive-03-alpha: hsla(120, 99.5%, 7.7%, 0.051);
   --rx-olive-04-alpha: hsla(120, 92.3%, 8.5%, 0.075);
-  --rx-olive-04-alpha: hsla(92, 91.8%, 94.1%, 0.078);
-  --rx-olive-05-alpha: hsla(101, 92.6%, 93.5%, 0.104);
   --rx-olive-05-alpha: hsla(120, 86.0%, 6.9%, 0.099);
-  --rx-olive-06-alpha: hsla(102, 91.1%, 94.6%, 0.130);
   --rx-olive-06-alpha: hsla(120, 94.8%, 6.8%, 0.122);
-  --rx-olive-07-alpha: hsla(102, 92.5%, 95.9%, 0.173);
   --rx-olive-07-alpha: hsla(120, 99.3%, 5.2%, 0.153);
-  --rx-olive-08-alpha: hsla(107, 100%, 96.5%, 0.250);
   --rx-olive-08-alpha: hsla(110, 93.8%, 5.2%, 0.240);
-  --rx-olive-09-alpha: hsla(110, 98.3%, 94.1%, 0.397);
   --rx-olive-09-alpha: hsla(111, 98.7%, 3.0%, 0.459);
-  --rx-olive-10-alpha: hsla(109, 99.6%, 95.3%, 0.457);
   --rx-olive-10-alpha: hsla(111, 93.5%, 2.9%, 0.499);
   --rx-olive-11-alpha: hsla(111, 95.2%, 2.5%, 0.585);
-  --rx-olive-11-alpha: hsla(113, 95.3%, 97.2%, 0.600);
   --rx-olive-12-alpha: hsla(110, 97.6%, 2.6%, 0.930);
-  --rx-olive-12-alpha: hsla(120, 93.5%, 99.6%, 0.927);
-  --rx-orange-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-orange-01-alpha: hsla(20, 94.9%, 38.7%, 0.016);
-  --rx-orange-02-alpha: hsla(13, 100%, 49.7%, 0.054);
   --rx-orange-02-alpha: hsla(24, 95.8%, 46.5%, 0.044);
-  --rx-orange-03-alpha: hsla(20, 100%, 49.7%, 0.117);
   --rx-orange-03-alpha: hsla(25, 100%, 50.5%, 0.095);
-  --rx-orange-04-alpha: hsla(23, 100%, 49.8%, 0.166);
   --rx-orange-04-alpha: hsla(26, 100%, 50.0%, 0.157);
-  --rx-orange-05-alpha: hsla(23, 99.4%, 50.1%, 0.215);
   --rx-orange-05-alpha: hsla(25, 100%, 50.1%, 0.236);
-  --rx-orange-06-alpha: hsla(23, 99.8%, 51.1%, 0.286);
   --rx-orange-06-alpha: hsla(25, 100%, 50.1%, 0.346);
-  --rx-orange-07-alpha: hsla(23, 99.7%, 50.6%, 0.389);
   --rx-orange-07-alpha: hsla(24, 100%, 50.1%, 0.495);
-  --rx-orange-08-alpha: hsla(24, 100%, 49.9%, 0.523);
   --rx-orange-08-alpha: hsla(24, 99.7%, 48.7%, 0.695);
   --rx-orange-09-alpha: hsla(24, 99.9%, 48.4%, 0.969);
-  --rx-orange-09-alpha: hsla(24, 99.9%, 51.6%, 0.965);
   --rx-orange-10-alpha: hsla(23, 100%, 46.4%, 0.980);
-  --rx-orange-10-alpha: hsla(25, 100%, 58.6%, 0.980);
   --rx-orange-11-alpha: hsla(23, 100%, 36.8%, 0.980);
-  --rx-orange-11-alpha: hsla(24, 100%, 62.4%, 0.980);
   --rx-orange-12-alpha: hsla(15, 99.4%, 11.0%, 0.934);
-  --rx-orange-12-alpha: hsla(26, 100%, 94.2%, 0.980);
-  --rx-pink-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-pink-01-alpha: hsla(320, 100%, 51.0%, 0.012);
-  --rx-pink-02-alpha: hsla(320, 98.1%, 64.1%, 0.036);
   --rx-pink-02-alpha: hsla(323, 100%, 51.0%, 0.032);
-  --rx-pink-03-alpha: hsla(320, 99.1%, 63.1%, 0.121);
   --rx-pink-03-alpha: hsla(323, 98.9%, 47.3%, 0.067);
-  --rx-pink-04-alpha: hsla(320, 99.5%, 62.7%, 0.170);
   --rx-pink-04-alpha: hsla(323, 99.9%, 44.3%, 0.102);
-  --rx-pink-05-alpha: hsla(319, 99.7%, 61.5%, 0.219);
   --rx-pink-05-alpha: hsla(324, 99.9%, 42.3%, 0.153);
-  --rx-pink-06-alpha: hsla(322, 99.4%, 60.8%, 0.291);
   --rx-pink-06-alpha: hsla(323, 99.5%, 39.6%, 0.224);
-  --rx-pink-07-alpha: hsla(321, 99.6%, 58.7%, 0.407);
   --rx-pink-07-alpha: hsla(323, 99.7%, 38.5%, 0.322);
-  --rx-pink-08-alpha: hsla(322, 99.7%, 55.4%, 0.608);
   --rx-pink-08-alpha: hsla(323, 99.5%, 37.7%, 0.444);
-  --rx-pink-09-alpha: hsla(322, 100%, 64.6%, 0.817);
   --rx-pink-09-alpha: hsla(322, 99.7%, 39.3%, 0.750);
   --rx-pink-10-alpha: hsla(322, 100%, 39.1%, 0.808);
-  --rx-pink-10-alpha: hsla(323, 100%, 66.3%, 0.875);
   --rx-pink-11-alpha: hsla(322, 99.8%, 39.0%, 0.887);
-  --rx-pink-11-alpha: hsla(325, 99.9%, 68.6%, 0.960);
-  --rx-pink-12-alpha: hsla(314, 100%, 96.9%, 0.980);
   --rx-pink-12-alpha: hsla(321, 99.8%, 10.0%, 0.961);
-  --rx-plum-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-plum-01-alpha: hsla(280, 100%, 51.0%, 0.012);
   --rx-plum-02-alpha: hsla(300, 100%, 51.0%, 0.028);
-  --rx-plum-02-alpha: hsla(300, 96.4%, 58.4%, 0.036);
   --rx-plum-03-alpha: hsla(300, 99.0%, 40.9%, 0.063);
-  --rx-plum-03-alpha: hsla(300, 99.4%, 67.1%, 0.102);
-  --rx-plum-04-alpha: hsla(295, 99.8%, 66.3%, 0.155);
   --rx-plum-04-alpha: hsla(300, 99.9%, 38.5%, 0.102);
-  --rx-plum-05-alpha: hsla(295, 99.4%, 67.1%, 0.204);
   --rx-plum-05-alpha: hsla(298, 98.2%, 35.9%, 0.150);
-  --rx-plum-06-alpha: hsla(294, 99.0%, 67.8%, 0.262);
   --rx-plum-06-alpha: hsla(297, 99.6%, 33.7%, 0.216);
-  --rx-plum-07-alpha: hsla(294, 99.9%, 67.7%, 0.363);
   --rx-plum-07-alpha: hsla(295, 99.7%, 32.6%, 0.314);
   --rx-plum-08-alpha: hsla(292, 99.6%, 32.4%, 0.432);
-  --rx-plum-08-alpha: hsla(292, 99.8%, 67.5%, 0.527);
   --rx-plum-09-alpha: hsla(292, 99.9%, 31.0%, 0.710);
-  --rx-plum-09-alpha: hsla(292, 99.9%, 69.2%, 0.695);
   --rx-plum-10-alpha: hsla(292, 99.9%, 30.8%, 0.765);
-  --rx-plum-10-alpha: hsla(295, 99.9%, 70.8%, 0.748);
   --rx-plum-11-alpha: hsla(292, 99.8%, 30.7%, 0.832);
-  --rx-plum-11-alpha: hsla(300, 99.8%, 72.9%, 0.828);
   --rx-plum-12-alpha: hsla(291, 99.9%, 9.7%, 0.953);
-  --rx-plum-12-alpha: hsla(300, 100%, 97.1%, 0.980);
-  --rx-purple-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-purple-01-alpha: hsla(300, 94.3%, 34.6%, 0.012);
   --rx-purple-02-alpha: hsla(276, 100%, 51.0%, 0.020);
-  --rx-purple-02-alpha: hsla(280, 96.5%, 57.5%, 0.045);
   --rx-purple-03-alpha: hsla(277, 99.6%, 46.5%, 0.055);
-  --rx-purple-03-alpha: hsla(279, 98.7%, 62.8%, 0.129);
   --rx-purple-04-alpha: hsla(274, 97.9%, 44.3%, 0.095);
-  --rx-purple-04-alpha: hsla(279, 99.1%, 64.0%, 0.191);
   --rx-purple-05-alpha: hsla(276, 98.6%, 42.0%, 0.142);
-  --rx-purple-05-alpha: hsla(278, 99.8%, 64.2%, 0.248);
   --rx-purple-06-alpha: hsla(275, 100%, 39.2%, 0.200);
-  --rx-purple-06-alpha: hsla(276, 99.6%, 64.6%, 0.328);
   --rx-purple-07-alpha: hsla(273, 99.2%, 38.2%, 0.295);
-  --rx-purple-07-alpha: hsla(274, 99.9%, 64.6%, 0.456);
   --rx-purple-08-alpha: hsla(272, 99.7%, 37.6%, 0.424);
-  --rx-purple-08-alpha: hsla(272, 99.7%, 64.6%, 0.660);
   --rx-purple-09-alpha: hsla(272, 99.6%, 34.0%, 0.695);
-  --rx-purple-09-alpha: hsla(272, 99.9%, 69.1%, 0.748);
   --rx-purple-10-alpha: hsla(272, 99.7%, 32.0%, 0.730);
-  --rx-purple-10-alpha: hsla(273, 100%, 71.3%, 0.801);
   --rx-purple-11-alpha: hsla(272, 99.8%, 29.7%, 0.773);
-  --rx-purple-11-alpha: hsla(275, 99.9%, 75.3%, 0.934);
   --rx-purple-12-alpha: hsla(272, 99.2%, 11.3%, 0.946);
-  --rx-purple-12-alpha: hsla(286, 100%, 97.1%, 0.980);
-  --rx-red-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-red-01-alpha: hsla(0, 100%, 51.0%, 0.012);
   --rx-red-02-alpha: hsla(0, 100%, 51.0%, 0.032);
-  --rx-red-02-alpha: hsla(5, 98.5%, 53.8%, 0.045);
   --rx-red-03-alpha: hsla(0, 100%, 50.2%, 0.063);
-  --rx-red-03-alpha: hsla(359, 99.1%, 61.1%, 0.130);
   --rx-red-04-alpha: hsla(0, 100%, 50.0%, 0.102);
-  --rx-red-04-alpha: hsla(358, 98.8%, 61.0%, 0.184);
   --rx-red-05-alpha: hsla(0, 99.9%, 47.5%, 0.153);
-  --rx-red-05-alpha: hsla(357, 99.6%, 60.3%, 0.237);
   --rx-red-06-alpha: hsla(0, 99.5%, 44.9%, 0.224);
-  --rx-red-06-alpha: hsla(358, 99.6%, 60.3%, 0.322);
-  --rx-red-07-alpha: hsla(357, 100%, 59.5%, 0.442);
   --rx-red-07-alpha: hsla(359, 99.7%, 42.7%, 0.318);
-  --rx-red-08-alpha: hsla(358, 99.8%, 59.1%, 0.621);
   --rx-red-08-alpha: hsla(359, 99.6%, 41.1%, 0.436);
-  --rx-red-09-alpha: hsla(358, 100%, 65.5%, 0.884);
   --rx-red-09-alpha: hsla(358, 99.9%, 42.9%, 0.718);
-  --rx-red-10-alpha: hsla(358, 100%, 67.5%, 0.942);
   --rx-red-10-alpha: hsla(358, 99.9%, 41.0%, 0.761);
-  --rx-red-11-alpha: hsla(358, 100%, 69.7%, 0.980);
   --rx-red-11-alpha: hsla(358, 99.8%, 38.3%, 0.832);
-  --rx-red-12-alpha: hsla(352, 100%, 97.1%, 0.980);
   --rx-red-12-alpha: hsla(355, 99.3%, 7.9%, 0.926);
-  --rx-sage-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-sage-01-alpha: hsla(150, 92.6%, 26.5%, 0.016);
-  --rx-sage-02-alpha: hsla(123, 94.4%, 91.4%, 0.026);
   --rx-sage-02-alpha: hsla(150, 87.7%, 16.0%, 0.028);
-  --rx-sage-03-alpha: hsla(123, 82.9%, 91.0%, 0.057);
   --rx-sage-03-alpha: hsla(160, 98.4%, 10.9%, 0.055);
-  --rx-sage-04-alpha: hsla(124, 97.9%, 94.5%, 0.082);
   --rx-sage-04-alpha: hsla(140, 92.3%, 8.5%, 0.075);
-  --rx-sage-05-alpha: hsla(125, 90.0%, 95.2%, 0.104);
   --rx-sage-05-alpha: hsla(160, 86.0%, 6.9%, 0.099);
-  --rx-sage-06-alpha: hsla(142, 95.1%, 94.8%, 0.134);
   --rx-sage-06-alpha: hsla(156, 95.1%, 8.2%, 0.126);
-  --rx-sage-07-alpha: hsla(143, 92.8%, 95.7%, 0.173);
   --rx-sage-07-alpha: hsla(156, 98.6%, 6.3%, 0.157);
-  --rx-sage-08-alpha: hsla(146, 94.7%, 95.3%, 0.255);
   --rx-sage-08-alpha: hsla(154, 94.6%, 6.0%, 0.240);
-  --rx-sage-09-alpha: hsla(151, 98.2%, 94.4%, 0.397);
   --rx-sage-09-alpha: hsla(154, 98.7%, 3.0%, 0.459);
-  --rx-sage-10-alpha: hsla(148, 99.5%, 95.5%, 0.457);
   --rx-sage-10-alpha: hsla(154, 93.5%, 2.9%, 0.499);
-  --rx-sage-11-alpha: hsla(152, 95.1%, 97.3%, 0.600);
   --rx-sage-11-alpha: hsla(154, 95.2%, 2.5%, 0.585);
-  --rx-sage-12-alpha: hsla(149, 93.3%, 99.6%, 0.927);
   --rx-sage-12-alpha: hsla(158, 97.0%, 2.4%, 0.934);
-  --rx-sand-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-sand-01-alpha: hsla(60, 89.3%, 18.3%, 0.012);
   --rx-sand-02-alpha: hsla(60, 78.1%, 9.0%, 0.028);
-  --rx-sand-02-alpha: hsla(60, 89.8%, 91.4%, 0.026);
-  --rx-sand-03-alpha: hsla(60, 95.5%, 92.5%, 0.056);
   --rx-sand-03-alpha: hsla(60, 99.0%, 3.9%, 0.051);
-  --rx-sand-04-alpha: hsla(60, 75.6%, 96.4%, 0.078);
   --rx-sand-04-alpha: hsla(60, 88.9%, 5.9%, 0.075);
-  --rx-sand-05-alpha: hsla(60, 81.9%, 95.2%, 0.104);
   --rx-sand-05-alpha: hsla(60, 86.0%, 6.9%, 0.099);
-  --rx-sand-06-alpha: hsla(41, 87.6%, 94.8%, 0.134);
   --rx-sand-06-alpha: hsla(60, 93.2%, 5.2%, 0.122);
-  --rx-sand-07-alpha: hsla(60, 95.4%, 96.2%, 0.172);
   --rx-sand-07-alpha: hsla(60, 98.3%, 5.1%, 0.157);
-  --rx-sand-08-alpha: hsla(49, 93.5%, 95.7%, 0.254);
   --rx-sand-08-alpha: hsla(51, 94.1%, 6.0%, 0.244);
-  --rx-sand-09-alpha: hsla(52, 97.3%, 96.2%, 0.391);
   --rx-sand-09-alpha: hsla(60, 99.8%, 1.7%, 0.451);
-  --rx-sand-10-alpha: hsla(52, 97.8%, 96.7%, 0.451);
   --rx-sand-10-alpha: hsla(60, 90.7%, 1.8%, 0.491);
   --rx-sand-11-alpha: hsla(45, 93.7%, 1.5%, 0.577);
-  --rx-sand-11-alpha: hsla(51, 97.0%, 97.8%, 0.597);
-  --rx-sand-12-alpha: hsla(60, 88.7%, 99.8%, 0.923);
   --rx-sand-12-alpha: hsla(60, 98.0%, 0.7%, 0.906);
-  --rx-sky-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-sky-01-alpha: hsla(190, 100%, 51.0%, 0.024);
   --rx-sky-02-alpha: hsla(193, 100%, 50.1%, 0.055);
-  --rx-sky-02-alpha: hsla(208, 100%, 49.8%, 0.045);
   --rx-sky-03-alpha: hsla(193, 100%, 50.1%, 0.106);
-  --rx-sky-03-alpha: hsla(201, 100%, 49.8%, 0.099);
   --rx-sky-04-alpha: hsla(194, 99.6%, 47.7%, 0.165);
-  --rx-sky-04-alpha: hsla(201, 100%, 50.0%, 0.148);
   --rx-sky-05-alpha: hsla(194, 99.2%, 45.4%, 0.244);
-  --rx-sky-05-alpha: hsla(200, 100%, 49.8%, 0.198);
   --rx-sky-06-alpha: hsla(194, 99.9%, 42.3%, 0.357);
-  --rx-sky-06-alpha: hsla(199, 100%, 49.9%, 0.256);
   --rx-sky-07-alpha: hsla(194, 99.8%, 42.2%, 0.526);
-  --rx-sky-07-alpha: hsla(199, 100%, 49.9%, 0.337);
   --rx-sky-08-alpha: hsla(193, 99.9%, 43.8%, 0.820);
-  --rx-sky-08-alpha: hsla(199, 100%, 50.0%, 0.453);
-  --rx-sky-09-alpha: hsla(192, 100%, 70.8%, 0.980);
   --rx-sky-09-alpha: hsla(193, 99.7%, 49.4%, 0.593);
-  --rx-sky-10-alpha: hsla(190, 100%, 77.6%, 0.980);
   --rx-sky-10-alpha: hsla(193, 99.8%, 46.6%, 0.628);
-  --rx-sky-11-alpha: hsla(192, 99.9%, 59.6%, 0.924);
   --rx-sky-11-alpha: hsla(196, 100%, 31.2%, 0.980);
-  --rx-sky-12-alpha: hsla(189, 100%, 96.8%, 0.980);
   --rx-sky-12-alpha: hsla(196, 100%, 12.2%, 0.980);
-  --rx-slate-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-slate-01-alpha: hsla(210, 92.6%, 26.5%, 0.016);
-  --rx-slate-02-alpha: hsla(181, 98.9%, 91.8%, 0.026);
   --rx-slate-02-alpha: hsla(210, 87.7%, 16.0%, 0.028);
-  --rx-slate-03-alpha: hsla(182, 86.7%, 91.4%, 0.057);
   --rx-slate-03-alpha: hsla(210, 98.8%, 14.4%, 0.055);
-  --rx-slate-04-alpha: hsla(209, 86.7%, 93.9%, 0.083);
   --rx-slate-04-alpha: hsla(210, 94.1%, 11.1%, 0.075);
-  --rx-slate-05-alpha: hsla(200, 90.3%, 93.4%, 0.109);
   --rx-slate-05-alpha: hsla(216, 91.1%, 10.9%, 0.099);
   --rx-slate-06-alpha: hsla(206, 96.4%, 11.3%, 0.126);
-  --rx-slate-06-alpha: hsla(209, 95.3%, 93.5%, 0.139);
-  --rx-slate-07-alpha: hsla(204, 98.5%, 93.9%, 0.182);
   --rx-slate-07-alpha: hsla(210, 99.1%, 10.1%, 0.157);
   --rx-slate-08-alpha: hsla(205, 96.5%, 10.0%, 0.244);
-  --rx-slate-08-alpha: hsla(209, 94.0%, 94.7%, 0.265);
   --rx-slate-09-alpha: hsla(206, 98.8%, 5.9%, 0.467);
-  --rx-slate-09-alpha: hsla(207, 97.3%, 94.0%, 0.412);
   --rx-slate-10-alpha: hsla(206, 99.6%, 5.4%, 0.506);
-  --rx-slate-10-alpha: hsla(209, 99.4%, 95.2%, 0.472);
   --rx-slate-11-alpha: hsla(206, 97.0%, 4.8%, 0.593);
-  --rx-slate-11-alpha: hsla(208, 98.7%, 96.8%, 0.615);
   --rx-slate-12-alpha: hsla(202, 97.0%, 2.4%, 0.934);
-  --rx-slate-12-alpha: hsla(211, 86.7%, 99.6%, 0.927);
-  --rx-teal-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-teal-01-alpha: hsla(165, 95.2%, 41.2%, 0.020);
   --rx-teal-02-alpha: hsla(169, 99.5%, 39.4%, 0.055);
-  --rx-teal-02-alpha: hsla(171, 100%, 49.2%, 0.031);
   --rx-teal-03-alpha: hsla(167, 97.6%, 38.1%, 0.095);
-  --rx-teal-03-alpha: hsla(172, 100%, 49.7%, 0.070);
   --rx-teal-04-alpha: hsla(168, 98.1%, 34.6%, 0.150);
-  --rx-teal-04-alpha: hsla(175, 100%, 49.7%, 0.105);
   --rx-teal-05-alpha: hsla(170, 99.4%, 32.3%, 0.220);
-  --rx-teal-05-alpha: hsla(174, 98.9%, 50.1%, 0.140);
   --rx-teal-06-alpha: hsla(170, 99.7%, 30.1%, 0.314);
-  --rx-teal-06-alpha: hsla(174, 100%, 51.8%, 0.187);
   --rx-teal-07-alpha: hsla(170, 99.3%, 28.7%, 0.448);
-  --rx-teal-07-alpha: hsla(173, 99.6%, 53.2%, 0.257);
   --rx-teal-08-alpha: hsla(172, 99.8%, 29.7%, 0.675);
-  --rx-teal-08-alpha: hsla(174, 99.6%, 53.3%, 0.366);
   --rx-teal-09-alpha: hsla(173, 99.8%, 31.1%, 0.930);
-  --rx-teal-09-alpha: hsla(173, 99.9%, 54.6%, 0.609);
   --rx-teal-10-alpha: hsla(173, 99.7%, 28.7%, 0.946);
-  --rx-teal-10-alpha: hsla(174, 99.9%, 53.8%, 0.670);
-  --rx-teal-11-alpha: hsla(174, 100%, 52.0%, 0.748);
   --rx-teal-11-alpha: hsla(174, 99.8%, 23.3%, 0.977);
-  --rx-teal-12-alpha: hsla(166, 98.6%, 95.0%, 0.979);
   --rx-teal-12-alpha: hsla(171, 98.8%, 6.8%, 0.938);
-  --rx-tomato-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-tomato-01-alpha: hsla(0, 100%, 51.0%, 0.012);
-  --rx-tomato-02-alpha: hsla(5, 100%, 49.6%, 0.058);
   --rx-tomato-02-alpha: hsla(8, 100%, 51.0%, 0.032);
-  --rx-tomato-03-alpha: hsla(6, 99.6%, 54.9%, 0.133);
   --rx-tomato-03-alpha: hsla(7, 100%, 50.2%, 0.067);
-  --rx-tomato-04-alpha: hsla(6, 99.2%, 55.4%, 0.191);
   --rx-tomato-04-alpha: hsla(8, 100%, 50.1%, 0.114);
-  --rx-tomato-05-alpha: hsla(6, 99.5%, 55.8%, 0.244);
   --rx-tomato-05-alpha: hsla(7, 99.5%, 47.9%, 0.173);
-  --rx-tomato-06-alpha: hsla(7, 99.7%, 55.9%, 0.319);
   --rx-tomato-06-alpha: hsla(9, 99.9%, 46.2%, 0.255);
   --rx-tomato-07-alpha: hsla(10, 99.8%, 43.6%, 0.365);
-  --rx-tomato-07-alpha: hsla(8, 99.8%, 54.8%, 0.434);
   --rx-tomato-08-alpha: hsla(10, 99.5%, 41.8%, 0.499);
-  --rx-tomato-08-alpha: hsla(10, 99.8%, 53.5%, 0.598);
-  --rx-tomato-09-alpha: hsla(10, 100%, 59.7%, 0.885);
   --rx-tomato-09-alpha: hsla(10, 99.9%, 43.8%, 0.820);
   --rx-tomato-10-alpha: hsla(10, 100%, 41.8%, 0.859);
-  --rx-tomato-10-alpha: hsla(10, 100%, 63.6%, 0.916);
-  --rx-tomato-11-alpha: hsla(10, 99.7%, 66.4%, 0.939);
   --rx-tomato-11-alpha: hsla(10, 99.9%, 38.8%, 0.922);
   --rx-tomato-12-alpha: hsla(10, 99.0%, 7.4%, 0.934);
-  --rx-tomato-12-alpha: hsla(12, 100%, 97.1%, 0.980);
-  --rx-violet-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-violet-01-alpha: hsla(270, 94.3%, 34.6%, 0.012);
   --rx-violet-02-alpha: hsla(252, 100%, 51.0%, 0.020);
-  --rx-violet-02-alpha: hsla(258, 98.2%, 61.0%, 0.054);
-  --rx-violet-03-alpha: hsla(252, 98.8%, 65.8%, 0.148);
   --rx-violet-03-alpha: hsla(254, 100%, 50.0%, 0.051);
   --rx-violet-04-alpha: hsla(251, 98.3%, 48.2%, 0.087);
-  --rx-violet-04-alpha: hsla(253, 99.7%, 65.7%, 0.219);
   --rx-violet-05-alpha: hsla(252, 99.0%, 45.7%, 0.130);
-  --rx-violet-05-alpha: hsla(252, 99.7%, 66.4%, 0.286);
   --rx-violet-06-alpha: hsla(251, 99.1%, 44.0%, 0.189);
-  --rx-violet-06-alpha: hsla(251, 99.7%, 66.2%, 0.371);
-  --rx-violet-07-alpha: hsla(250, 99.7%, 66.3%, 0.514);
   --rx-violet-07-alpha: hsla(252, 99.5%, 41.7%, 0.279);
-  --rx-violet-08-alpha: hsla(250, 99.7%, 66.1%, 0.733);
   --rx-violet-08-alpha: hsla(252, 100%, 40.7%, 0.400);
   --rx-violet-09-alpha: hsla(252, 99.9%, 35.8%, 0.663);
-  --rx-violet-09-alpha: hsla(252, 99.9%, 70.3%, 0.786);
   --rx-violet-10-alpha: hsla(251, 99.6%, 32.5%, 0.691);
-  --rx-violet-10-alpha: hsla(251, 99.9%, 72.9%, 0.844);
-  --rx-violet-11-alpha: hsla(250, 100%, 77.9%, 0.980);
   --rx-violet-11-alpha: hsla(250, 99.8%, 28.4%, 0.726);
-  --rx-violet-12-alpha: hsla(254, 100%, 97.5%, 0.980);
   --rx-violet-12-alpha: hsla(254, 99.5%, 11.9%, 0.926);
   --rx-white-01-alpha: hsla(0, 0%, 100%, 0);
   --rx-white-02-alpha: hsla(0, 0%, 100%, 0.013);
@@ -1011,30 +686,18 @@
   --rx-white-10-alpha: hsla(0, 0%, 100%, 0.446);
   --rx-white-11-alpha: hsla(0, 0%, 100%, 0.592);
   --rx-white-12-alpha: hsla(0, 0%, 100%, 0.923);
-  --rx-yellow-01-alpha: hsla(0, 0%, 0%, 0);
   --rx-yellow-01-alpha: hsla(60, 94.3%, 34.6%, 0.024);
-  --rx-yellow-02-alpha: hsla(49, 100%, 49.1%, 0.027);
   --rx-yellow-02-alpha: hsla(52, 100%, 50.4%, 0.091);
-  --rx-yellow-03-alpha: hsla(45, 100%, 49.7%, 0.071);
   --rx-yellow-03-alpha: hsla(55, 100%, 50.2%, 0.181);
-  --rx-yellow-04-alpha: hsla(46, 100%, 49.7%, 0.111);
   --rx-yellow-04-alpha: hsla(54, 100%, 50.1%, 0.267);
-  --rx-yellow-05-alpha: hsla(47, 100%, 49.9%, 0.150);
   --rx-yellow-05-alpha: hsla(52, 99.9%, 49.5%, 0.357);
   --rx-yellow-06-alpha: hsla(50, 100%, 47.4%, 0.451);
-  --rx-yellow-06-alpha: hsla(51, 100%, 49.8%, 0.199);
   --rx-yellow-07-alpha: hsla(47, 99.8%, 44.6%, 0.577);
-  --rx-yellow-07-alpha: hsla(51, 99.8%, 53.6%, 0.269);
   --rx-yellow-08-alpha: hsla(48, 100%, 46.0%, 0.980);
-  --rx-yellow-08-alpha: hsla(51, 100%, 49.9%, 0.371);
   --rx-yellow-09-alpha: hsla(53, 100%, 48.0%, 0.961);
-  --rx-yellow-09-alpha: hsla(53, 100%, 52.0%, 0.956);
   --rx-yellow-10-alpha: hsla(50, 100%, 48.4%, 0.980);
-  --rx-yellow-10-alpha: hsla(56, 100%, 68.4%, 0.980);
   --rx-yellow-11-alpha: hsla(42, 100%, 28.6%, 0.980);
-  --rx-yellow-11-alpha: hsla(48, 100%, 50.0%, 0.934);
   --rx-yellow-12-alpha: hsla(41, 98.9%, 8.0%, 0.942);
-  --rx-yellow-12-alpha: hsla(60, 100%, 91.8%, 0.980);
 }
 
 html.dark, html[data-theme=dark] {

src/main/frontend/colors.cljs

@@ -1582,3 +1582,6 @@
 (defn unset-radix []
   (when-let [style-tag (js/document.querySelector "style#color-variables")]
     (js/document.head.removeChild style-tag)))
+
+
+

src/main/frontend/components/block.cljs

@@ -3084,7 +3084,12 @@
           attr (when language
                  {:data-lang language})
           code (apply str lines)
+          theme-key (str (state/sub :ui/theme) "/" 
+                         (state/sub :ui/system-theme?) "/" 
+                         (state/sub :ui/radix-color) "/" 
+                         (state/sub :ui/custom-theme))
           [inside-portal? set-inside-portal?] (rum/use-state nil)]
+      (js/console.log "actual theme-key" theme-key)
       (cond
         html-export?
         (highlight/html-export attr code)
@@ -3105,7 +3110,7 @@
 
              :else
              [:<>
-              (lazy-editor/editor config (str (d/squuid)) attr code options)
+              (lazy-editor/editor config (str (d/squuid)) attr code (assoc options :theme-key theme-key))
               (let [options (:options options) block (:block config)]
                 (when (and (= language "clojure") (contains? (set options) ":results"))
                   (sci/eval-result code block)))])])))))

src/main/frontend/components/settings.cljs

@@ -308,7 +308,7 @@
                              :desc       (ui/render-keyboard-shortcut (shortcut-helper/gen-shortcut-seq :ui/toggle-theme))})))
 
 (defn theme-row [t dark?]
-  (let [color-accent (state/sub :color/accent)
+  (let [color-accent (state/sub :ui/radix-color)
         pick-theme [:div.grid {:style {:grid-template-columns "repeat(17, 1fr)" 
                                        :gap "0.75rem"
                                        :overflow-x :scroll 
@@ -347,7 +347,7 @@
                               :action     pick-theme})])) 
 
 (defn theme-gradient-row [t dark? color-accent]
-  (let [color-gradient (state/sub :color/gradient)
+  (let [color-gradient (state/sub :ui/radix-gradient)
         pick-gradient [:div {:class "grid grid-cols-7 gap-2 overflow-x-auto"}
                        [:div {:class (cond-> "theme-gradient-row--gradient-swatch" 
                                        (= 1 color-gradient) (str " selected"))
@@ -698,16 +698,17 @@
   (let [preferred-language (state/sub [:preferred-language])
         theme (state/sub :ui/theme)
         dark? (= "dark" theme)
+        show-radix-themes? true
         system-theme? (state/sub :ui/system-theme?)
         switch-theme (if dark? "light" "dark")
-        color-accent (state/sub :color/accent)]
+        color-accent (state/sub :ui/radix-color)]
     [:div.panel-wrap.is-general
      (version-row t version)
      (language-row t preferred-language)
      (theme-modes-row t switch-theme system-theme? dark?)
      (when (and (util/electron?) (not util/mac?)) (native-titlebar-row t))
-     ; (theme-row t dark?)
-     ; (when color-accent (theme-gradient-row t dark? color-accent))
+     (when show-radix-themes? (theme-row t dark?))
+     (when (and show-radix-themes? color-accent) (theme-gradient-row t dark? color-accent))
      (when (config/global-config-enabled?) (edit-global-config-edn))
      (when current-repo (edit-config-edn))
      (when current-repo (edit-custom-css))

src/main/frontend/extensions/code.cljs

@@ -387,7 +387,10 @@
         lisp-like? (contains? #{"scheme" "lisp" "clojure" "edn"} mode)
         config-edit? (and (:file? config) (string/ends-with? (:file-path config) "config.edn"))
         textarea (gdom/getElement id)
-        default-cm-options {:theme (str "solarized " theme)
+        radix-color (state/sub :ui/radix-color)
+        default-cm-options {:theme (if radix-color 
+                                     (str "lsradix " theme)
+                                     (str "solarized " theme))
                             :autoCloseBrackets true
                             :lineNumbers true
                             :matchBrackets lisp-like?
@@ -412,8 +415,12 @@
                           (when config-edit?
                             {:hintOptions {}})
                           user-options)
+        theme-mode (state/sub :ui/theme)
+        system-theme-mode (state/sub :ui/system-theme)
         editor (when textarea
-                 (from-textarea textarea (clj->js cm-options)))]
+                 (from-textarea textarea (clj->js cm-options)))
+        element-key (str "editor-" id "-" radix-color "-" theme-mode "-" system-theme-mode "-" theme)]
+    (js/console.log "element-key: " element-key theme)
     (when editor
       (let [textarea-ref (rum/ref-node state textarea-ref-name)
             element (.getWrapperElement editor)]
@@ -470,17 +477,29 @@
       (let [editor (render! state)]
         (reset! editor-atom editor)))))
 
+(defn get-theme! []
+  (if (state/sub :ui/radix-color)
+    (str "lsradix " (state/sub :ui/theme))
+    (str "solarized " (state/sub :ui/theme))))
+
 (rum/defcs editor < rum/reactive
   {:init (fn [state]
            (let [[_ _ _ code _ options] (:rum/args state)]
              (assoc state
                     :editor-atom (atom nil)
                     :calc-atom (atom (calc/eval-lines code))
-                    :code-options (atom options))))
+                    :code-options (atom options)
+                    :last-theme (atom (get-theme!)))))
    :did-mount (fn [state]
                 (load-and-render! state)
                 state)
    :did-update (fn [state]
+                 (let [next-theme (get-theme!)
+                       last-theme @(:last-theme state)
+                       editor (some-> state :editor-atom deref)]
+                   (when (and editor (not= next-theme last-theme)) 
+                     (reset! (:last-theme state) next-theme)
+                     (.setOption editor "theme" next-theme)))
                  (reset! (:code-options state) (last (:rum/args state)))
                  (when-not (:file? (first (:rum/args state)))
                    (let [code (nth (:rum/args state) 3)

src/main/frontend/handler.cljs

@@ -12,6 +12,7 @@
             [frontend.components.whiteboard :as whiteboard]
             [frontend.config :as config]
             [frontend.context.i18n :as i18n :refer [t]]
+            [frontend.colors :as colors]
             [frontend.db :as db]
             [frontend.db.conn :as conn]
             [frontend.db.persist :as db-persist]
@@ -49,13 +50,13 @@
   (set! js/window.onerror
         (fn [message, _source, _lineno, _colno, error]
           (when-not (error/ignored? message)
-            (log/error :exception error)
+            (log/error :exception error)))))
             ;; (notification/show!
             ;;  (str "message=" message "\nsource=" source "\nlineno=" lineno "\ncolno=" colno "\nerror=" error)
             ;;  :error
             ;;  ;; Don't auto-hide
             ;;  false)
-            ))))
+            
 
 
 (defn- watch-for-date!
@@ -205,6 +206,8 @@
   (instrument/init)
   (state/set-online! js/navigator.onLine)
   (set-network-watcher!)
+  (when-let [radix-color (state/get-color-accent)]
+    (colors/set-radix radix-color (state/get-color-gradient)))
 
   (util/indexeddb-check?
    (fn [_error]

src/main/frontend/state.cljs

@@ -82,6 +82,8 @@
      :ui/system-theme?                      ((fnil identity (or util/mac? util/win32? false)) (storage/get :ui/system-theme?))
      :ui/custom-theme                       (or (storage/get :ui/custom-theme) {:light {:mode "light"} :dark {:mode "dark"}})
      :ui/wide-mode?                         (storage/get :ui/wide-mode)
+     :ui/radix-color                        (storage/get :ui/radix-color)
+     :ui/radix-gradient                     (storage/get :ui/radix-gradient)
 
      ;; ui/collapsed-blocks is to separate the collapse/expand state from db for:
      ;; 1. right sidebar
@@ -288,10 +290,7 @@
      :whiteboard/pending-tx-data            {}
      :history/page-only-mode?               false
      ;; db tx-id -> editor cursor
-     :history/tx->editor-cursor             {}
-
-     ;; new theming 
-     :color/accent                           nil})))
+     :history/tx->editor-cursor             {}})))
 
 ;; Block ast state
 ;; ===============
@@ -2130,24 +2129,27 @@ Similar to re-frame subscriptions"
   (storage/remove :user-groups))
 
 (defn get-color-accent []
-  (get @state :color/accent))
+  (get @state :ui/radix-color))
 
 (defn get-color-gradient []
-  (get @state :color/gradient 1))
+  (get @state :ui/radix-gradient 1))
 
 (defn set-color-accent! [color]
-  (swap! state assoc :color/accent color)
+  (swap! state assoc :ui/radix-color color)
+  (storage/set :ui/radix-color color)
   (colors/set-radix color (get-color-gradient)))
 
 (defn set-color-gradient! [steps]
-  (swap! state assoc :color/gradient steps)
+  (swap! state assoc :ui/radix-gradient steps)
+  (storage/set :ui/radix-gradient steps)
   (colors/set-radix (get-color-accent) steps))
 
 (defn unset-color-accent! []
-  (swap! state assoc :color/accent nil)
+  (swap! state assoc :ui/radix-color nil)
+  (storage/remove :ui/radix-color)
   (colors/unset-radix))
 
 (defn unset-color-gradient! []
-  (swap! state assoc :color/gradient nil)
-  (colors/unset-radix))
+  (swap! state assoc :ui/radix-gradient nil)
+  (storage/remove :ui/radix-gradient))
 

tailwind.all.css

@@ -14,6 +14,7 @@
 @import "katex/dist/katex.min.css";
 @import "resources/css/codemirror.min.css";
 @import "resources/css/codemirror.solarized.css";
+@import "resources/css/codemirror.lsradix.css";
 @import "resources/css/show-hint.css";
 
 @import "resources/css/radix.css";