Experimental json merge driver

.gitattributes

@@ -0,0 +1 @@
+*.json merge=json

Docs/Development_deployment.md

@@ -102,6 +102,11 @@ Weird errors
 
 Try removing `node_modules`, `package-lock.json` and `.cache`
 
+Misc setup
+----------
+
+The json-git-merger is used to quickly merge translation files, [documentation here](https://github.com/jonatanpedersen/git-json-merge#single-project--directory)
+
 Overview of package.json-scripts
 --------------------------------
 

css/index-tailwind-output.css

@@ -716,30 +716,6 @@ video {
   left: 0px;
 }
 
-.bottom-3 {
-  bottom: 0.75rem;
-}
-
-.left-3 {
-  left: 0.75rem;
-}
-
-.right-2 {
-  right: 0.5rem;
-}
-
-.left-24 {
-  left: 6rem;
-}
-
-.right-24 {
-  right: 6rem;
-}
-
-.top-56 {
-  top: 14rem;
-}
-
 .top-0 {
   top: 0px;
 }
@@ -764,6 +740,30 @@ video {
   bottom: 0px;
 }
 
+.bottom-3 {
+  bottom: 0.75rem;
+}
+
+.left-3 {
+  left: 0.75rem;
+}
+
+.right-2 {
+  right: 0.5rem;
+}
+
+.left-24 {
+  left: 6rem;
+}
+
+.right-24 {
+  right: 6rem;
+}
+
+.top-56 {
+  top: 14rem;
+}
+
 .isolate {
   isolation: isolate;
 }
@@ -788,6 +788,22 @@ video {
   float: none;
 }
 
+.m-2 {
+  margin: 0.5rem;
+}
+
+.m-1 {
+  margin: 0.25rem;
+}
+
+.m-0 {
+  margin: 0px;
+}
+
+.m-3 {
+  margin: 0.75rem;
+}
+
 .m-8 {
   margin: 2rem;
 }
@@ -796,10 +812,6 @@ video {
   margin: 2.75rem;
 }
 
-.m-1 {
-  margin: 0.25rem;
-}
-
 .m-5 {
   margin: 1.25rem;
 }
@@ -808,27 +820,10 @@ video {
   margin: 0.125rem;
 }
 
-.m-0 {
-  margin: 0px;
-}
-
-.m-2 {
-  margin: 0.5rem;
-}
-
-.m-3 {
-  margin: 0.75rem;
-}
-
 .m-4 {
   margin: 1rem;
 }
 
-.my-2 {
-  margin-top: 0.5rem;
-  margin-bottom: 0.5rem;
-}
-
 .mx-10 {
   margin-left: 2.5rem;
   margin-right: 2.5rem;
@@ -844,26 +839,15 @@ video {
   margin-right: 1rem;
 }
 
-.-ml-1 {
+.my-2 {
-  margin-left: -0.25rem;
+  margin-top: 0.5rem;
-}
+  margin-bottom: 0.5rem;
-
-.mr-3 {
-  margin-right: 0.75rem;
-}
-
-.ml-3 {
-  margin-left: 0.75rem;
 }
 
 .mb-2 {
   margin-bottom: 0.5rem;
 }
 
-.mr-4 {
-  margin-right: 1rem;
-}
-
 .mt-3 {
   margin-top: 0.75rem;
 }
@@ -876,10 +860,6 @@ video {
   margin-right: 0.5rem;
 }
 
-.mt-2 {
-  margin-top: 0.5rem;
-}
-
 .mb-10 {
   margin-bottom: 2.5rem;
 }
@@ -888,12 +868,8 @@ video {
   margin-top: 0.25rem;
 }
 
-.mt-0 {
+.ml-3 {
-  margin-top: 0px;
+  margin-left: 0.75rem;
-}
-
-.ml-2 {
-  margin-left: 0.5rem;
 }
 
 .mt-4 {
@@ -904,10 +880,6 @@ video {
   margin-bottom: 2rem;
 }
 
-.ml-1 {
-  margin-left: 0.25rem;
-}
-
 .mr-0 {
   margin-right: 0px;
 }
@@ -916,6 +888,34 @@ video {
   margin-bottom: 0.25rem;
 }
 
+.mr-3 {
+  margin-right: 0.75rem;
+}
+
+.-ml-1 {
+  margin-left: -0.25rem;
+}
+
+.mr-4 {
+  margin-right: 1rem;
+}
+
+.mt-2 {
+  margin-top: 0.5rem;
+}
+
+.mt-0 {
+  margin-top: 0px;
+}
+
+.ml-2 {
+  margin-left: 0.5rem;
+}
+
+.ml-1 {
+  margin-left: 0.25rem;
+}
+
 .mb-4 {
   margin-bottom: 1rem;
 }
@@ -968,32 +968,16 @@ video {
   height: 100%;
 }
 
-.h-5 {
-  height: 1.25rem;
-}
-
-.h-24 {
-  height: 6rem;
-}
-
-.h-10 {
-  height: 2.5rem;
-}
-
-.h-8 {
-  height: 2rem;
-}
-
 .h-12 {
   height: 3rem;
 }
 
-.h-screen {
+.h-5 {
-  height: 100vh;
+  height: 1.25rem;
 }
 
-.h-11 {
+.h-screen {
-  height: 2.75rem;
+  height: 100vh;
 }
 
 .h-32 {
@@ -1012,6 +996,22 @@ video {
   height: 1.5rem;
 }
 
+.h-10 {
+  height: 2.5rem;
+}
+
+.h-8 {
+  height: 2rem;
+}
+
+.h-24 {
+  height: 6rem;
+}
+
+.h-11 {
+  height: 2.75rem;
+}
+
 .h-3 {
   height: 0.75rem;
 }
@@ -1032,18 +1032,6 @@ video {
   width: 100%;
 }
 
-.w-5 {
-  width: 1.25rem;
-}
-
-.w-10 {
-  width: 2.5rem;
-}
-
-.w-8 {
-  width: 2rem;
-}
-
 .w-12 {
   width: 3rem;
 }
@@ -1052,10 +1040,6 @@ video {
   width: 100vw;
 }
 
-.w-11 {
-  width: 2.75rem;
-}
-
 .w-0 {
   width: 0px;
 }
@@ -1084,16 +1068,32 @@ video {
   width: 50%;
 }
 
-.min-w-min {
+.w-10 {
-  min-width: -webkit-min-content;
+  width: 2.5rem;
-  min-width: -moz-min-content;
+}
-  min-width: min-content;
+
+.w-8 {
+  width: 2rem;
+}
+
+.w-5 {
+  width: 1.25rem;
+}
+
+.w-11 {
+  width: 2.75rem;
 }
 
 .min-w-\[20em\] {
   min-width: 20em;
 }
 
+.min-w-min {
+  min-width: -webkit-min-content;
+  min-width: -moz-min-content;
+  min-width: min-content;
+}
+
 .max-w-full {
   max-width: 100%;
 }
@@ -1156,14 +1156,14 @@ video {
           animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite;
 }
 
-.cursor-pointer {
-  cursor: pointer;
-}
-
 .cursor-wait {
   cursor: wait;
 }
 
+.cursor-pointer {
+  cursor: pointer;
+}
+
 .resize {
   resize: both;
 }
@@ -1247,6 +1247,10 @@ video {
   word-break: break-all;
 }
 
+.rounded {
+  border-radius: 0.25rem;
+}
+
 .rounded-full {
   border-radius: 9999px;
 }
@@ -1255,26 +1259,22 @@ video {
   border-radius: 1.5rem;
 }
 
-.rounded {
+.rounded-xl {
-  border-radius: 0.25rem;
+  border-radius: 0.75rem;
 }
 
 .rounded-lg {
   border-radius: 0.5rem;
 }
 
-.rounded-xl {
+.border-4 {
-  border-radius: 0.75rem;
+  border-width: 4px;
 }
 
 .border {
   border-width: 1px;
 }
 
-.border-4 {
-  border-width: 4px;
-}
-
 .border-2 {
   border-width: 2px;
 }
@@ -1311,24 +1311,14 @@ video {
   --tw-border-opacity: 0.5;
 }
 
-.bg-white {
-  --tw-bg-opacity: 1;
-  background-color: rgba(255, 255, 255, var(--tw-bg-opacity));
-}
-
 .bg-blue-50 {
   --tw-bg-opacity: 1;
   background-color: rgba(239, 246, 255, var(--tw-bg-opacity));
 }
 
-.bg-blue-100 {
+.bg-white {
   --tw-bg-opacity: 1;
-  background-color: rgba(219, 234, 254, var(--tw-bg-opacity));
+  background-color: rgba(255, 255, 255, var(--tw-bg-opacity));
-}
-
-.bg-gray-400 {
-  --tw-bg-opacity: 1;
-  background-color: rgba(156, 163, 175, var(--tw-bg-opacity));
 }
 
 .bg-indigo-100 {
@@ -1346,11 +1336,6 @@ video {
   background-color: rgba(0, 0, 0, var(--tw-bg-opacity));
 }
 
-.bg-gray-200 {
-  --tw-bg-opacity: 1;
-  background-color: rgba(229, 231, 235, var(--tw-bg-opacity));
-}
-
 .bg-gray-100 {
   --tw-bg-opacity: 1;
   background-color: rgba(243, 244, 246, var(--tw-bg-opacity));
@@ -1366,6 +1351,21 @@ video {
   background-color: rgba(254, 202, 202, var(--tw-bg-opacity));
 }
 
+.bg-blue-100 {
+  --tw-bg-opacity: 1;
+  background-color: rgba(219, 234, 254, var(--tw-bg-opacity));
+}
+
+.bg-gray-400 {
+  --tw-bg-opacity: 1;
+  background-color: rgba(156, 163, 175, var(--tw-bg-opacity));
+}
+
+.bg-gray-200 {
+  --tw-bg-opacity: 1;
+  background-color: rgba(229, 231, 235, var(--tw-bg-opacity));
+}
+
 .p-1\.5 {
   padding: 0.375rem;
 }
@@ -1374,18 +1374,14 @@ video {
   padding: 0.25rem;
 }
 
-.p-3 {
+.p-2 {
-  padding: 0.75rem;
+  padding: 0.5rem;
 }
 
 .p-4 {
   padding: 1rem;
 }
 
-.p-2 {
-  padding: 0.5rem;
-}
-
 .p-0\.5 {
   padding: 0.125rem;
 }
@@ -1394,12 +1390,8 @@ video {
   padding: 0px;
 }
 
-.pt-3 {
+.p-3 {
-  padding-top: 0.75rem;
+  padding: 0.75rem;
-}
-
-.pb-3 {
-  padding-bottom: 0.75rem;
 }
 
 .pl-4 {
@@ -1410,18 +1402,14 @@ video {
   padding-bottom: 0px;
 }
 
-.pl-1 {
-  padding-left: 0.25rem;
-}
-
-.pr-1 {
-  padding-right: 0.25rem;
-}
-
 .pt-6 {
   padding-top: 1.5rem;
 }
 
+.pb-3 {
+  padding-bottom: 0.75rem;
+}
+
 .pl-2 {
   padding-left: 0.5rem;
 }
@@ -1442,10 +1430,6 @@ video {
   padding-left: 0.75rem;
 }
 
-.pr-0 {
-  padding-right: 0px;
-}
-
 .pb-2 {
   padding-bottom: 0.5rem;
 }
@@ -1458,6 +1442,22 @@ video {
   padding-top: 0px;
 }
 
+.pt-3 {
+  padding-top: 0.75rem;
+}
+
+.pl-1 {
+  padding-left: 0.25rem;
+}
+
+.pr-1 {
+  padding-right: 0.25rem;
+}
+
+.pr-0 {
+  padding-right: 0px;
+}
+
 .pr-2 {
   padding-right: 0.5rem;
 }
@@ -1474,16 +1474,6 @@ video {
   vertical-align: middle;
 }
 
-.text-xl {
-  font-size: 1.25rem;
-  line-height: 1.75rem;
-}
-
-.text-sm {
-  font-size: 0.875rem;
-  line-height: 1.25rem;
-}
-
 .text-2xl {
   font-size: 1.5rem;
   line-height: 2rem;
@@ -1499,6 +1489,16 @@ video {
   line-height: 1.75rem;
 }
 
+.text-xl {
+  font-size: 1.25rem;
+  line-height: 1.75rem;
+}
+
+.text-sm {
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+
 .text-4xl {
   font-size: 2.25rem;
   line-height: 2.5rem;
@@ -1508,6 +1508,10 @@ video {
   font-weight: 700;
 }
 
+.font-medium {
+  font-weight: 500;
+}
+
 .font-extrabold {
   font-weight: 800;
 }
@@ -1516,10 +1520,6 @@ video {
   font-weight: 600;
 }
 
-.font-medium {
-  font-weight: 500;
-}
-
 .uppercase {
   text-transform: uppercase;
 }
@@ -1553,26 +1553,26 @@ video {
   letter-spacing: -0.025em;
 }
 
-.text-white {
-  --tw-text-opacity: 1;
-  color: rgba(255, 255, 255, var(--tw-text-opacity));
-}
-
 .text-gray-900 {
   --tw-text-opacity: 1;
   color: rgba(17, 24, 39, var(--tw-text-opacity));
 }
 
-.text-gray-800 {
-  --tw-text-opacity: 1;
-  color: rgba(31, 41, 55, var(--tw-text-opacity));
-}
-
 .text-gray-500 {
   --tw-text-opacity: 1;
   color: rgba(107, 114, 128, var(--tw-text-opacity));
 }
 
+.text-white {
+  --tw-text-opacity: 1;
+  color: rgba(255, 255, 255, var(--tw-text-opacity));
+}
+
+.text-gray-800 {
+  --tw-text-opacity: 1;
+  color: rgba(31, 41, 55, var(--tw-text-opacity));
+}
+
 .text-green-600 {
   --tw-text-opacity: 1;
   color: rgba(5, 150, 105, var(--tw-text-opacity));
@@ -2170,16 +2170,16 @@ li::marker {
   width: unset;
 }
 
-.hover\:bg-blue-200:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgba(191, 219, 254, var(--tw-bg-opacity));
-}
-
 .hover\:bg-indigo-200:hover {
   --tw-bg-opacity: 1;
   background-color: rgba(199, 210, 254, var(--tw-bg-opacity));
 }
 
+.hover\:bg-blue-200:hover {
+  --tw-bg-opacity: 1;
+  background-color: rgba(191, 219, 254, var(--tw-bg-opacity));
+}
+
 .hover\:text-blue-800:hover {
   --tw-text-opacity: 1;
   color: rgba(30, 64, 175, var(--tw-text-opacity));
@@ -2214,14 +2214,14 @@ li::marker {
     height: 6rem;
   }
 
-  .sm\:w-24 {
-    width: 6rem;
-  }
-
   .sm\:w-auto {
     width: auto;
   }
 
+  .sm\:w-24 {
+    width: 6rem;
+  }
+
   .sm\:max-w-sm {
     max-width: 24rem;
   }

package-lock.json

@@ -51,6 +51,7 @@
         "@types/node": "^7.0.5",
         "assert": "^2.0.0",
         "fs": "0.0.1-security",
+        "git-json-merge": "^0.4.5",
         "marked": "^2.0.0",
         "read-file": "^0.2.0",
         "sharp": "^0.28.3",
@@ -3078,6 +3079,12 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/adiff": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/adiff/-/adiff-0.2.13.tgz",
+      "integrity": "sha1-3D3TL5RNl/J366WM5SmXrf8fdyg=",
+      "dev": true
+    },
     "node_modules/affine-hull": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/affine-hull/-/affine-hull-1.0.0.tgz",
@@ -5255,6 +5262,15 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
+    "node_modules/detect-indent": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
+      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -6260,6 +6276,22 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "node_modules/git-json-merge": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/git-json-merge/-/git-json-merge-0.4.5.tgz",
+      "integrity": "sha512-akVUhyzRtkXGe5uAcw3AijF/253RA7tAPdfHtKLawYAhDjuyP+Ebr1YvZUv+7Jyr41g+IVRpKPBd2h+m6AHNqQ==",
+      "dev": true,
+      "dependencies": {
+        "detect-indent": "^6.0.0",
+        "xdiff": "^0.2.11"
+      },
+      "bin": {
+        "git-json-merge": "bin/git-json-merge"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@@ -16338,6 +16370,18 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "node_modules/xdiff": {
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/xdiff/-/xdiff-0.2.11.tgz",
+      "integrity": "sha1-cj1SPhtvJlojPK/HeGBiLqXS2Mg=",
+      "dev": true,
+      "dependencies": {
+        "adiff": "~0.2.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
@@ -19104,6 +19148,12 @@
       "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
       "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
     },
+    "adiff": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/adiff/-/adiff-0.2.13.tgz",
+      "integrity": "sha1-3D3TL5RNl/J366WM5SmXrf8fdyg=",
+      "dev": true
+    },
     "affine-hull": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/affine-hull/-/affine-hull-1.0.0.tgz",
@@ -20861,6 +20911,12 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
       "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
     },
+    "detect-indent": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
+      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
+      "dev": true
+    },
     "detect-libc": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
@@ -21666,6 +21722,16 @@
         "assert-plus": "^1.0.0"
       }
     },
+    "git-json-merge": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/git-json-merge/-/git-json-merge-0.4.5.tgz",
+      "integrity": "sha512-akVUhyzRtkXGe5uAcw3AijF/253RA7tAPdfHtKLawYAhDjuyP+Ebr1YvZUv+7Jyr41g+IVRpKPBd2h+m6AHNqQ==",
+      "dev": true,
+      "requires": {
+        "detect-indent": "^6.0.0",
+        "xdiff": "^0.2.11"
+      }
+    },
     "github-from-package": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
@@ -29892,6 +29958,15 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "xdiff": {
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/xdiff/-/xdiff-0.2.11.tgz",
+      "integrity": "sha1-cj1SPhtvJlojPK/HeGBiLqXS2Mg=",
+      "dev": true,
+      "requires": {
+        "adiff": "~0.2.4"
+      }
+    },
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",

package.json

@@ -95,6 +95,7 @@
     "@types/node": "^7.0.5",
     "assert": "^2.0.0",
     "fs": "0.0.1-security",
+    "git-json-merge": "^0.4.5",
     "marked": "^2.0.0",
     "read-file": "^0.2.0",
     "sharp": "^0.28.3",