chore: remove unnecessary postcss-functions

package.json

@@ -27,7 +27,6 @@
         "playwright": "=1.58.2",
         "postcss": "^8.5.8",
         "postcss-cli": "11.0.1",
-        "postcss-functions": "^4.0.2",
         "postcss-import": "16.1.1",
         "postcss-import-ext-glob": "2.1.1",
         "postcss-nested": "7.0.2",

postcss.config.js

@@ -1,25 +1,8 @@
-const or = (...args) => {
-  const variableNames = args.filter(x => x.startsWith('--')) 
-  const initialValue = args.filter(x => !x.startsWith('--'))[0]
-
-  return variableNames.reduceRight((memo, current) => {
-    if (memo && current) { 
-      return `var(${current.trim()}, ${memo})` 
-    } else if (current) {
-      return `var(${current.trim()})`
-    } else if (memo) {
-      return memo
-    }
-  }, initialValue)
-}
-
-
 module.exports = {
   plugins: {
     'autoprefixer': {},
     'postcss-import-ext-glob': {},
     'postcss-import': {},
-    'postcss-functions': { functions: { or } },
     'tailwindcss/nesting': 'postcss-nested',
     tailwindcss: {},
     ...(process.env.NODE_ENV === 'production' ? { cssnano: {} } : {})

resources/css/codemirror.lsradix.css

@@ -8,24 +8,24 @@ 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-11, #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); }
+.lsradix.base03        { color: var(--lx-gray-01, #002b36); }
+.dark .lsradix.base03  { color: var(--lx-gray-02, #002b36); }
+.lsradix.base02        { color: var(--lx-gray-02, #073642); }
+.dark .lsradix.base02  { color: var(--lx-gray-01, #073642); }
+.lsradix.base01        { color: var(--lx-gray-03, #586e75); }
+.lsradix.base00        { color: var(--lx-gray-04, #657b83); }
+.lsradix.base0         { color: var(--lx-gray-09, #839496); }
+.lsradix.base1         { color: var(--lx-gray-10, #93a1a1); }
+.lsradix.base2         { color: var(--lx-gray-11, #eee8d5); }
+.lsradix.base3         { color: var(--lx-gray-11, #fdf6e3); }
+.lsradix.solar-yellow  { color: var(--rx-yellow-11, #b58900); }
+.lsradix.solar-orange  { color: var(--rx-orange-11, #cb4b16); }
+.lsradix.solar-red     { color: var(--rx-red-11, #dc322f); }
+.lsradix.solar-magenta { color: var(--rx-pink-11, #d33682); }
+.lsradix.solar-violet  { color: var(--rx-purple-11, #6c71c4); }
+.lsradix.solar-blue    { color: var(--rx-blue-11, #268bd2); }
+.lsradix.solar-cyan    { color: var(--rx-sky-11, #2aa198); }
+.lsradix.solar-green   { color: var(--rx-grass-11, #859900); }
 
 /* Color scheme for code-mirror */
 
@@ -52,42 +52,42 @@ http://ethanschoonover.com/lsradix/img/lsradix-palette.png
   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-header { color: var(--lx-gray-03, #586e75); }
+.cm-s-lsradix .cm-quote { color: var(--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-keyword { color: var(--rx-orange-11, #cb4b16); }
+.cm-s-lsradix .cm-atom { color: var(--rx-pink-11, #d33682); }
+.cm-s-lsradix .cm-number { color: var(--rx-pink-11, #d33682); }
+.cm-s-lsradix .cm-def { color: var(--rx-sky-11, #2aa198); }
 
-/* .cm-s-lsradix .cm-variable { color: or(--lx-gray-09, #839496); } */
-.cm-s-lsradix .cm-variable { color: or(--lx-gray-12, #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-variable { color: var(--lx-gray-09, #839496); } */
+.cm-s-lsradix .cm-variable { color: var(--lx-gray-12, #839496); }
+.cm-s-lsradix .cm-variable-2 { color: var(--rx-yellow-11, #b58900); }
+.cm-s-lsradix .cm-variable-3, .cm-s-lsradix .cm-type { color: var(--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-property { color: var(--rx-sky-11, #2aa198); }
+.cm-s-lsradix .cm-operator { color: var(--rx-purple-11, #6c71c4); }
 
-.cm-s-lsradix .cm-comment { color: or(--lx-gray-10, #586e75); font-style:italic; }
+.cm-s-lsradix .cm-comment { color: var(--lx-gray-10, #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-string { color: var(--rx-grass-11, #859900); }
+.cm-s-lsradix .cm-string-2 { color: var(--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-meta { color: var(--rx-grass-11, #859900); }
+.cm-s-lsradix .cm-qualifier { color: var(--rx-yellow-11, #b58900); }
+.cm-s-lsradix .cm-builtin { color: var(--rx-pink-11, #d33682); }
+.cm-s-lsradix .cm-bracket { color: var(--rx-orange-11, #cb4b16); }
+.cm-s-lsradix .CodeMirror-matchingbracket { color: var(--rx-grass-11, #859900); }
+.cm-s-lsradix .CodeMirror-nonmatchingbracket { color: var(--rx-red-11, #dc322f); }
+.cm-s-lsradix .cm-tag { color: var(--lx-gray-10, #93a1a1); }
+.cm-s-lsradix .cm-attribute { color: var(--rx-sky-11, #2aa198); }
 .cm-s-lsradix .cm-hr {
   color: transparent;
-  border-top: 1px solid or(--lx-gray-03, #586e75);
+  border-top: 1px solid var(--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-link { color: var(--lx-gray-10, #93a1a1); cursor: pointer; }
+.cm-s-lsradix .cm-special { color: var(--rx-purple-11, #6c71c4); }
 .cm-s-lsradix .cm-em {
   color: #999;
   text-decoration: underline;
@@ -95,18 +95,18 @@ http://ethanschoonover.com/lsradix/img/lsradix-palette.png
 }
 .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);
+  /* color: var(--lx-gray-03, #586e75); */
+  color: var(--lx-gray-10, #586e75);
+  border-bottom: 1px dotted var(--rx-red-11, #dc322f);
 }
 
-.cm-s-lsradix.cm-s-dark div.CodeMirror-selected { background: or(--lx-gray-06, rgb(4 38 47 / 99%)); }
-.cm-s-lsradix.cm-s-dark.CodeMirror ::selection { background: or(--lx-gray-06, rgb(4 38 47 / 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: or(--lx-gray-06, rgb(4 38 47 / 99%)); }
+.cm-s-lsradix.cm-s-dark div.CodeMirror-selected { background: var(--lx-gray-06, rgb(4 38 47 / 99%)); }
+.cm-s-lsradix.cm-s-dark.CodeMirror ::selection { background: var(--lx-gray-06, rgb(4 38 47 / 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: var(--lx-gray-06, rgb(4 38 47 / 99%)); }
 
-.cm-s-lsradix.cm-s-light div.CodeMirror-selected { background: or(--lx-gray-06, #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-06, #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-06, #eee8d5); }
+.cm-s-lsradix.cm-s-light div.CodeMirror-selected { background: var(--lx-gray-06, #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: var(--lx-gray-06, #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: var(--lx-gray-06, #eee8d5); }
 
 /* Editor styling */
 
@@ -140,12 +140,12 @@ http://ethanschoonover.com/lsradix/img/lsradix-palette.png
 .cm-s-lsradix .CodeMirror-linenumber {
   padding: 0 5px;
 }
-.cm-s-lsradix .CodeMirror-guttermarker-subtle { color: or(--lx-gray-03, #586e75); }
+.cm-s-lsradix .CodeMirror-guttermarker-subtle { color: var(--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.cm-s-light .CodeMirror-guttermarker { color: var(--rx-orange-11, #cb4b16); }
 
 .cm-s-lsradix .CodeMirror-gutter .CodeMirror-gutter-text {
-  color: or(--lx-gray-03, #586e75);
+  color: var(--lx-gray-03, #586e75);
 }
 
 /* Cursor */
@@ -154,8 +154,8 @@ http://ethanschoonover.com/lsradix/img/lsradix-palette.png
 /* 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); }
+.cm-s-lsradix.cm-s-dark.cm-fat-cursor .CodeMirror-cursor { background: var(--lx-gray-03, #586e75); }
+.cm-s-lsradix.cm-s-dark .cm-animate-fat-cursor { background-color: var(--lx-gray-03, #586e75); }
 
 /* Active line */
 .cm-s-lsradix.cm-s-dark .CodeMirror-activeline-background {

resources/css/shui.css

@@ -452,11 +452,11 @@ kbd.shui-shortcut-key-pressed,
 }
 
 .ui__list-item-highlighted-span {
-  background-color: or(--lx-accent-06, --color-level-4);
+  background-color: var(--lx-accent-06, var(--color-level-4));
 }
 
 .dark .ui__list-item-highlighted-span {
-  background-color: or(--lx-accent-08-alpha, --color-level-4);
+  background-color: var(--lx-accent-08-alpha, var(--color-level-4));
 }
 
 .ui__dropdown-menu-content, div[data-radix-menu-content],

src/main/frontend/common.css

@@ -372,7 +372,7 @@ button.menu {
 .menu-link:hover,
 button.pull:hover,
 button.menu:focus {
-  background-color: or(--lx-gray-05, --ls-menu-hover-color, --rx-gray-05);
+  background-color: var(--lx-gray-05, var(--ls-menu-hover-color, var(--rx-gray-05)));
 }
 
 .menu-links-wrapper,

src/main/frontend/components/container.css

@@ -590,7 +590,7 @@
     top: 0;
     left: 0;
     right: 0;
-    background-color: or(--ls-right-sidebar-topbar-color, --lx-gray-02, --ls-secondary-background-color, #d8e1e8);
+    background-color: var(--ls-right-sidebar-topbar-color, var(--lx-gray-02, var(--ls-secondary-background-color, #d8e1e8)));
     z-index: 999;
     user-select: none;
     -webkit-app-region: drag;

src/main/frontend/ui.css

@@ -66,8 +66,8 @@
   .notification-area {
     @apply border;
 
-    background-color: or(--ls-notification-background, --lx-gray-02, --ls-tertiary-background-color, --rx-gray-03);
-    color: or(--ls-notification-text-color, --lx-gray-11, --ls-primary-text-color, --rx-gray-11);
+    background-color: var(--ls-notification-background, var(--lx-gray-02, var(--ls-tertiary-background-color, var(--rx-gray-03))));
+    color: var(--ls-notification-text-color, var(--lx-gray-11, var(--ls-primary-text-color, var(--rx-gray-11))));
 
     &:has(.ls-wrap-widen) {
       @apply w-[680px] max-w-[96vw];
@@ -106,8 +106,8 @@
   }
 
   &-overlay div {
-    --from: or(--ls-modal-overlay-gradient-start, --lx-gray-03, --ls-primary-background-color);
-    --to: or(--ls-modal-overlay-gradient-end, --lx-gray-06, --ls-quaternary-background-color);
+    --from: var(--ls-modal-overlay-gradient-start, var(--lx-gray-03, var(--ls-primary-background-color)));
+    --to: var(--ls-modal-overlay-gradient-end, var(--lx-gray-06, var(--ls-quaternary-background-color)));
     background-image: linear-gradient(to bottom, var(--from), var(--to));
   }
 
@@ -268,7 +268,7 @@ html.is-mobile {
 }
 
 .bg-quaternary {
-  background-color: or(--ls-bg-quaternary, --lx-gray-06, --ls-quaternary-background-color);
+  background-color: var(--ls-bg-quaternary, var(--lx-gray-06, var(--ls-quaternary-background-color)));
 }
 
 .ui__icon {

yarn.lock

@@ -6315,13 +6315,6 @@ postcss-discard-overridden@^7.0.1:
   resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-7.0.1.tgz#bd9c9bc5e4548d3b6e67e7f8d64f2c9d745ae2a0"
   integrity sha512-7c3MMjjSZ/qYrx3uc1940GSOzN1Iqjtlqe8uoSg+qdVPYyRb0TILSqqmtlSFuE4mTDECwsm397Ya7iXGzfF7lg==
 
-postcss-functions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-functions/-/postcss-functions-4.0.2.tgz#23a7d100f507890042fbd0305f963554e6d1ce6a"
-  integrity sha512-htDZN6t97uW4GBXquTsz/DVaNVAHtHx5tLCALquVM2u58UwHki+RwHbANKiiI0ImA8T7Iml2MnvLUM7aGtlpqA==
-  dependencies:
-    postcss-value-parser "^4.0.0"
-
 postcss-html@^0.36.0:
   version "0.36.0"
   resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz#b40913f94eaacc2453fd30a1327ad6ee1f88b204"