added 2 more colors to each theme to make sure errors are visible with extra color enabled

Miodec · Miodec · commit d9b0950e8257 · 2020-06-09T01:32:34.000+01:00
diff --git a/public/css/style.scss b/public/css/style.scss
@@ -810,6 +810,12 @@ key {
     & letter.correct{
       color: var(--main-color);
     }
+    & letter.incorrect{
+      color: var(--extra-error-color);
+    }
+    & letter.incorrect.extra{
+      color: var(--extra-error-extra-color);
+    }
   }
 }
 
@@ -819,9 +825,21 @@ key {
     & letter.correct{
       color: var(--sub-color);
     }
+    & letter.incorrect{
+      color: var(--extra-error-color);
+    }
+    & letter.incorrect.extra{
+      color: var(--extra-error-extra-color);
+    }
   }
 }
 
+#words.flipped.extraColor .word.error,
+#words.extraColor .word.error
+{
+  border-bottom: 2px solid var(--extra-error-color);
+}
+
 .pageTest #resultExtraButtons{
   opacity: 0;
   display: grid;
diff --git a/public/themes/8008.css b/public/themes/8008.css
@@ -6,4 +6,6 @@
     --text-color: #e9ecf0;
     --error-color: #da3333;
     --error-extra-color: #791717;
+    --extra-error-color: #c5da33;
+    --extra-error-extra-color: #849224;
 }
diff --git a/public/themes/9009.css b/public/themes/9009.css
@@ -5,7 +5,9 @@
   --sub-color: #99947f;
   --text-color: #080909;
   --error-color: #c87e74;
-  --extra-error-color: #a56961; 
+  --extra-error-color: #a56961;
+  --extra-error-color: #c87e74;
+  --extra-error-extra-color: #a56961; 
 }
 
 .word letter.incorrect{
diff --git a/public/themes/bingsu.css b/public/themes/bingsu.css
@@ -7,6 +7,8 @@
   --text-color: #ebe6ea;
   --error-color: #921341;
   --error-extra-color: #640b2c; 
+  --extra-error-color: #921341;
+  --extra-error-extra-color: #640b2c; 
 }
 
 /* .word.error{
diff --git a/public/themes/bliss.css b/public/themes/bliss.css
@@ -1,9 +1,11 @@
 :root {
   --bg-color: #262727;
-  --main-color: #665957;
+  --main-color: #f0d3c9;
   --caret-color: #f0d3c9;
-  --sub-color: #f0d3c9;
+  --sub-color: #665957;
   --text-color: #fff;
   --error-color: #bd4141;
-  --error-extra-color: #883434; 
+  --error-extra-color: #883434;
+  --extra-error-color: #bd4141;
+  --extra-error-extra-color: #883434;
 }
diff --git a/public/themes/botanical.css b/public/themes/botanical.css
@@ -5,5 +5,7 @@
   --sub-color: #495755;
   --text-color: #eaf1f3;
   --error-color: #f6c9b4;
-  --error-extra-color: #f59a71; 
+  --error-extra-color: #f59a71;
+  --extra-error-color: #f6c9b4;
+  --extra-error-extra-color: #f59a71;
 }
diff --git a/public/themes/bushido.css b/public/themes/bushido.css
@@ -5,5 +5,7 @@
     --sub-color: #596172;
     --text-color: #f6f0e9;
     --error-color: #ec4c56;
-    --error-extra-color: #9b333a; 
+    --error-extra-color: #9b333a;
+    --extra-error-color: #ecdc4c;
+    --extra-error-extra-color: #bdb03d;
 }
diff --git a/public/themes/carbon.css b/public/themes/carbon.css
@@ -6,4 +6,6 @@
     --text-color: #f5e6c8;
     --error-color: #e72d2d;
     --extra-error-color: #b62828;
+    --extra-error-color: #a5e72d;
+    --extra-error-extra-color: #74a120;
 }
diff --git a/public/themes/dark.css b/public/themes/dark.css
@@ -6,4 +6,6 @@
     --text-color: #eee;
     --error-color: #da3333;
     --error-extra-color: #791717;
+    --extra-error-color: #da3333;
+    --extra-error-extra-color: #791717;
 }
diff --git a/public/themes/dots.css b/public/themes/dots.css
@@ -6,6 +6,8 @@
     --text-color: #fff;
     --error-color: #da3333;
     --error-extra-color: #791717;
+    --extra-error-color: #da3333;
+    --extra-error-extra-color: #791717;
 }
 
 #menu{
diff --git a/public/themes/dracula.css b/public/themes/dracula.css
@@ -6,6 +6,8 @@
   --text-color: #f2f2f2;
   --error-color: #f758a0;
   --error-extra-color: #732e51;
+  --extra-error-color: #f758a0;
+  --extra-error-extra-color: #732e51;
 }
 
 
diff --git a/public/themes/gruvbox_dark.css b/public/themes/gruvbox_dark.css
@@ -4,6 +4,8 @@
     --caret-color: #458588;
     --sub-color: #b8bb26;
     --text-color: #ebdbb2;
-    --error-color: #fb4934 ;
+    --error-color: #fb4934;
     --error-extra-color: #cc241d;
+    --extra-error-color: #fb4934;
+    --extra-error-extra-color: #cc241d;
 }
diff --git a/public/themes/gruvbox_light.css b/public/themes/gruvbox_light.css
@@ -6,4 +6,6 @@
     --text-color: #3c3836;
     --error-color: #cc241d;
     --error-extra-color: #9d0006;
+    --extra-error-color: #cc241d;
+    --extra-error-extra-color: #9d0006;
 }
diff --git a/public/themes/laser.css b/public/themes/laser.css
@@ -6,4 +6,6 @@
     --text-color: #dbe7e8;
     --error-color: #a8d400;
     --error-extra-color: #668000;
+    --extra-error-color: #a8d400;
+    --extra-error-extra-color: #668000;
 }
diff --git a/public/themes/light.css b/public/themes/light.css
@@ -6,4 +6,6 @@
     --text-color: #111;
     --error-color: #da3333;
     --error-extra-color: #791717;
+    --extra-error-color: #da3333;
+    --extra-error-extra-color: #791717;
 }
diff --git a/public/themes/metaverse.css b/public/themes/metaverse.css
@@ -6,4 +6,6 @@
     --text-color: #e8e8e8;
     --error-color: #da3333;
     --error-extra-color: #791717;
+    --extra-error-color: #d7da33;
+    --extra-error-extra-color: #737917;
 }
diff --git a/public/themes/miami.css b/public/themes/miami.css
@@ -2,8 +2,10 @@
     --bg-color: #f35588;
     --main-color: #05dfd7;
     --caret-color: #a3f7bf;
-    --text-color: #231e20;
-    --sub-color: #fff591;
-    --error-color: #9d72ff;
-    --error-extra-color: #7353bd;
+    --text-color: #f0e9ec;
+    --sub-color: #94294c;
+    --error-color: #fff591;
+    --error-extra-color: #b9b269;
+    --extra-error-color: #fff591;
+    --extra-error-extra-color: #b9b269;
 }
diff --git a/public/themes/miami_nights.css b/public/themes/miami_nights.css
@@ -2,8 +2,10 @@
     --bg-color: #18181a;
     --main-color: #e4609b;
     --caret-color: #e4609b;
-    --sub-color: #fff;
-    --text-color: #e4609b;
+    --sub-color: #47bac0;
+    --text-color: #fff;
     --error-color: #fff591;
     --error-extra-color: #b6af68;
+    --extra-error-color: #fff591;
+    --extra-error-extra-color: #b6af68;
 }
diff --git a/public/themes/mint.css b/public/themes/mint.css
@@ -4,6 +4,8 @@
     --caret-color: #5cdb95;
     --sub-color: #20688a;
     --text-color: #edf5e1;
-    --error-color:  #F35588;
-    --error-extra-color:  rgb(163, 56, 90);
+    --error-color:  #f35588;
+    --error-extra-color:  #a3385a;
+    --extra-error-color:  #f35588;
+    --extra-error-extra-color:  #a3385a;
 }
diff --git a/public/themes/mizu.css b/public/themes/mizu.css
@@ -6,4 +6,6 @@
     --text-color: #1a2633;
     --error-color: #bf616a;
     --error-extra-color: #793e44;
+    --extra-error-color: #bf616a;
+    --extra-error-extra-color: #793e44;
 }
diff --git a/public/themes/modern_dolch.css b/public/themes/modern_dolch.css
@@ -6,4 +6,6 @@
     --text-color: #e3e6eb;
     --error-color: #d36a7b;
     --error-extra-color: #994154;
+    --extra-error-color: #d36a7b;
+    --extra-error-extra-color: #994154;
 }
diff --git a/public/themes/monokai.css b/public/themes/monokai.css
@@ -6,4 +6,6 @@
     --text-color: #E6DB74;
     --error-color: #F92672;
     --error-extra-color: #FD971F;
+    --extra-error-color: #F92672;
+    --extra-error-extra-color: #FD971F;
 }
diff --git a/public/themes/mr_sleeves.css b/public/themes/mr_sleeves.css
@@ -1,11 +1,13 @@
 :root {
-    --bg-color: #6c7072;
+    --bg-color: #d1d7da;
     --main-color: #daa99b;
     --caret-color: #8fadc9;
-    --sub-color: #878c91;
+    --sub-color: #9a9fa1;
     --text-color: #1d1d1d;
     --error-color: #bf6464;
     --error-extra-color: #793e44;
+    --extra-error-color: #8fadc9;
+    --extra-error-extra-color: #667c91;
 }
 
 #top .logo .bottom{
diff --git a/public/themes/nautilus.css b/public/themes/nautilus.css
@@ -6,4 +6,6 @@
     --text-color: #1cbaac;
     --error-color: #da3333;
     --error-extra-color: #791717;
+    --extra-error-color: #da3333;
+    --extra-error-extra-color: #791717;
 }
diff --git a/public/themes/nord.css b/public/themes/nord.css
@@ -6,4 +6,6 @@
 	--text-color: #d8dee9;
 	--error-color: #bf616a;
 	--error-extra-color: #793e44;
+	--extra-error-color: #bf616a;
+	--extra-error-extra-color: #793e44;
 }
diff --git a/public/themes/oblivion.css b/public/themes/oblivion.css
@@ -3,9 +3,11 @@
     --main-color: #a5a096;
     --caret-color: #a5a096;
     --sub-color: #5d6263;
-    --text-color: #e7e3db;
+    --text-color: #f7f5f1;
     --error-color: #dd452e;
     --error-extra-color: #9e3423;
+    --extra-error-color: #dd452e;
+    --extra-error-extra-color: #9e3423;
 }
 
 #menu .button:nth-child(1){
diff --git a/public/themes/olivia.css b/public/themes/olivia.css
@@ -6,4 +6,6 @@
     --text-color:#f2efed;
     --error-color: #bf616a;
     --error-extra-color: #793e44;
+    --extra-error-color: #e03d4e;
+    --extra-error-extra-color: #aa2f3b;
 }
diff --git a/public/themes/red_samurai.css b/public/themes/red_samurai.css
@@ -4,6 +4,8 @@
     --caret-color: #c79e6e;
     --sub-color: #55131b;
     --text-color: #e2dad0;
-    --error-color: #da3333;
-    --error-extra-color: #791717;
+    --error-color: #33bbda;
+    --error-extra-color: #176b79;
+    --extra-error-color: #33bbda;
+    --extra-error-extra-color: #176779;
 }
diff --git a/public/themes/retro.css b/public/themes/retro.css
@@ -6,4 +6,6 @@
     --text-color: #1d1b17;
     --error-color: #bf616a;
     --error-extra-color: #793e44;
+    --extra-error-color: #bf616a;
+    --extra-error-extra-color: #793e44;
 }
diff --git a/public/themes/rgb.css b/public/themes/rgb.css
@@ -5,7 +5,9 @@
     --sub-color: #444;
     --text-color: #eee;
     --error-color: #eee;
-    --error-extra-color: rgb(179, 179, 179);
+    --error-extra-color: #b3b3b3;
+    --extra-error-color: #eee;
+    --extra-error-extra-color: #b3b3b3;
 }
 
 @keyframes rgb{
diff --git a/public/themes/serika.css b/public/themes/serika.css
@@ -6,4 +6,6 @@
     --text-color:#323437;
     --error-color: #da3333;
     --error-extra-color: #791717;
+    --extra-error-color: #da3333;
+    --extra-error-extra-color: #791717;
 }
diff --git a/public/themes/serika_dark.css b/public/themes/serika_dark.css
@@ -5,5 +5,7 @@
     --sub-color: #646669;
     --text-color: #d1d0c5;
     --error-color: #ca4754;
-	--error-extra-color: #7e2a33;
+    --error-extra-color: #7e2a33;
+    --extra-error-color: #ca4754;
+	--extra-error-extra-color: #7e2a33;
 }
diff --git a/public/themes/shadow.css b/public/themes/shadow.css
@@ -4,6 +4,10 @@
     --caret-color: #eee;
     --sub-color: #444;
     --text-color: #eee;
+    --error-color: #fff;
+    --error-extra-color: #d8d8d8;
+    --extra-error-color: #fff;
+    --extra-error-extra-color: #d8d8d8; 
 }
 
 @keyframes shadow {
@@ -21,18 +25,6 @@
     }
 }
 
-.word.error {
-    border-bottom: 2px solid #fff;
-}
-
-.word letter.incorrect {
-    color: #fff;
-}
-
-.word letter.incorrect.extra {
-    color: #fff;
-}
-
 #liveWpm{
     color: white;
 }
diff --git a/public/themes/striker.css b/public/themes/striker.css
@@ -5,5 +5,7 @@
     --sub-color: #0f2d4e;
     --text-color: #d6dbd9;
     --error-color: #fb4934;
-    --extra-error-color: #cc241d;
+    --error-extra-color: #cc241d;
+    --extra-error-color: #fb4934;
+    --extra-error-extra-color: #cc241d;
 }
diff --git a/public/themes/taro.css b/public/themes/taro.css
@@ -7,6 +7,8 @@
   --text-color: #130f1a;
   --error-color: #ffe23e;
   --error-extra-color: #fff1c3; 
+  --extra-error-color: #ffe23e;
+  --extra-error-extra-color: #fff1c3; 
 }
 
 .word.error{
diff --git a/public/themes/terminal.css b/public/themes/terminal.css
@@ -6,4 +6,6 @@
     --text-color: #e7eae0;
     --error-color: #a61717;
     --error-extra-color: #731010;
+    --extra-error-color: #a61717;
+    --extra-error-extra-color: #731010;
 }

Original file line number	Diff line number	Diff line change
`@@ -810,6 +810,12 @@ key {`
`810`	`810`	`& letter.correct{`
`811`	`811`	`color: var(--main-color);`
`812`	`812`	`}`
	`813`	`+ & letter.incorrect{`
	`814`	`+ color: var(--extra-error-color);`
	`815`	`+ }`
	`816`	`+ & letter.incorrect.extra{`
	`817`	`+ color: var(--extra-error-extra-color);`
	`818`	`+ }`
`813`	`819`	`}`
`814`	`820`	`}`
`815`	`821`
`@@ -819,9 +825,21 @@ key {`
`819`	`825`	`& letter.correct{`
`820`	`826`	`color: var(--sub-color);`
`821`	`827`	`}`
	`828`	`+ & letter.incorrect{`
	`829`	`+ color: var(--extra-error-color);`
	`830`	`+ }`
	`831`	`+ & letter.incorrect.extra{`
	`832`	`+ color: var(--extra-error-extra-color);`
	`833`	`+ }`
`822`	`834`	`}`
`823`	`835`	`}`
`824`	`836`
	`837`	`+#words.flipped.extraColor .word.error,`
	`838`	`+#words.extraColor .word.error`
	`839`	`+{`
	`840`	`+ border-bottom: 2px solid var(--extra-error-color);`
	`841`	`+}`
	`842`	`+`
`825`	`843`	`.pageTest #resultExtraButtons{`
`826`	`844`	`opacity: 0;`
`827`	`845`	`display: grid;`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,6 @@`
`6`	`6`	`--text-color: #e9ecf0;`
`7`	`7`	`--error-color: #da3333;`
`8`	`8`	`--error-extra-color: #791717;`
	`9`	`+ --extra-error-color: #c5da33;`
	`10`	`+ --extra-error-extra-color: #849224;`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	`--text-color: #ebe6ea;`
`8`	`8`	`--error-color: #921341;`
`9`	`9`	`--error-extra-color: #640b2c;`
	`10`	`+ --extra-error-color: #921341;`
	`11`	`+ --extra-error-extra-color: #640b2c;`
`10`	`12`	`}`
`11`	`13`
`12`	`14`	`/* .word.error{`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@`
`5`	`5`	`--sub-color: #495755;`
`6`	`6`	`--text-color: #eaf1f3;`
`7`	`7`	`--error-color: #f6c9b4;`
`8`		`- --error-extra-color: #f59a71;`
	`8`	`+ --error-extra-color: #f59a71;`
	`9`	`+ --extra-error-color: #f6c9b4;`
	`10`	`+ --extra-error-extra-color: #f59a71;`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@`
`5`	`5`	`--sub-color: #596172;`
`6`	`6`	`--text-color: #f6f0e9;`
`7`	`7`	`--error-color: #ec4c56;`
`8`		`- --error-extra-color: #9b333a;`
	`8`	`+ --error-extra-color: #9b333a;`
	`9`	`+ --extra-error-color: #ecdc4c;`
	`10`	`+ --extra-error-extra-color: #bdb03d;`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,6 @@`
`6`	`6`	`--text-color: #f5e6c8;`
`7`	`7`	`--error-color: #e72d2d;`
`8`	`8`	`--extra-error-color: #b62828;`
	`9`	`+ --extra-error-color: #a5e72d;`
	`10`	`+ --extra-error-extra-color: #74a120;`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,6 @@`
`6`	`6`	`--text-color: #eee;`
`7`	`7`	`--error-color: #da3333;`
`8`	`8`	`--error-extra-color: #791717;`
	`9`	`+ --extra-error-color: #da3333;`
	`10`	`+ --extra-error-extra-color: #791717;`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`--text-color: #fff;`
`7`	`7`	`--error-color: #da3333;`
`8`	`8`	`--error-extra-color: #791717;`
	`9`	`+ --extra-error-color: #da3333;`
	`10`	`+ --extra-error-extra-color: #791717;`
`9`	`11`	`}`
`10`	`12`
`11`	`13`	`#menu{`