Color Mixins Update

20 files changed, 130 insertions, 108 deletions

diff --git a/sass/_imports.scss b/sass/_imports.scss
index 3c2630c..d4d2e5d 100644
--- a/sass/_imports.scss
+++ b/sass/_imports.scss
@@ -15,6 +15,10 @@
 // Config
 @import "variables";
 
+@import "colors/orange"
+//@import "colors/blue"
+//@import "colors/blueshade"
+
 //@import "fonts/Roboto";
 //@import "fonts/Roboto-Mono"; // Monospaced
 //@import "fonts/Arimo";
diff --git a/sass/abridge-auto.scss b/sass/abridge-auto.scss
index 93440c8..146cd77 100644
--- a/sass/abridge-auto.scss
+++ b/sass/abridge-auto.scss
@@ -1,31 +1,11 @@
 @import "imports";
-@import "syntax/syntax-abridge";
-// In parenthesis at the end of each comment are tested colors separated by commma, the first value is the default.
+@import "syntax/syntax-abridge-auto";
+
 :root {
-  --f1: #ccc;// Font Color Primary (ccc)
-  --f2: #ddd;// Font color Headers (ddd)
-  --c1: #111;// Background Color Primary (111)
-  --c2: #222;// Background Color Secondary (222,123)
-  --c3: #333;// Table Rows, Block quote edge, Borders (333,345)
-  --c4: #888;// Disabled Buttons, Borders, mark background (888,789)
-  --a1: #f90;// link color (f90,09f)
-  --a2: #fb0;// link hover/focus color (fb0,0bf)
-  --a3: #f90;// link h1-h2 hover/focus color (f90,0af)
-  --cg: #593;// ins green, success (593)
-  --cr: #e33;// del red, errors (e33)
+  @include dark;
 }
 @media (prefers-color-scheme: light) {
   :root {
-    --f1: #444;// Font Color Primary (444)
-    --f2: #333;// Font color Headers (333)
-    --c1: #fff;// Background Color Primary (fff)
-    --c2: #eee;// Background Color Secondary (eee,def)
-    --c3: #ddd;// Table Rows, Block quote edge, Borders (ddd,137)
-    --c4: #677;// Disabled Buttons, Borders, mark background (677,013)
-    --a1: #c40;// link color (c40,06e)
-    --a2: #e60;// link hover/focus color (e60,09f)
-    --a3: #f90;// link h1-h2 hover/focus color (f90,07f)
-    --cg: #373;// ins green, success (373)
-    --cr: #d33;// del red, errors (d33)
+    @include light;
   }
 }
diff --git a/sass/abridge-dark.scss b/sass/abridge-dark.scss
index eaf1474..7a53a72 100644
--- a/sass/abridge-dark.scss
+++ b/sass/abridge-dark.scss
@@ -1,16 +1,6 @@
 @import "imports";
 @import "syntax/syntax-abridge-dark";
-// In parenthesis at the end of each comment are tested colors separated by commma, the first value is the default.
+
 :root {
-  --f1: #ccc;// Font Color Primary (ccc)
-  --f2: #ddd;// Font color Headers (ddd)
-  --c1: #111;// Background Color Primary (111)
-  --c2: #222;// Background Color Secondary (222,123)
-  --c3: #333;// Table Rows, Block quote edge, Borders (333,345)
-  --c4: #888;// Disabled Buttons, Borders, mark background (888,789)
-  --a1: #f90;// link color (f90,09f)
-  --a2: #fb0;// link hover/focus color (fb0,0bf)
-  --a3: #f90;// link h1-h2 hover/focus color (f90,0af)
-  --cg: #593;// ins green, success (593)
-  --cr: #e33;// del red, errors (e33)
+  @include dark;
 }
diff --git a/sass/abridge-light.scss b/sass/abridge-light.scss
index 34c9bbc..283384b 100644
--- a/sass/abridge-light.scss
+++ b/sass/abridge-light.scss
@@ -1,16 +1,6 @@
 @import "imports";
 @import "syntax/syntax-abridge-light";
-// In parenthesis at the end of each comment are tested colors separated by commma, the first value is the default.
+
 :root {
-  --f1: #444;// Font Color Primary (444)
-  --f2: #333;// Font color Headers (333)
-  --c1: #fff;// Background Color Primary (fff)
-  --c2: #eee;// Background Color Secondary (eee,def)
-  --c3: #ddd;// Table Rows, Block quote edge, Borders (ddd,137)
-  --c4: #677;// Disabled Buttons, Borders, mark background (677,013)
-  --a1: #c40;// link color (c40,06e)
-  --a2: #e60;// link hover/focus color (e60,09f)
-  --a3: #f90;// link h1-h2 hover/focus color (f90,07f)
-  --cg: #373;// ins green, success (373)
-  --cr: #d33;// del red, errors (d33)
+  @include light;
 }
diff --git a/sass/abridge.scss b/sass/abridge.scss
index af1bf5d..f92e0a4 100644
--- a/sass/abridge.scss
+++ b/sass/abridge.scss
@@ -1,29 +1,9 @@
 @import "imports";
-@import "syntax/syntax-abridge-switcher";
-// In parenthesis at the end of each comment are tested colors separated by commma, the first value is the default.
+@import "syntax/syntax-abridge";
+
 :root:not(.light) {
-  --f1: #ccc;// Font Color Primary (ccc)
-  --f2: #ddd;// Font color Headers (ddd)
-  --c1: #111;// Background Color Primary (111)
-  --c2: #222;// Background Color Secondary (222,123)
-  --c3: #333;// Table Rows, Block quote edge, Borders (333,345)
-  --c4: #888;// Disabled Buttons, Borders, mark background (888,789)
-  --a1: #f90;// link color (f90,09f)
-  --a2: #fb0;// link hover/focus color (fb0,0bf)
-  --a3: #f90;// link h1-h2 hover/focus color (f90,0af)
-  --cg: #593;// ins green, success (593)
-  --cr: #e33;// del red, errors (e33)
+  @include dark;
 }
 :root.light {
-  --f1: #444;// Font Color Primary (444)
-  --f2: #333;// Font color Headers (333)
-  --c1: #fff;// Background Color Primary (fff)
-  --c2: #eee;// Background Color Secondary (eee,def)
-  --c3: #ddd;// Table Rows, Block quote edge, Borders (ddd,137)
-  --c4: #677;// Disabled Buttons, Borders, mark background (677,013)
-  --a1: #c40;// link color (c40,06e)
-  --a2: #e60;// link hover/focus color (e60,09f)
-  --a3: #f90;// link h1-h2 hover/focus color (f90,07f)
-  --cg: #373;// ins green, success (373)
-  --cr: #d33;// del red, errors (d33)
+  @include light;
 }
diff --git a/sass/colors/_blue.scss b/sass/colors/_blue.scss
new file mode 100644
index 0000000..085b038
--- /dev/null
+++ b/sass/colors/_blue.scss
@@ -0,0 +1,26 @@
+@mixin dark {
+  --f1: #ccc;// Font Color Primary (ccc)
+  --f2: #ddd;// Font color Headers (ddd)
+  --c1: #111;// Background Color Primary (111)
+  --c2: #222;// Background Color Secondary (222)
+  --c3: #333;// Table Rows, Block quote edge, Borders (333)
+  --c4: #888;// Disabled Buttons, Borders, mark background (888)
+  --a1: #09f;// link color (09f)
+  --a2: #0bf;// link hover/focus color (0bf)
+  --a3: #0af;// link h1-h2 hover/focus color (0af)
+  --cg: #593;// ins green, success (593)
+  --cr: #e33;// del red, errors (e33)
+}
+@mixin light {
+  --f1: #444;// Font Color Primary (444)
+  --f2: #333;// Font color Headers (333)
+  --c1: #fff;// Background Color Primary (fff)
+  --c2: #eee;// Background Color Secondary (eee)
+  --c3: #ddd;// Table Rows, Block quote edge, Borders (ddd)
+  --c4: #677;// Disabled Buttons, Borders, mark background (677)
+  --a1: #06e;// link color (06e)
+  --a2: #09f;// link hover/focus color (09f)
+  --a3: #07f;// link h1-h2 hover/focus color (07f)
+  --cg: #373;// ins green, success (373)
+  --cr: #d33;// del red, errors (d33)
+}
diff --git a/sass/colors/_blueshade.scss b/sass/colors/_blueshade.scss
new file mode 100644
index 0000000..b3d82e7
--- /dev/null
+++ b/sass/colors/_blueshade.scss
@@ -0,0 +1,26 @@
+@mixin dark {
+  --f1: #ccc;// Font Color Primary (ccc)
+  --f2: #ddd;// Font color Headers (ddd)
+  --c1: #111;// Background Color Primary (111)
+  --c2: #123;// Background Color Secondary (123)
+  --c3: #345;// Table Rows, Block quote edge, Borders (345)
+  --c4: #789;// Disabled Buttons, Borders, mark background (789)
+  --a1: #09f;// link color (09f)
+  --a2: #0bf;// link hover/focus color (0bf)
+  --a3: #0af;// link h1-h2 hover/focus color (0af)
+  --cg: #593;// ins green, success (593)
+  --cr: #e33;// del red, errors (e33)
+}
+@mixin light {
+  --f1: #444;// Font Color Primary (444)
+  --f2: #333;// Font color Headers (333)
+  --c1: #fff;// Background Color Primary (fff)
+  --c2: #def;// Background Color Secondary (def)
+  --c3: #137;// Table Rows, Block quote edge, Borders (137)
+  --c4: #013;// Disabled Buttons, Borders, mark background (013)
+  --a1: #06e;// link color (06e)
+  --a2: #09f;// link hover/focus color (09f)
+  --a3: #07f;// link h1-h2 hover/focus color (07f)
+  --cg: #373;// ins green, success (373)
+  --cr: #d33;// del red, errors (d33)
+}
diff --git a/sass/colors/_orange.scss b/sass/colors/_orange.scss
new file mode 100644
index 0000000..66d3580
--- /dev/null
+++ b/sass/colors/_orange.scss
@@ -0,0 +1,26 @@
+@mixin dark {
+  --f1: #ccc;// Font Color Primary (ccc)
+  --f2: #ddd;// Font color Headers (ddd)
+  --c1: #111;// Background Color Primary (111)
+  --c2: #222;// Background Color Secondary (222)
+  --c3: #333;// Table Rows, Block quote edge, Borders (333)
+  --c4: #888;// Disabled Buttons, Borders, mark background (888)
+  --a1: #f90;// link color (f90)
+  --a2: #fb0;// link hover/focus color (fb0)
+  --a3: #f90;// link h1-h2 hover/focus color (f90)
+  --cg: #593;// ins green, success (593)
+  --cr: #e33;// del red, errors (e33)
+}
+@mixin light {
+  --f1: #444;// Font Color Primary (444)
+  --f2: #333;// Font color Headers (333)
+  --c1: #fff;// Background Color Primary (fff)
+  --c2: #eee;// Background Color Secondary (eee)
+  --c3: #ddd;// Table Rows, Block quote edge, Borders (ddd)
+  --c4: #677;// Disabled Buttons, Borders, mark background (677)
+  --a1: #c40;// link color (c40)
+  --a2: #e60;// link hover/focus color (e60)
+  --a3: #f90;// link h1-h2 hover/focus color (f90)
+  --cg: #373;// ins green, success (373)
+  --cr: #d33;// del red, errors (d33)
+}
diff --git a/sass/syntax/syntax-abridge-switcher.scss b/sass/syntax/syntax-abridge-auto.scss
index d1ea55d..ca2b590 100644
--- a/sass/syntax/syntax-abridge-switcher.scss
+++ b/sass/syntax/syntax-abridge-auto.scss
@@ -1,4 +1,4 @@
-:root:not(.light) {
+:root {
     .z-code {
     color: #bfbab0;
     background-color: #191919;
@@ -275,7 +275,8 @@
     color: #ff7c6d;
     }
 }
-:root.light {
+@media (prefers-color-scheme: light) {
+  :root {
     .z-code {
     color: #50565a;
     background-color: #fafafa;
@@ -548,4 +549,5 @@
     .z-sublimelinter.z-mark.z-error {
     color: #da0001;
     }
+  }
 }
\ No newline at end of file
diff --git a/sass/syntax/syntax-abridge.scss b/sass/syntax/syntax-abridge.scss
index ca2b590..d1ea55d 100644
--- a/sass/syntax/syntax-abridge.scss
+++ b/sass/syntax/syntax-abridge.scss
@@ -1,4 +1,4 @@
-:root {
+:root:not(.light) {
     .z-code {
     color: #bfbab0;
     background-color: #191919;
@@ -275,8 +275,7 @@
     color: #ff7c6d;
     }
 }
-@media (prefers-color-scheme: light) {
-  :root {
+:root.light {
     .z-code {
     color: #50565a;
     background-color: #fafafa;
@@ -549,5 +548,4 @@
     .z-sublimelinter.z-mark.z-error {
     color: #da0001;
     }
-  }
 }
\ No newline at end of file
diff --git a/sass/syntax/syntax-ayu-abridge-switcher.scss b/sass/syntax/syntax-ayu-abridge-auto.scss
index f31946c..3587a73 100644
--- a/sass/syntax/syntax-ayu-abridge-switcher.scss
+++ b/sass/syntax/syntax-ayu-abridge-auto.scss
@@ -1,4 +1,4 @@
-:root:not(.light) {
+:root {
     .z-code {
     color: #bfbab0;
     background-color: #191919;
@@ -275,7 +275,8 @@
     color: #ff7c6d;
     }
 }
-:root.light {
+@media (prefers-color-scheme: light) {
+  :root {
     .z-code {
     color: #61676c;
     background-color: #ffffff;
@@ -548,4 +549,5 @@
     .z-sublimelinter.z-mark.z-error {
     color: #e6000b;
     }
+  }
 }
\ No newline at end of file
diff --git a/sass/syntax/syntax-ayu-abridge.scss b/sass/syntax/syntax-ayu-abridge.scss
index 3587a73..f31946c 100644
--- a/sass/syntax/syntax-ayu-abridge.scss
+++ b/sass/syntax/syntax-ayu-abridge.scss
@@ -1,4 +1,4 @@
-:root {
+:root:not(.light) {
     .z-code {
     color: #bfbab0;
     background-color: #191919;
@@ -275,8 +275,7 @@
     color: #ff7c6d;
     }
 }
-@media (prefers-color-scheme: light) {
-  :root {
+:root.light {
     .z-code {
     color: #61676c;
     background-color: #ffffff;
@@ -549,5 +548,4 @@
     .z-sublimelinter.z-mark.z-error {
     color: #e6000b;
     }
-  }
 }
\ No newline at end of file
diff --git a/sass/syntax/syntax-ayumirage-abridge-switcher.scss b/sass/syntax/syntax-ayumirage-abridge-auto.scss
index 1999a4a..5a28abc 100644
--- a/sass/syntax/syntax-ayumirage-abridge-switcher.scss
+++ b/sass/syntax/syntax-ayumirage-abridge-auto.scss
@@ -1,4 +1,4 @@
-:root:not(.light) {
+:root {
     .z-code {
     color: #ccc9c2;
     background-color: #191919;
@@ -275,7 +275,8 @@
     color: #ff7c6d;
     }
 }
-:root.light {
+@media (prefers-color-scheme: light) {
+  :root {
     .z-code {
     color: #76736d;
     background-color: #ffffff;
@@ -551,4 +552,5 @@
     .z-sublimelinter.z-mark.z-error {
     color: #e40320;
     }
+  }
 }
\ No newline at end of file
diff --git a/sass/syntax/syntax-ayumirage-abridge.scss b/sass/syntax/syntax-ayumirage-abridge.scss
index 5a28abc..1999a4a 100644
--- a/sass/syntax/syntax-ayumirage-abridge.scss
+++ b/sass/syntax/syntax-ayumirage-abridge.scss
@@ -1,4 +1,4 @@
-:root {
+:root:not(.light) {
     .z-code {
     color: #ccc9c2;
     background-color: #191919;
@@ -275,8 +275,7 @@
     color: #ff7c6d;
     }
 }
-@media (prefers-color-scheme: light) {
-  :root {
+:root.light {
     .z-code {
     color: #76736d;
     background-color: #ffffff;
@@ -552,5 +551,4 @@
     .z-sublimelinter.z-mark.z-error {
     color: #e40320;
     }
-  }
 }
\ No newline at end of file
diff --git a/sass/syntax/syntax-charcoal-abridge-switcher.scss b/sass/syntax/syntax-charcoal-abridge-auto.scss
index 0f0f5d3..14cf754 100644
--- a/sass/syntax/syntax-charcoal-abridge-switcher.scss
+++ b/sass/syntax/syntax-charcoal-abridge-auto.scss
@@ -1,4 +1,4 @@
-:root:not(.light) {
+:root {
     .z-code {
     color: #cccece;
     background-color: #191919;
@@ -79,7 +79,8 @@
     color: #fe7d83;
     }
 }
-:root.light {
+@media (prefers-color-scheme: light) {
+  :root {
     .z-code {
     color: #727373;
     background-color: #ffffff;
@@ -159,4 +160,5 @@
     .z-source.z-js .z-constant.z-other.z-object.z-key.z-js .z-string.z-unquoted.z-label.z-js {
     color: #cb414d;
     }
+  }
 }
\ No newline at end of file
diff --git a/sass/syntax/syntax-charcoal-abridge.scss b/sass/syntax/syntax-charcoal-abridge.scss
index 14cf754..0f0f5d3 100644
--- a/sass/syntax/syntax-charcoal-abridge.scss
+++ b/sass/syntax/syntax-charcoal-abridge.scss
@@ -1,4 +1,4 @@
-:root {
+:root:not(.light) {
     .z-code {
     color: #cccece;
     background-color: #191919;
@@ -79,8 +79,7 @@
     color: #fe7d83;
     }
 }
-@media (prefers-color-scheme: light) {
-  :root {
+:root.light {
     .z-code {
     color: #727373;
     background-color: #ffffff;
@@ -160,5 +159,4 @@
     .z-source.z-js .z-constant.z-other.z-object.z-key.z-js .z-string.z-unquoted.z-label.z-js {
     color: #cb414d;
     }
-  }
 }
\ No newline at end of file
diff --git a/sass/syntax/syntax-dracula-abridge-switcher.scss b/sass/syntax/syntax-dracula-abridge-auto.scss
index ff5b8c5..afcb050 100644
--- a/sass/syntax/syntax-dracula-abridge-switcher.scss
+++ b/sass/syntax/syntax-dracula-abridge-auto.scss
@@ -1,4 +1,4 @@
-:root:not(.light) {
+:root {
     .z-code {
     color: #f8f8f2;
     background-color: #191919;
@@ -245,7 +245,8 @@
     color: #8be9fd;
     }
 }
-:root.light {
+@media (prefers-color-scheme: light) {
+  :root {
     .z-code {
     color: #72726d;
     background-color: #ffffff;
@@ -491,4 +492,5 @@
     .z-entity.z-name.z-namespace.z-cs {
     color: #007d90;
     }
+  }
 }
\ No newline at end of file
diff --git a/sass/syntax/syntax-dracula-abridge.scss b/sass/syntax/syntax-dracula-abridge.scss
index afcb050..ff5b8c5 100644
--- a/sass/syntax/syntax-dracula-abridge.scss
+++ b/sass/syntax/syntax-dracula-abridge.scss
@@ -1,4 +1,4 @@
-:root {
+:root:not(.light) {
     .z-code {
     color: #f8f8f2;
     background-color: #191919;
@@ -245,8 +245,7 @@
     color: #8be9fd;
     }
 }
-@media (prefers-color-scheme: light) {
-  :root {
+:root.light {
     .z-code {
     color: #72726d;
     background-color: #ffffff;
@@ -492,5 +491,4 @@
     .z-entity.z-name.z-namespace.z-cs {
     color: #007d90;
     }
-  }
 }
\ No newline at end of file
diff --git a/sass/syntax/syntax-material-abridge-switcher.scss b/sass/syntax/syntax-material-abridge-auto.scss
index a65cf95..c448b58 100644
--- a/sass/syntax/syntax-material-abridge-switcher.scss
+++ b/sass/syntax/syntax-material-abridge-auto.scss
@@ -1,4 +1,4 @@
-:root:not(.light) {
+:root {
     .z-code {
     color: #eeffff;
     background-color: #191919;
@@ -260,7 +260,8 @@
     color: #ff7992;
     }
 }
-:root.light {
+@media (prefers-color-scheme: light) {
+  :root {
     .z-code {
     color: #317e78;
     background-color: #ffffff;
@@ -521,4 +522,5 @@
     .z-brackethighlighter.z-unmatched {
     color: #d92d2d;
     }
+  }
 }
\ No newline at end of file
diff --git a/sass/syntax/syntax-material-abridge.scss b/sass/syntax/syntax-material-abridge.scss
index c448b58..a65cf95 100644
--- a/sass/syntax/syntax-material-abridge.scss
+++ b/sass/syntax/syntax-material-abridge.scss
@@ -1,4 +1,4 @@
-:root {
+:root:not(.light) {
     .z-code {
     color: #eeffff;
     background-color: #191919;
@@ -260,8 +260,7 @@
     color: #ff7992;
     }
 }
-@media (prefers-color-scheme: light) {
-  :root {
+:root.light {
     .z-code {
     color: #317e78;
     background-color: #ffffff;
@@ -522,5 +521,4 @@
     .z-brackethighlighter.z-unmatched {
     color: #d92d2d;
     }
-  }
 }
\ No newline at end of file