Merge branch 'master' into motorslider

2018-01-10 09:56:59 -08:00
parent 16b9a5027d f64bf57000
commit 4e4f5495da
165 changed files with 13655 additions and 849 deletions
--- a/sim/visuals/controls/colorGrid.ts
+++ b/sim/visuals/controls/colorGrid.ts
@ -7,7 +7,7 @@ namespace pxsim.visuals {

        getInnerView() {
            this.group = svg.elt("g") as SVGGElement;
-            this.group.setAttribute("transform", `translate(1.02, 1.5) scale(0.8)`)
+            this.group.setAttribute("transform", `translate(2, 2.5) scale(0.6)`)

            const colorIds = ['red', 'yellow', 'blue', 'green', undefined, 'grey'];
            const colors = ['#f12a21', '#ffd01b', '#006db3', '#00934b', undefined, '#6c2d00'];