ada-ui 0.0.0-beta-v5-20240723120941 → 0.0.0-beta-v5-20240723124838

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # ada-ui
 
-## 0.0.0-beta-v5-20240723120941
+## 0.0.0-beta-v5-20240723124838
 
 ### Major Changes
 

package/css/ada.blue-old.css

@@ -0,0 +1 @@
+.warn,.accent,.shade2,.shade1,.primary,:root{--fg100: lch(var(--100));--fg200: lch(var(--200));--bg600: lch(var(--600));--bg700: lch(var(--700));--bg800: lch(var(--800));--bg900: lch(var(--900));--panel-background: lch(var(--800) / 0.1)}.primary,:root{--h: 205;--s: 80%;--l: 23%;--h-light: 205;--s-light: 80%;--l-light: 40%;--h-fg: var(--h);--s-fg: 100%;--l-fg: 89%}:root{--bg: hsl(207, 61%, 7%)}.shade1{--h: 198;--s: 90%;--l: 30%;--h-light: 198;--s-light: 90%;--l-light: 58%;--h-fg: var(--h);--s-fg: 100%;--l-fg: 89%}.shade2{--h: 185;--s: 50%;--l: 30%;--h-light: 185;--s-light: 50%;--l-light: 50%;--h-fg: var(--h);--s-fg: 100%;--l-fg: 89%}.accent{--h: 146;--s: 58%;--l: 20%;--h-light: 146;--s-light: 58%;--l-light: 48%;--h-fg: var(--h);--s-fg: 100%;--l-fg: 89%}.warn{--h: 0;--s: 100%;--l: 28%;--h-light: 0;--s-light: 85%;--l-light: 48%;--h-fg: var(--h);--s-fg: 100%;--l-fg: 89%}

package/css/ada.blue.css

@@ -1 +1 @@
-.warn,.accent,.shade2,.shade1,.primary,:root{--fg100: lch(var(--100));--fg200: lch(var(--200));--bg600: lch(var(--600));--bg700: lch(var(--700));--bg800: lch(var(--800));--bg900: lch(var(--900));--panel-background: lch(var(--800) / 0.1)}.primary,:root{--h: 205;--s: 80%;--l: 23%;--h-light: 205;--s-light: 80%;--l-light: 40%;--h-fg: var(--h);--s-fg: 100%;--l-fg: 89%}:root{--bg: hsl(207, 61%, 7%)}.shade1{--h: 198;--s: 90%;--l: 30%;--h-light: 198;--s-light: 90%;--l-light: 58%;--h-fg: var(--h);--s-fg: 100%;--l-fg: 89%}.shade2{--h: 185;--s: 50%;--l: 30%;--h-light: 185;--s-light: 50%;--l-light: 50%;--h-fg: var(--h);--s-fg: 100%;--l-fg: 89%}.accent{--h: 146;--s: 58%;--l: 20%;--h-light: 146;--s-light: 58%;--l-light: 48%;--h-fg: var(--h);--s-fg: 100%;--l-fg: 89%}.warn{--h: 0;--s: 100%;--l: 28%;--h-light: 0;--s-light: 85%;--l-light: 48%;--h-fg: var(--h);--s-fg: 100%;--l-fg: 89%}
+.warn,.accent-alt,.accent,.primary-alt,.primary,:root{--fg100: lch(var(--100));--fg200: lch(var(--200));--bg600: lch(var(--600));--bg700: lch(var(--700));--bg800: lch(var(--800));--bg900: lch(var(--900));--panel-background: lch(var(--800) / 0.1)}:root{--bg-body: lch(5 8 260)}.primary,:root{--100: 90 17 260;--200: 70 17 260;--600: 36 36 260;--700: 29 30 260;--800: 26 29 260;--900: 19 23 260}.primary-alt{--100: 90 17 246;--200: 70 17 246;--600: 51 40 246;--700: 44 34 246;--800: 41 33 246;--900: 34 27 246}.accent{--100: 90 17 152;--200: 70 17 152;--600: 40 37 152;--700: 33 31 152;--800: 30 30 152;--900: 23 24 152}.accent-alt{--100: 90 17 206;--200: 70 17 206;--600: 52 30 206;--700: 45 24 206;--800: 42 23 206;--900: 35 17 206}.warn{--100: 90 17 40;--200: 70 17 40;--600: 40 75 40;--700: 33 69 40;--800: 30 68 40;--900: 23 62 40}

package/css/ada.css

@@ -1 +1 @@
-*,::before,::after{box-sizing:border-box;border-width:0;border-style:solid;border-color:currentColor}html{-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}body{margin:0}h1,h2,h3,h4,h5,h6,p,pre{font-size:inherit;font-weight:inherit;margin:0}a{color:inherit;text-decoration:inherit}button,input,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button;background-color:transparent;background-image:none}button,[role=button]{cursor:pointer}:disabled{cursor:default}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}ol,ul,menu{list-style:none;margin:0;padding:0}:root{--font-family: "Open Sans", sans-serif;--font-size: 16px;--box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.4);--gap-sm: 4px;--gap: 6px;--spacing: 0.8rem;--border-width-sm: 0.08rem;--border-width: 0.15rem;--focus-border-width: 0.15rem}@media screen and (min-width: 768px){:root{--font-size: 14px}}html{font-family:var(--font-family);font-weight:400}html,body{font-size:var(--font-size);height:100%;min-height:100%}body{padding:var(--spacing);background:var(--bg-body);color:var(--fg100)}h1,h2,h3,h4,h5,h6,.panel>header{font-weight:300;text-shadow:0 0 4px var(--bg700);color:var(--fg100)}h1{font-size:3rem;margin:1rem 0 2rem 0}h1.m-0{margin:0}h2{font-size:2rem;margin:1rem 0 1.5rem 0}h2.m-0{margin:0}h3{font-size:1.5rem;margin:.5rem 0 1.5rem 0}h3.m-0{margin:0}h4{font-size:1.2rem;margin:.5rem 0 .5rem 0}h4.m-0{margin:0}.command{overflow:hidden;outline:none;color:var(--fg100);font-family:inherit;cursor:pointer;user-select:none;vertical-align:middle;transition:border-color .15s ease-in-out,background-color .15s ease-in-out;background-color:var(--bg900);box-shadow:var(--box-shadow);display:grid;align-items:end;justify-items:end;text-align:end;font-size:1.1rem;border-style:solid;border-color:transparent;border-width:0 0 0 var(--focus-border-width);padding:.25rem .6rem;min-height:3rem;min-width:3rem;border-radius:.3rem}.command:disabled{opacity:.6;filter:saturate(0.2);cursor:default;pointer-events:none}.command.flash{animation:flash-background 1s ease-in-out infinite}.command.outline{background-color:transparent;border-color:var(--bg800);border-width:var(--border-width)}.command.outline.flash{animation-name:flash-border}.command:focus{border-left-color:var(--bg600)}.command:active{border-color:var(--bg600);background-color:var(--bg600);animation-play-state:paused}.compound-command{display:inline-grid;grid-auto-flow:column;gap:var(--gap)}.compound-command>.spacer{background-color:var(--bg900);box-shadow:var(--box-shadow);min-width:1rem;min-height:1rem}.compound-command>.spacer.outline{background-color:transparent;border:var(--border-width) solid var(--bg800)}.compound-command>.text{font-size:2rem;line-height:2rem;align-self:center;padding:.25rem}.compound-command>button:first-child,.compound-command .spacer:first-child{border-radius:.3rem 0 0 .3rem}.compound-command>button:not(:first-child):not(:last-child),.compound-command .spacer:not(:first-child):not(:last-child){border-radius:0}.compound-command>button:last-child,.compound-command .spacer:last-child{border-radius:0 .3rem .3rem 0}.compound-command.vertical{grid-auto-flow:row}.compound-command.vertical>.text{justify-self:center}.compound-command.vertical>button:first-child,.compound-command.vertical .spacer:first-child{border-radius:.3rem .3rem 0 0}.compound-command.vertical>button:last-child,.compound-command.vertical .spacer:last-child{border-radius:0 0 .3rem .3rem}@keyframes flash-background{50%{background-color:var(--bg700)}}@keyframes flash-border{50%{border-color:var(--bg600)}}.input{border-radius:.3rem;box-shadow:var(--box-shadow);outline:none;border:var(--border-width-sm) solid var(--bg700);color:var(--fg100);font-family:inherit;background-color:transparent;transition:border-color .15s ease-in-out;padding:.8rem;font-size:1.1rem}.input:focus{border:var(--border-width-sm) solid var(--bg600)}.input:disabled{opacity:.4;filter:saturate(0.6);cursor:default;pointer-events:none}.panel{background:var(--panel-background);box-shadow:var(--box-shadow);border-radius:.3rem;display:grid;grid-template-rows:auto 1fr auto;overflow:auto;margin:.5rem}.panel>header{position:relative;font-size:1.5rem;padding:.4rem .6rem}.panel>header:before{--corner-border-width: var(--border-width);content:"";border-style:solid;border-color:var(--bg800);position:absolute;height:1rem;width:1rem;z-index:2;border-width:var(--corner-border-width) 0 0 var(--corner-border-width);border-radius:.3rem 0 0 0;left:0;top:0}.panel>header:after{--corner-border-width: var(--border-width);content:"";border-style:solid;border-color:var(--bg800);position:absolute;height:1rem;width:1rem;z-index:2;border-width:var(--corner-border-width) var(--corner-border-width) 0 0;border-radius:0 .3rem 0 0;right:0;top:0}.panel>article{z-index:1;padding:0 .6rem;overflow:auto}.panel>article::-webkit-scrollbar{width:var(--border-width);background:transparent}.panel>article::-webkit-scrollbar-thumb{min-width:1rem;border-style:solid;border-color:transparent;border-width:var(--border-width);background:var(--bg800);box-sizing:border-box;background-clip:border-box}.panel>footer{position:relative;color:var(--fg200);padding:.4rem .6rem;font-size:.75rem;text-align:right}.panel>footer:before{--corner-border-width: var(--border-width);content:"";border-style:solid;border-color:var(--bg800);position:absolute;height:1rem;width:1rem;z-index:2;border-width:0 0 var(--corner-border-width) var(--corner-border-width);border-radius:0 0 0 .3rem;left:0;bottom:0}.panel>footer:after{--corner-border-width: var(--border-width);content:"";border-style:solid;border-color:var(--bg800);position:absolute;height:1rem;width:1rem;z-index:2;border-width:0 var(--corner-border-width) var(--corner-border-width) 0;border-radius:0 0 .3rem 0;right:0;bottom:0}.spinner{display:inline-grid;justify-items:center;align-items:center;width:1em;height:1em;position:relative;box-sizing:border-box;animation:6s .5s rotate ease-in-out alternate infinite}.spinner:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border-style:solid;border-width:.05em;border-radius:50%;border-color:var(--bg800) transparent;animation:4s .5s inset1 ease-in-out infinite;box-shadow:0px 12px 10px -12px #000a,0px -12px 10px -12px #000a}.spinner:after{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border-style:solid;border-width:.05em;border-radius:50%;border-color:transparent var(--bg600);animation:4s .5s inset2 ease-in-out infinite;box-shadow:12px 0px 10px -12px #000a,-12px 0px 10px -12px #000a}@keyframes rotate{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}@keyframes inset1{0%{top:0;left:0;right:0;bottom:0;transform:rotate(0)}12.5%{top:.2em;left:.2em;right:.2em;bottom:.2em;transform:rotate(0)}37.5%{top:.2em;left:.2em;right:.2em;bottom:.2em;transform:rotate(180deg)}50%{top:0;left:0;right:0;bottom:0;transform:rotate(180deg)}100%{top:0;left:0;right:0;bottom:0;transform:rotate(180deg)}}@keyframes inset2{0%{top:0;left:0;right:0;bottom:0;transform:rotate(0)}50%{top:0;left:0;right:0;bottom:0;transform:rotate(0)}62.5%{top:.2em;left:.2em;right:.2em;bottom:.2em;transform:rotate(0)}87.5%{top:.2em;left:.2em;right:.2em;bottom:.2em;transform:rotate(180deg)}100%{top:0;left:0;right:0;bottom:0;transform:rotate(180deg)}}
+*,::before,::after{box-sizing:border-box;border-width:0;border-style:solid;border-color:currentColor}html{-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}body{margin:0}h1,h2,h3,h4,h5,h6,p,pre{font-size:inherit;font-weight:inherit;margin:0}a{color:inherit;text-decoration:inherit}button,input,select,textarea{font-family:inherit;font-feature-settings:inherit;font-variation-settings:inherit;font-size:100%;font-weight:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button;background-color:transparent;background-image:none}button,[role=button]{cursor:pointer}:disabled{cursor:default}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}ol,ul,menu{list-style:none;margin:0;padding:0}:root{--font-family: "Open Sans", sans-serif;--font-size: 16px;--box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.4);--gap-sm: 4px;--gap: 6px;--spacing: 0.8rem;--border-width-sm: 0.08rem;--border-width: 0.15rem;--focus-border-width: 0.15rem}@media screen and (min-width: 768px){:root{--font-size: 14px}}html{font-family:var(--font-family);font-weight:400}html,body{font-size:var(--font-size);height:100%;min-height:100%}body{padding:var(--spacing);background:var(--bg-body);color:var(--fg100)}h1,h2,h3,h4,h5,h6,.panel>header{font-weight:300;text-shadow:0 0 4px var(--bg700);color:var(--fg100)}h1{font-size:3rem;margin:1rem 0 2rem 0}h1.m-0{margin:0}h2{font-size:2rem;margin:1rem 0 1.5rem 0}h2.m-0{margin:0}h3{font-size:1.5rem;margin:.5rem 0 1.5rem 0}h3.m-0{margin:0}h4{font-size:1.2rem;margin:.5rem 0 .5rem 0}h4.m-0{margin:0}.command{overflow:hidden;outline:none;color:var(--fg100);font-family:inherit;cursor:pointer;user-select:none;vertical-align:middle;transition:border-color .15s ease-in-out,background-color .15s ease-in-out;background-color:var(--bg900);box-shadow:var(--box-shadow);display:grid;align-items:end;justify-items:end;text-align:end;font-size:1.1rem;border-style:solid;border-color:transparent;border-width:0 0 0 var(--focus-border-width);padding:.25rem .6rem;min-height:3rem;min-width:3rem;border-radius:.3rem}.command:disabled{opacity:.6;filter:saturate(0.2);cursor:default;pointer-events:none}.command.flash{animation:flash-background 1s ease-in-out infinite}.command.outline{background-color:transparent;border-color:var(--bg800);border-width:var(--border-width)}.command.outline.flash{animation-name:flash-border}.command:focus{border-left-color:var(--bg600)}.command:active{border-color:var(--bg600);background-color:var(--bg600);animation-play-state:paused}.compound-commands{display:inline-grid;grid-auto-flow:column;gap:var(--gap)}.compound-commands>.spacer{background-color:var(--bg900);box-shadow:var(--box-shadow);min-width:1rem;min-height:1rem}.compound-commands>.spacer.outline{background-color:transparent;border:var(--border-width) solid var(--bg800)}.compound-commands>.text{font-size:2rem;line-height:2rem;align-self:center;padding:.25rem}.compound-commands>button:first-child,.compound-commands .spacer:first-child{border-radius:.3rem 0 0 .3rem}.compound-commands>button:not(:first-child):not(:last-child),.compound-commands .spacer:not(:first-child):not(:last-child){border-radius:0}.compound-commands>button:last-child,.compound-commands .spacer:last-child{border-radius:0 .3rem .3rem 0}.compound-commands.vertical{grid-auto-flow:row}.compound-commands.vertical>.text{justify-self:center}.compound-commands.vertical>button:first-child,.compound-commands.vertical .spacer:first-child{border-radius:.3rem .3rem 0 0}.compound-commands.vertical>button:last-child,.compound-commands.vertical .spacer:last-child{border-radius:0 0 .3rem .3rem}@keyframes flash-background{50%{background-color:var(--bg700)}}@keyframes flash-border{50%{border-color:var(--bg600)}}.input{border-radius:.3rem;box-shadow:var(--box-shadow);outline:none;border:var(--border-width-sm) solid var(--bg700);color:var(--fg100);font-family:inherit;background-color:transparent;transition:border-color .15s ease-in-out;padding:.8rem;font-size:1.1rem}.input:focus{border:var(--border-width-sm) solid var(--bg600)}.input:disabled{opacity:.4;filter:saturate(0.6);cursor:default;pointer-events:none}.panel{background:var(--panel-background);box-shadow:var(--box-shadow);border-radius:.3rem;display:grid;grid-template-rows:auto 1fr auto;overflow:auto}.panel>header{position:relative;font-size:1.5rem;padding:.4rem .6rem}.panel>header:before{--corner-border-width: var(--border-width);content:"";border-style:solid;border-color:var(--bg800);position:absolute;height:1rem;width:1rem;z-index:2;border-width:var(--corner-border-width) 0 0 var(--corner-border-width);border-radius:.3rem 0 0 0;left:0;top:0}.panel>header:after{--corner-border-width: var(--border-width);content:"";border-style:solid;border-color:var(--bg800);position:absolute;height:1rem;width:1rem;z-index:2;border-width:var(--corner-border-width) var(--corner-border-width) 0 0;border-radius:0 .3rem 0 0;right:0;top:0}.panel>article{z-index:1;padding:0 .6rem;overflow:auto}.panel>article::-webkit-scrollbar{width:var(--border-width);background:transparent}.panel>article::-webkit-scrollbar-thumb{min-width:1rem;border-style:solid;border-color:transparent;border-width:var(--border-width);background:var(--bg800);box-sizing:border-box;background-clip:border-box}.panel>footer{position:relative;color:var(--fg200);padding:.4rem .6rem;font-size:.75rem;text-align:right}.panel>footer:before{--corner-border-width: var(--border-width);content:"";border-style:solid;border-color:var(--bg800);position:absolute;height:1rem;width:1rem;z-index:2;border-width:0 0 var(--corner-border-width) var(--corner-border-width);border-radius:0 0 0 .3rem;left:0;bottom:0}.panel>footer:after{--corner-border-width: var(--border-width);content:"";border-style:solid;border-color:var(--bg800);position:absolute;height:1rem;width:1rem;z-index:2;border-width:0 var(--corner-border-width) var(--corner-border-width) 0;border-radius:0 0 .3rem 0;right:0;bottom:0}.spinner{display:inline-grid;justify-items:center;align-items:center;width:1em;height:1em;position:relative;box-sizing:border-box;animation:6s .5s rotate ease-in-out alternate infinite}.spinner:before{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border-style:solid;border-width:.05em;border-radius:50%;border-color:var(--bg800) transparent;animation:4s .5s inset1 ease-in-out infinite;box-shadow:0px 12px 10px -12px #000a,0px -12px 10px -12px #000a}.spinner:after{content:"";position:absolute;top:0;left:0;right:0;bottom:0;border-style:solid;border-width:.05em;border-radius:50%;border-color:transparent var(--bg600);animation:4s .5s inset2 ease-in-out infinite;box-shadow:12px 0px 10px -12px #000a,-12px 0px 10px -12px #000a}@keyframes rotate{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}@keyframes inset1{0%{top:0;left:0;right:0;bottom:0;transform:rotate(0)}12.5%{top:.2em;left:.2em;right:.2em;bottom:.2em;transform:rotate(0)}37.5%{top:.2em;left:.2em;right:.2em;bottom:.2em;transform:rotate(180deg)}50%{top:0;left:0;right:0;bottom:0;transform:rotate(180deg)}100%{top:0;left:0;right:0;bottom:0;transform:rotate(180deg)}}@keyframes inset2{0%{top:0;left:0;right:0;bottom:0;transform:rotate(0)}50%{top:0;left:0;right:0;bottom:0;transform:rotate(0)}62.5%{top:.2em;left:.2em;right:.2em;bottom:.2em;transform:rotate(0)}87.5%{top:.2em;left:.2em;right:.2em;bottom:.2em;transform:rotate(180deg)}100%{top:0;left:0;right:0;bottom:0;transform:rotate(180deg)}}

package/index.html

@@ -68,7 +68,7 @@
     "
   >
     <div
-      class="compound-command vertical"
+      class="compound-commands vertical"
       style="grid-template-rows: auto auto 1fr auto auto; min-width: 10rem"
     >
       <button class="command">Command</button>
@@ -217,18 +217,18 @@
             <button disabled class="command outline accent">Command</button>
             <button disabled class="command outline warn">Command</button>
             <h4 style="grid-column: span 5">Compound</h4>
-            <div style="grid-column: span 5" class="compound-command">
+            <div style="grid-column: span 5" class="compound-commands">
               <button class="command outline">Any command</button>
               <button class="command primary-alt outline"></button>
               <div class="spacer outline"></div>
             </div>
-            <div style="grid-column: span 5" class="compound-command">
+            <div style="grid-column: span 5" class="compound-commands">
               <button class="command">Command</button>
               <div class="text">47</div>
               <div class="spacer"></div>
             </div>
             <h4 style="grid-column: span 5">Compound Vertical</h4>
-            <div class="compound-command vertical">
+            <div class="compound-commands vertical">
               <button class="command">Command</button>
               <div class="text">47</div>
               <div class="spacer"></div>
@@ -273,7 +273,7 @@
       <footer>Ada Version 5.0.0</footer>
     </div>
     <div
-      class="compound-command"
+      class="compound-commands"
       style="
         grid-template-columns: auto auto 12rem auto auto 1fr auto auto;
         grid-column: span 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ada-ui",
-  "version": "0.0.0-beta-v5-20240723120941",
+  "version": "0.0.0-beta-v5-20240723124838",
   "scripts": {
     "dev": "concurrently -n scss,serve 'sass scss:css --watch' 'alive-server .'",
     "build": "rm -rf css && sass scss:css -s compressed --no-source-map",
@@ -8,7 +8,7 @@
     "snapshot": "f(){ if [ -z \"$1\" ]; then echo \"Error: No tag name specified, exiting.\"; exit 1; fi; npm run build && changeset version --snapshot $1 && changeset publish --no-git-tag --tag $1; }; f",
     "remove-snapshot": "f(){ if [ -z \"$1\" ]; then echo \"Error: No tag name specified, exiting.\"; exit 1; fi; npm dist-tag rm ada-ui $1; }; f",
     "version": "npm run build && changeset version",
-    "publish": "changeset publish"
+    "publish-package": "changeset publish"
   },
   "license": "MIT",
   "exports": {

package/scss/_command.scss

@@ -58,7 +58,7 @@
   }
 }
 
-.compound-command {
+.compound-commands {
   display: inline-grid;
   grid-auto-flow: column;
   gap: var(--gap);

package/scss/_panel.scss

@@ -7,10 +7,6 @@
   display: grid;
   grid-template-rows: auto 1fr auto;
   overflow: auto;
-  // This margin is ok here and necessary bc of the box shadow of the panel
-  // without a margin, the box shadow could be cut off if there is no space between panels
-  // so it is the responsibility of the panel to ensure this
-  margin: 0.5rem;
 
   > header {
     position: relative;

package/scss/ada.blue-old.scss

@@ -0,0 +1,111 @@
+@import "ada.theme-base";
+
+.primary {
+  @extend %colourShades;
+
+  // old one, more blue-greenish
+  //--h: 197;
+  //--s: 100%;
+  //--l: 19%;
+  //--h-light: 197;
+  //--s-light: 100%;
+  //--l-light: 40%;
+
+  --h: 205;
+  --s: 80%;
+  --l: 23%;
+  --h-light: 205;
+  --s-light: 80%;
+  --l-light: 40%;
+
+  --h-fg: var(--h);
+  --s-fg: 100%;
+  --l-fg: 89%;
+
+  //lch test
+  //--default: lch(26 29 260);
+  //--default-alpha70: lch(18 20 260);
+}
+
+:root {
+  @extend .primary;
+  // old one, more blue-greenish
+  //--bg: hsl(197, 80%, 7%);
+  --bg: hsl(207, 61%, 7%);
+}
+
+.shade1 {
+  @extend %colourShades;
+
+  --h: 198;
+  --s: 90%;
+  --l: 30%;
+  --h-light: 198;
+  --s-light: 90%;
+  --l-light: 58%;
+
+  --h-fg: var(--h);
+  --s-fg: 100%;
+  --l-fg: 89%;
+}
+
+.shade2 {
+  @extend %colourShades;
+
+  // old one, more blue-greenish
+  //--h: 165;
+  //--s: 90%;
+  //--l: 20%;
+  //--h-light: 165;
+  //--s-light: 90%;
+  //--l-light: 40%;
+
+  --h: 185;
+  --s: 50%;
+  --l: 30%;
+  --h-light: 185;
+  --s-light: 50%;
+  --l-light: 50%;
+
+  --h-fg: var(--h);
+  --s-fg: 100%;
+  --l-fg: 89%;
+}
+
+.accent {
+  @extend %colourShades;
+
+  // old one
+  //--h: 11;
+  //--s: 74%;
+  //--l: 45%;
+  //--h-light: 10;
+  //--s-light: 89%;
+  //--l-light: 56%;
+
+  --h: 146;
+  --s: 58%;
+  --l: 20%;
+  --h-light: 146;
+  --s-light: 58%;
+  --l-light: 48%;
+
+  --h-fg: var(--h);
+  --s-fg: 100%;
+  --l-fg: 89%;
+}
+
+.warn {
+  @extend %colourShades;
+
+  --h: 0;
+  --s: 100%;
+  --l: 28%;
+  --h-light: 0;
+  --s-light: 85%;
+  --l-light: 48%;
+
+  --h-fg: var(--h);
+  --s-fg: 100%;
+  --l-fg: 89%;
+}

package/scss/ada.blue.scss

@@ -1,111 +1,68 @@
 @import "ada.theme-base";
 
+:root {
+  --bg-body: lch(5 8 260);
+
+  //Defaults to primary color
+  @extend .primary;
+}
+
 .primary {
   @extend %colourShades;
 
-  // old one, more blue-greenish
-  //--h: 197;
-  //--s: 100%;
-  //--l: 19%;
-  //--h-light: 197;
-  //--s-light: 100%;
-  //--l-light: 40%;
-
-  --h: 205;
-  --s: 80%;
-  --l: 23%;
-  --h-light: 205;
-  --s-light: 80%;
-  --l-light: 40%;
-
-  --h-fg: var(--h);
-  --s-fg: 100%;
-  --l-fg: 89%;
-
-  //lch test
-  //--default: lch(26 29 260);
-  //--default-alpha70: lch(18 20 260);
-}
+  --100: 90 17 260;
+  --200: 70 17 260;
 
-:root {
-  @extend .primary;
-  // old one, more blue-greenish
-  //--bg: hsl(197, 80%, 7%);
-  --bg: hsl(207, 61%, 7%);
+  --600: 36 36 260;
+  --700: 29 30 260;
+  --800: 26 29 260;
+  --900: 19 23 260;
 }
 
-.shade1 {
+.primary-alt {
   @extend %colourShades;
 
-  --h: 198;
-  --s: 90%;
-  --l: 30%;
-  --h-light: 198;
-  --s-light: 90%;
-  --l-light: 58%;
+  --100: 90 17 246;
+  --200: 70 17 246;
 
-  --h-fg: var(--h);
-  --s-fg: 100%;
-  --l-fg: 89%;
+  --600: 51 40 246;
+  --700: 44 34 246;
+  --800: 41 33 246;
+  --900: 34 27 246;
 }
 
-.shade2 {
+.accent {
   @extend %colourShades;
 
-  // old one, more blue-greenish
-  //--h: 165;
-  //--s: 90%;
-  //--l: 20%;
-  //--h-light: 165;
-  //--s-light: 90%;
-  //--l-light: 40%;
-
-  --h: 185;
-  --s: 50%;
-  --l: 30%;
-  --h-light: 185;
-  --s-light: 50%;
-  --l-light: 50%;
-
-  --h-fg: var(--h);
-  --s-fg: 100%;
-  --l-fg: 89%;
+  --100: 90 17 152;
+  --200: 70 17 152;
+
+  --600: 40 37 152;
+  --700: 33 31 152;
+  --800: 30 30 152;
+  --900: 23 24 152;
 }
 
-.accent {
+.accent-alt {
   @extend %colourShades;
 
-  // old one
-  //--h: 11;
-  //--s: 74%;
-  //--l: 45%;
-  //--h-light: 10;
-  //--s-light: 89%;
-  //--l-light: 56%;
-
-  --h: 146;
-  --s: 58%;
-  --l: 20%;
-  --h-light: 146;
-  --s-light: 58%;
-  --l-light: 48%;
-
-  --h-fg: var(--h);
-  --s-fg: 100%;
-  --l-fg: 89%;
+  --100: 90 17 206;
+  --200: 70 17 206;
+
+  --600: 52 30 206;
+  --700: 45 24 206;
+  --800: 42 23 206;
+  --900: 35 17 206;
 }
 
 .warn {
   @extend %colourShades;
 
-  --h: 0;
-  --s: 100%;
-  --l: 28%;
-  --h-light: 0;
-  --s-light: 85%;
-  --l-light: 48%;
+  --100: 90 17 40;
+  --200: 70 17 40;
 
-  --h-fg: var(--h);
-  --s-fg: 100%;
-  --l-fg: 89%;
+  --600: 40 75 40;
+  --700: 33 69 40;
+  --800: 30 68 40;
+  --900: 23 62 40;
 }

package/css/ada.blue-new.css

@@ -1 +0,0 @@
-.warn,.accent-alt,.accent,.primary-alt,.primary,:root{--fg100: lch(var(--100));--fg200: lch(var(--200));--bg600: lch(var(--600));--bg700: lch(var(--700));--bg800: lch(var(--800));--bg900: lch(var(--900));--panel-background: lch(var(--800) / 0.1)}:root{--bg-body: lch(5 8 260)}.primary,:root{--100: 90 17 260;--200: 70 17 260;--600: 36 36 260;--700: 29 30 260;--800: 26 29 260;--900: 19 23 260}.primary-alt{--100: 90 17 246;--200: 70 17 246;--600: 51 40 246;--700: 44 34 246;--800: 41 33 246;--900: 34 27 246}.accent{--100: 90 17 152;--200: 70 17 152;--600: 40 37 152;--700: 33 31 152;--800: 30 30 152;--900: 23 24 152}.accent-alt{--100: 90 17 206;--200: 70 17 206;--600: 52 30 206;--700: 45 24 206;--800: 42 23 206;--900: 35 17 206}.warn{--100: 90 17 40;--200: 70 17 40;--600: 40 75 40;--700: 33 69 40;--800: 30 68 40;--900: 23 62 40}

package/scss/ada.blue-new.scss

@@ -1,68 +0,0 @@
-@import "ada.theme-base";
-
-:root {
-  --bg-body: lch(5 8 260);
-
-  //Defaults to primary color
-  @extend .primary;
-}
-
-.primary {
-  @extend %colourShades;
-
-  --100: 90 17 260;
-  --200: 70 17 260;
-
-  --600: 36 36 260;
-  --700: 29 30 260;
-  --800: 26 29 260;
-  --900: 19 23 260;
-}
-
-.primary-alt {
-  @extend %colourShades;
-
-  --100: 90 17 246;
-  --200: 70 17 246;
-
-  --600: 51 40 246;
-  --700: 44 34 246;
-  --800: 41 33 246;
-  --900: 34 27 246;
-}
-
-.accent {
-  @extend %colourShades;
-
-  --100: 90 17 152;
-  --200: 70 17 152;
-
-  --600: 40 37 152;
-  --700: 33 31 152;
-  --800: 30 30 152;
-  --900: 23 24 152;
-}
-
-.accent-alt {
-  @extend %colourShades;
-
-  --100: 90 17 206;
-  --200: 70 17 206;
-
-  --600: 52 30 206;
-  --700: 45 24 206;
-  --800: 42 23 206;
-  --900: 35 17 206;
-}
-
-.warn {
-  @extend %colourShades;
-
-  --100: 90 17 40;
-  --200: 70 17 40;
-
-  --600: 40 75 40;
-  --700: 33 69 40;
-  --800: 30 68 40;
-  --900: 23 62 40;
-}