Merge branch 'master' into newads

frontend/src/ts/test/test-logic.ts

@@ -177,7 +177,8 @@ export async function punctuateWord(
     lastChar != "," &&
     lastChar != "." &&
     currentLanguage !== "russian" &&
-    currentLanguage !== "ukrainian"
+    currentLanguage !== "ukrainian" &&
+    currentLanguage !== "slovak"
   ) {
     word = `'${word}'`;
   } else if (Math.random() < 0.012 && lastChar != "," && lastChar != ".") {

frontend/src/ts/test/test-ui.ts

@@ -1042,15 +1042,29 @@ export async function applyBurstHeatmap(): Promise<void> {
 
     const themeColors = await ThemeColors.getAll();
 
-    const colors = [
+    let colors = [
       themeColors.colorfulError,
-      Misc.blendTwoHexColors(themeColors.colorfulError, themeColors.text),
+      Misc.blendTwoHexColors(themeColors.colorfulError, themeColors.text, 0.5),
       themeColors.text,
-      Misc.blendTwoHexColors(themeColors.main, themeColors.text),
+      Misc.blendTwoHexColors(themeColors.main, themeColors.text, 0.5),
       themeColors.main,
     ];
+    let unreachedColor = themeColors.sub;
 
-    const unreachedColor = themeColors.sub;
+    if (themeColors.main === themeColors.text) {
+      colors = [
+        themeColors.colorfulError,
+        Misc.blendTwoHexColors(
+          themeColors.colorfulError,
+          themeColors.text,
+          0.5
+        ),
+        themeColors.sub,
+        Misc.blendTwoHexColors(themeColors.sub, themeColors.text, 0.5),
+        themeColors.main,
+      ];
+      unreachedColor = themeColors.subAlt;
+    }
 
     const steps = [
       {

frontend/src/ts/utils/misc.ts

@@ -236,7 +236,11 @@ export async function getContributorsList(): Promise<string[]> {
   }
 }
 
-export function blendTwoHexColors(color1: string, color2: string): string {
+export function blendTwoHexColors(
+  color1: string,
+  color2: string,
+  opacity: number
+): string {
   const rgb1 = hexToRgb(color1);
   const rgb2 = hexToRgb(color2);
 
@@ -251,7 +255,7 @@ export function blendTwoHexColors(color1: string, color2: string): string {
       r: rgb2.r,
       g: rgb2.g,
       b: rgb2.b,
-      a: 0.5,
+      a: opacity,
     };
     const blended = normalBlend(rgba1, rgba2);
     return rgbToHex(blended.r, blended.g, blended.b);

frontend/static/languages/english_10k.json

@@ -3999,7 +3999,6 @@
     "pour",
     "digest",
     "lodging",
-    "tion",
     "dust",
     "hence",
     "entirely",

frontend/static/layouts/_list.json

@@ -1363,5 +1363,27 @@
       "row4": ["xX", "mM", "wW", "gG", "qQ", "kK", "fF", "'\"", ";:", ".>"],
       "row5": [" "]
     }
+  },
+  "maya": {
+    "keymapShowTopRow": false,
+    "type": "ansi",
+    "keys": {
+      "row1": ["`~", "1!", "2@", "3#", "4$", "5%", "6^", "7&", "8*", "9(", "0)", "[{", "]}"],
+      "row2": ["bB", "lL", "dD", "gG", "qQ", "jJ", "fF", "oO", "uU", ",<", ";:", "=+", "\\|"],
+      "row3": ["nN", "rR", "tT", "sS", "vV", "kK", "hH", "aA", "eE", "iI", "-_"],
+      "row4": ["xX", "mM", "cC", "wW", "zZ", "pP", "yY", "'\"", "/?", ".>"],
+      "row5": [" "]
+    }
+  },
+  "nila": {
+    "keymapShowTopRow": false,
+    "type": "ansi",
+    "keys": {
+      "row1": ["`~", "1!", "2@", "3#", "4$", "5%", "6^", "7&", "8*", "9(", "0)", "[{", "]}"],
+      "row2": ["xX", "dD", "lL", "gG", "vV", "jJ", "fF", "oO", "uU", ",<", ";:", "=+", "\\|"],
+      "row3": ["rR", "tT", "nN", "sS", "bB", "qQ", "hH", "aA", "eE", "iI", "-_"],
+      "row4": ["kK", "mM", "cC", "wW", "zZ", "pP", "yY", "'\"", "/?", ".>"],
+      "row5": [" "]
+    }
   }
 }

frontend/static/quotes/english.json

@@ -38693,6 +38693,30 @@
       "source": "The Legend of Vox Machina",
       "id": 6782,
       "length": 183
+    },
+    {
+      "text": "Most cities aren't. They want to believe they have a cash-flow problem because it is convenient, because insolvency is too difficult to fathom, especially when everyone else appears to be doing the exact same thing. Could everyone be wrong? Could we all be insolvent? These two questions probably cost me a total of six years in the intellectual wilderness as I clung to the notion that what I was seeing and measuring could not possibly be true, that a wisdom greater than mine had to be at work that I hadn't perceived.",
+      "source": "Strong Towns - A Bottom-Up Revolution to Rebuild American Prosperity",
+      "id": 6783,
+      "length": 521
+    },
+    {
+      "text": "It's also our path to salvation. Our cities are struggling financially, trapped in a system grinding them into decline. Working together in an intentional way, it is possible to make our places stronger financially while also improving the lives of people.",
+      "source": "Strong Towns - A Bottom-Up Revolution to Rebuild American Prosperity",
+      "id": 6784,
+      "length": 256
+    },
+    {
+      "text": "That is the essence of a Strong Towns approach, the bottom-up revolution America desperately needs.",
+      "source": "Strong Towns - A Bottom-Up Revolution to Rebuild American Prosperity",
+      "id": 6785,
+      "length": 99
+    },
+    {
+      "text": "I'm not against the automobile, but I just feel that the automobile has moved into communities too much. I feel that you can design so that the automobile is there, but still put pedestrians back again... I’d love to work on a project like that.",
+      "source": "Walt Disney",
+      "id": 6786,
+      "length": 245
     }
   ]
 }

frontend/static/themes/_list.json

@@ -1153,5 +1153,12 @@
     "mainColor": "#7d67a9",
     "subColor": "#3a98b9",
     "textColor": "#1b4c5e"
+  },
+  {
+    "name": "cherry_blossom",
+    "bgColor": "#323437",
+    "mainColor": "#d65ccc",
+    "subColor": "#787d82",
+    "textColor": "#d1d0c5"
   }
 ]

frontend/static/themes/cherry_blossom.css

@@ -0,0 +1,12 @@
+:root {
+  --bg-color: #323437;
+  --main-color: #d65ccc;
+  --caret-color: #ffffff;
+  --sub-color: #787d82;
+  --sub-alt-color: #2d2f31;
+  --text-color: #d1d0c5;
+  --error-color: #ca4754;
+  --error-extra-color: #d32738;
+  --colorful-error-color: #ec182d;
+  --colorful-error-extra-color: #6e0c16;
+}

frontend/static/themes/dracula.css

@@ -1,14 +1,14 @@
 :root {
   --bg-color: #282a36;
-  --main-color: #f2f2f2;
-  --caret-color: #f2f2f2;
-  --sub-color: #bd93f9;
+  --main-color: #bd93f9;
+  --caret-color: #bd93f9;
+  --sub-color: #6272a4;
   --sub-alt-color: #20222c;
-  --text-color: #f2f2f2;
-  --error-color: #f758a0;
-  --error-extra-color: #732e51;
-  --colorful-error-color: #f758a0;
-  --colorful-error-extra-color: #732e51;
+  --text-color: #f8f8f2;
+  --error-color: #ff5555;
+  --error-extra-color: #f1fa8c;
+  --colorful-error-color: #ff5555;
+  --colorful-error-extra-color: #f1fa8c;
 }
 
 #menu .textButton:nth-child(1) {