Merge branch 'master' of https://github.com/Miodec/monkeytype

src/js/layouts.js

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

static/languages/_groups.json

@@ -283,7 +283,7 @@
   },
   {
     "name": "macedonian",
-    "languages": ["macedonian"]
+    "languages": ["macedonian", "macedonian_1k"]
   },
   {
     "name": "belarusian",

static/languages/_list.json

@@ -155,5 +155,6 @@
   ,"hindi"
   ,"hindi_1k"
   ,"macedonian"
+  ,"macedonian_1k"
   ,"belarusian_1k"
 ]

static/quotes/english.json

@@ -14943,7 +14943,7 @@
     },
     {
       "text": "You've undoubtedly noticed how some authors go to so much trouble to build up great tension a few pages before the end of their stories - but a reader who is holding the book physically in his hands can feel that the story is about to end. Hence, he has some extra information which acts as an advance warning, in a way.",
-      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
+      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
       "id": 2517,
       "length": 320
     },
@@ -15783,7 +15783,7 @@
     },
     {
       "text": "It now becomes clear that consistency is not a property of a formal system per se, but depends on the interpretation which is proposed for it. By the same token, inconsistency is not an intrinsic property of any formal system.",
-      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
+      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
       "id": 2663,
       "length": 226
     },
@@ -16197,13 +16197,13 @@
     },
     {
       "text": "I couldn't believe it was her. It was like a dream. But there she was, just like I remembered her. That delicately beautiful face. And a body that could melt a cheese sandwich from across the room.",
-      "source": "The Naked Gun 2½: The Smell of Fear",
+      "source": "The Naked Gun 2½: The Smell of Fear",
       "id": 2732,
       "length": 197
     },
     {
       "text": "It is not at all easy to draw a sharp line between cases where what is happening could be called \"addition\", and where some other word is wanted. If you think about the question, you will probably come up with some criterion involving separation of the objects in space, and making sure each one is clearly distinguishable from all the others. But then how could one count ideas? Or the number of gases comprising the atmosphere?",
-      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
+      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
       "id": 2733,
       "length": 429
     },
@@ -16941,7 +16941,7 @@
     },
     {
       "text": "No matter how a program twists and turns to get out of itself, it is still following the rules inherent in itself. It is no more possible for it to escape than it is for a human being to decide voluntarily not to obey the laws of physics.",
-      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
+      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
       "id": 2858,
       "length": 238
     },
@@ -17355,7 +17355,7 @@
     },
     {
       "text": "Oh, can I really believe the poet's tales, that when one first sees the object of one's love, one imagines one has seen her long ago, that all love, like all knowledge is remembrance, that love too has its prophecies in the individual... it seems to me that I should have to possess the beauty of all girls in order to draw out a beauty equal to yours; that I should have to circumnavigate the world in order to find the place I lack and which the deepest mystery of my whole being points towards, and at the next moment, you are so near to me, filling my spirit so powerfully that I am transfigured for myself, and feel that it is good to be here.",
-      "source": "Søren Kierkegaard, Journals",
+      "source": "Søren Kierkegaard, Journals",
       "id": 2927,
       "length": 648
     },
@@ -17858,7 +17858,7 @@
       "length": 134
     },
     {
-      "text": "Do you believe in God? That's a complicated question. It depends on what you mean by \"God\". You see, it helps no one to be reductive. I believe that that we are here implies to some degree that there are forces larger than us. Now, we can get into the semanticalities... The very notion of belief itself can be rhetorically whittled to the bare nub of its meaning. I'd like to talk to you a lot more about this. Would you be interested in reading some of my literature?",
+      "text": "Do you believe in God? That's a complicated question. It depends on what you mean by \"God\". You see, it helps no one to be reductive. I believe that we are here implies to some degree that there are forces larger than us. Now, we can get into the semanticalities... The very notion of belief itself can be rhetorically whittled to the bare nub of its meaning. I'd like to talk to you a lot more about this. Would you be interested in reading some of my literature?",
       "source": "Xavier: Renegade Angel",
       "id": 3013,
       "length": 469
@@ -19599,7 +19599,7 @@
     },
     {
       "text": "Resistance is usually ascribed to bodies at rest, and impulse to those in motion; but motion and rest, as commonly conceived, are only relatively distinguished; nor are those bodies always truly at rest, which commonly are taken to be so.",
-      "source": "Philosophiæ Naturalis Principia Mathematica",
+      "source": "Philosophiæ Naturalis Principia Mathematica",
       "id": 3305,
       "length": 238
     },
@@ -19905,7 +19905,7 @@
     },
     {
       "text": "Cruz has never been my favorite person, I'll give you that. But an enemy? There's no sense in having those if we can help it.",
-      "source": "Merci Suárez Changes Gears",
+      "source": "Merci Suárez Changes Gears",
       "id": 3356,
       "length": 125
     },
@@ -20289,7 +20289,7 @@
     },
     {
       "text": "If you imagine an orange, there may occur in your cortex a set of commands to pick it up, to smell it, to inspect it, and so on. Clearly these commands cannot be carried out, because the orange is not there. But they can be sent along the usual channels towards the cerebellum or other suborgans of the brain, until, at some critical point, a \"mental faucet\" is closed, preventing them from actually being carried out.",
-      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
+      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
       "id": 3422,
       "length": 418
     },
@@ -25053,7 +25053,7 @@
     },
     {
       "text": "Sometimes it seems as though each new step towards AI, rather than producing something which everyone agrees is real intelligence, merely reveals what real intelligence is not.",
-      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
+      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
       "id": 4222,
       "length": 176
     },
@@ -26001,7 +26001,7 @@
     },
     {
       "text": "Popular is even weirder. Turns out, it's not the same thing as having friends at all.",
-      "source": "Merci Suárez Changes Gears",
+      "source": "Merci Suárez Changes Gears",
       "id": 4380,
       "length": 85
     },
@@ -28461,7 +28461,7 @@
     },
     {
       "text": "We generally concur that \"men\" such as a cow, a turkey, a frog, and a fish all possess some spark of consciousness, some kind of primitive \"soul\" but by God, it's a good deal smaller than ours is - and that, no more and no less, is why we \"men\" feel that we have the perfect right to extinguish the dim lights in the heads of these fractionally-souled beasts and to gobble down their once warm and wiggling, now chilled and stilled protoplasm with limitless gusto, and not feel a trace of guilt while doing so.",
-      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
+      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
       "id": 4795,
       "length": 510
     },
@@ -28833,7 +28833,7 @@
     },
     {
       "text": "Since, as is well known, God helps those who help themselves, presumably the Devil helps all those, and only those, who don't help themselves. Does the Devil help himself?",
-      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
+      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
       "id": 4857,
       "length": 171
     },
@@ -28965,7 +28965,7 @@
     },
     {
       "text": "In the early days of computer chess people used to estimate that it would be ten years until a computer (or program) was world champion. But after ten years had passed, it seemed that the day a computer would become world champion was still more than ten years away... This is just one more piece of evidence for the rather recursive Hofstadter's Law: It always takes longer than you expect, even when you take into account Hofstadter's Law.",
-      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
+      "source": "Gödel, Escher, Bach: An Eternal Golden Braid",
       "id": 4880,
       "length": 441
     },

static/themes/_list.json

@@ -643,5 +643,25 @@
     "name": "moonlight",
     "bgColor" : "#1f2730",
     "textColor":"#c69f68"
-  }  
+  },
+  {
+     "name": "pink_lemonade",
+     "bgColor" : "#f6d992",
+     "textColor":"#f6b092"
+   },
+   {
+     "name": "creamsicle",
+     "bgColor" : "#ff9869",
+     "textColor":"#fcfcf8"
+   },
+   {
+     "name": "beach",
+     "bgColor" : "#ffeead",
+     "textColor":"#88d8b0"
+   },
+   {
+     "name": "desert_oasis",
+     "bgColor" : "#fff2d5",
+     "textColor":"#332800"
+   }
 ]

static/themes/beach.css

@@ -0,0 +1,20 @@
+:root {
+   --bg-color: #ffeead;
+   --main-color: #96ceb4;
+   --caret-color: #ffcc5c;
+   --sub-color: #ffcc5c;
+   --text-color: #5b7869;
+   --error-color: #ff6f69;
+   --error-extra-color: #ff6f69;
+   --colorful-error-color: #ff6f69;
+   --colorful-error-extra-color: #ff6f69;
+ }
+
+ #menu .icon-button:nth-child(1),
+ #menu .icon-button:nth-child(2),
+ #menu .icon-button:nth-child(3),
+ #menu .icon-button:nth-child(4),
+ #menu .icon-button:nth-child(5),
+ #menu .icon-button:nth-child(6) {
+   color: #ff6f69;
+ }

static/themes/creamsicle.css

@@ -0,0 +1,11 @@
+:root {
+  --bg-color: #ff9869;
+  --main-color: #fcfcf8;
+  --caret-color: #fcfcf8;
+  --sub-color: #ff661f;
+  --text-color: #fcfcf8;
+  --error-color: #6a0dad;
+  --error-extra-color: #6a0dad;
+  --colorful-error-color: #6a0dad;
+  --colorful-error-extra-color: #6a0dad;
+}

static/themes/desert_oasis.css

@@ -0,0 +1,32 @@
+:root {
+  --bg-color: #fff2d5; /*Background*/
+  --main-color: #d19d01; /*Color after typing, monkeytype logo, WPM Number acc number etc*/
+  --caret-color: #3a87fe; /*Cursor Color*/
+  --sub-color: #0061fe; /*WPM text color of scrollbar and general color, before typed color*/
+  --text-color: #332800; /*Color of text after hovering over it*/
+  --error-color: #76bb40;
+  --error-extra-color: #4e7a27;
+  --colorful-error-color: #76bb40;
+  --colorful-error-extra-color: #4e7a27;
+}
+
+#menu .icon-button:nth-child(1) {
+  color: #76bb40;
+}
+
+#menu .icon-button:nth-child(2) {
+  color: #76bb40;
+}
+
+#menu .icon-button:nth-child(3) {
+  color: #76bb40;
+}
+
+#menu .icon-button:nth-child(4) {
+  color: #76bb40;
+}
+
+#menu .icon-button:nth-child(5),
+#menu .icon-button:nth-child(6) {
+  color: #76bb40;
+}

static/themes/pink_lemonade.css

@@ -0,0 +1,11 @@
+:root {
+  --bg-color: #f6d992;
+  --main-color: #f6a192;
+  --caret-color: #fcfcf8;
+  --sub-color: #f6b092;
+  --text-color: #fcfcf8;
+  --error-color: #ff6f69;
+  --error-extra-color: #ff6f69;
+  --colorful-error-color: #ff6f69;
+  --colorful-error-extra-color: #ff6f69;
+}