Merging

Author: Bryan Parker

.gitignore

@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-dist
-node_modules
-.DS_Store
-.vscode
-=======
 # Logs
 logs
 *.log
@@ -28,4 +22,3 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
->>>>>>> refactor/master

README.md

@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-![vimath logo](assets/logo.png)
-
-=======
->>>>>>> refactor/master
 # Vimath (VIsual MATH)
 
 Vimath is a browser library for creating animatable and interactive visualizations. While it's general and flexible enough for any visualizations
@@ -34,19 +29,10 @@ class TestScene extends Scene {
             .scale(0.5);   // Scale down by 50%
 
         this.add(s, t);
-<<<<<<< HEAD
-
-        return this;
-    }
-}
-
-new TestScene().compose().render();
-=======
     }
 }
 
 new TestScene().render();
->>>>>>> refactor/master
 ```
 
 #### Output

docs/.nojekyll

@@ -0,0 +1 @@
+TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false.

docs/assets/highlight.css

@@ -0,0 +1,92 @@
+:root {
+    --light-hl-0: #AF00DB;
+    --dark-hl-0: #C586C0;
+    --light-hl-1: #000000;
+    --dark-hl-1: #D4D4D4;
+    --light-hl-2: #001080;
+    --dark-hl-2: #9CDCFE;
+    --light-hl-3: #A31515;
+    --dark-hl-3: #CE9178;
+    --light-hl-4: #0000FF;
+    --dark-hl-4: #569CD6;
+    --light-hl-5: #267F99;
+    --dark-hl-5: #4EC9B0;
+    --light-hl-6: #795E26;
+    --dark-hl-6: #DCDCAA;
+    --light-hl-7: #0070C1;
+    --dark-hl-7: #4FC1FF;
+    --light-hl-8: #098658;
+    --dark-hl-8: #B5CEA8;
+    --light-hl-9: #008000;
+    --dark-hl-9: #6A9955;
+    --light-code-background: #FFFFFF;
+    --dark-code-background: #1E1E1E;
+}
+
+@media (prefers-color-scheme: light) { :root {
+    --hl-0: var(--light-hl-0);
+    --hl-1: var(--light-hl-1);
+    --hl-2: var(--light-hl-2);
+    --hl-3: var(--light-hl-3);
+    --hl-4: var(--light-hl-4);
+    --hl-5: var(--light-hl-5);
+    --hl-6: var(--light-hl-6);
+    --hl-7: var(--light-hl-7);
+    --hl-8: var(--light-hl-8);
+    --hl-9: var(--light-hl-9);
+    --code-background: var(--light-code-background);
+} }
+
+@media (prefers-color-scheme: dark) { :root {
+    --hl-0: var(--dark-hl-0);
+    --hl-1: var(--dark-hl-1);
+    --hl-2: var(--dark-hl-2);
+    --hl-3: var(--dark-hl-3);
+    --hl-4: var(--dark-hl-4);
+    --hl-5: var(--dark-hl-5);
+    --hl-6: var(--dark-hl-6);
+    --hl-7: var(--dark-hl-7);
+    --hl-8: var(--dark-hl-8);
+    --hl-9: var(--dark-hl-9);
+    --code-background: var(--dark-code-background);
+} }
+
+:root[data-theme='light'] {
+    --hl-0: var(--light-hl-0);
+    --hl-1: var(--light-hl-1);
+    --hl-2: var(--light-hl-2);
+    --hl-3: var(--light-hl-3);
+    --hl-4: var(--light-hl-4);
+    --hl-5: var(--light-hl-5);
+    --hl-6: var(--light-hl-6);
+    --hl-7: var(--light-hl-7);
+    --hl-8: var(--light-hl-8);
+    --hl-9: var(--light-hl-9);
+    --code-background: var(--light-code-background);
+}
+
+:root[data-theme='dark'] {
+    --hl-0: var(--dark-hl-0);
+    --hl-1: var(--dark-hl-1);
+    --hl-2: var(--dark-hl-2);
+    --hl-3: var(--dark-hl-3);
+    --hl-4: var(--dark-hl-4);
+    --hl-5: var(--dark-hl-5);
+    --hl-6: var(--dark-hl-6);
+    --hl-7: var(--dark-hl-7);
+    --hl-8: var(--dark-hl-8);
+    --hl-9: var(--dark-hl-9);
+    --code-background: var(--dark-code-background);
+}
+
+.hl-0 { color: var(--hl-0); }
+.hl-1 { color: var(--hl-1); }
+.hl-2 { color: var(--hl-2); }
+.hl-3 { color: var(--hl-3); }
+.hl-4 { color: var(--hl-4); }
+.hl-5 { color: var(--hl-5); }
+.hl-6 { color: var(--hl-6); }
+.hl-7 { color: var(--hl-7); }
+.hl-8 { color: var(--hl-8); }
+.hl-9 { color: var(--hl-9); }
+pre, code { background: var(--code-background); }

docs/assets/main.js

@@ -29,11 +29,7 @@
     --light-color-ts-constructor-signature: var(--light-color-ts-constructor);
     --light-color-ts-parameter: var(--light-color-ts-variable);
     /* type literal not included as links will never be generated to it */
-<<<<<<< HEAD
-    --light-color-ts-type-parameter: var(--light-color-ts-type-alias);
-=======
     --light-color-ts-type-parameter: #a55c0e;
->>>>>>> refactor/master
     --light-color-ts-accessor: var(--light-color-ts-property);
     --light-color-ts-get-signature: var(--light-color-ts-accessor);
     --light-color-ts-set-signature: var(--light-color-ts-accessor);
@@ -73,11 +69,7 @@
     --dark-color-ts-constructor-signature: var(--dark-color-ts-constructor);
     --dark-color-ts-parameter: var(--dark-color-ts-variable);
     /* type literal not included as links will never be generated to it */
-<<<<<<< HEAD
-    --dark-color-ts-type-parameter: var(--dark-color-ts-type-alias);
-=======
     --dark-color-ts-type-parameter: #e07d13;
->>>>>>> refactor/master
     --dark-color-ts-accessor: var(--dark-color-ts-property);
     --dark-color-ts-get-signature: var(--dark-color-ts-accessor);
     --dark-color-ts-set-signature: var(--dark-color-ts-accessor);
@@ -274,21 +266,12 @@ h6 {
     line-height: 1.2;
 }
 
-<<<<<<< HEAD
-h1 > a,
-h2 > a,
-h3 > a,
-h4 > a,
-h5 > a,
-h6 > a {
-=======
 h1 > a:not(.link),
 h2 > a:not(.link),
 h3 > a:not(.link),
 h4 > a:not(.link),
 h5 > a:not(.link),
 h6 > a:not(.link) {
->>>>>>> refactor/master
     text-decoration: none;
     color: var(--color-text);
 }
@@ -344,26 +327,14 @@ dd {
 }
 
 /* Footer */
-<<<<<<< HEAD
-.tsd-generator {
-=======
 footer {
->>>>>>> refactor/master
     border-top: 1px solid var(--color-accent);
     padding-top: 1rem;
     padding-bottom: 1rem;
     max-height: 3.5rem;
 }
-<<<<<<< HEAD
-
-.tsd-generator > p {
-    margin-top: 0;
-    margin-bottom: 0;
-    padding: 0 1rem;
-=======
 .tsd-generator {
     margin: 0 1em;
->>>>>>> refactor/master
 }
 
 .container-main {
@@ -431,12 +402,8 @@ footer {
 }
 body {
     background: var(--color-background);
-<<<<<<< HEAD
-    font-family: "Segoe UI", sans-serif;
-=======
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans",
         Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
->>>>>>> refactor/master
     font-size: 16px;
     color: var(--color-text);
 }
@@ -680,8 +647,6 @@ input[type="checkbox"]:checked ~ svg .tsd-checkbox-checkmark {
     font-weight: bold;
 }
 
-<<<<<<< HEAD
-=======
 .tsd-full-hierarchy:not(:last-child) {
     margin-bottom: 1em;
     padding-bottom: 1em;
@@ -704,7 +669,6 @@ input[type="checkbox"]:checked ~ svg .tsd-checkbox-checkmark {
     color: var(--color-text);
 }
 
->>>>>>> refactor/master
 .tsd-panel-group.tsd-index-group {
     margin-bottom: 0;
 }
@@ -770,23 +734,15 @@ input[type="checkbox"]:checked ~ svg .tsd-checkbox-checkmark {
 }
 .tsd-navigation > a,
 .tsd-navigation .tsd-accordion-summary {
-<<<<<<< HEAD
-    width: calc(100% - 0.5rem);
-=======
     width: calc(100% - 0.25rem);
     display: flex;
     align-items: center;
->>>>>>> refactor/master
 }
 .tsd-navigation a,
 .tsd-navigation summary > span,
 .tsd-page-navigation a {
-<<<<<<< HEAD
-    display: inline-flex;
-=======
     display: flex;
     width: calc(100% - 0.25rem);
->>>>>>> refactor/master
     align-items: center;
     padding: 0.25rem;
     color: var(--color-text);
@@ -826,14 +782,6 @@ input[type="checkbox"]:checked ~ svg .tsd-checkbox-checkmark {
     margin-left: -1.5rem;
 }
 
-<<<<<<< HEAD
-.tsd-nested-navigation > li > a,
-.tsd-nested-navigation > li > span {
-    width: calc(100% - 1.75rem - 0.5rem);
-}
-
-=======
->>>>>>> refactor/master
 .tsd-page-navigation ul {
     padding-left: 1.75rem;
 }