roll back devicePixelRatio fix on desktop

3 files changed, 14 insertions, 8 deletions

diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js
index 41edafe..a146325 100644
--- a/public/assets/javascripts/app.js
+++ b/public/assets/javascripts/app.js
@@ -3,7 +3,7 @@ if (is_mobile) {
 	$("html").addClass("mobile")
 }
 else {
- $("html").addClass("desktop")
+  $("html").addClass("desktop")
 }
 
 
@@ -23,6 +23,8 @@ app.launch = function () {
   
 	var movements
 
+	app.devicePixelRatio = is_mobile ? devicePixelRatio : 1
+
 	scene = new MX.Scene().addTo('#scene')
 	scene.width = window.innerWidth
 	scene.height = window.innerHeight
diff --git a/public/assets/javascripts/mx/mx.js b/public/assets/javascripts/mx/mx.js
index d59a551..ab9a9a0 100644
--- a/public/assets/javascripts/mx/mx.js
+++ b/public/assets/javascripts/mx/mx.js
@@ -162,24 +162,24 @@ var MX = MX || (function (undefined) {
         Object.defineProperty(this, 'width', {
             get: function () {
                 return width
-                    || parseInt(self.el.style.width*devicePixelRatio, 10)
+                    || parseInt(self.el.style.width, 10) * app.devicePixelRatio
                     || 0
             },
             set: function (val) {
                 width = val
-                this.el.style.width = (width/devicePixelRatio) + 'px'
+                this.el.style.width = (width/app.devicePixelRatio) + 'px'
             }
         })
 
         Object.defineProperty(this, 'height', {
             get: function () {
                 return height
-                    || parseInt(self.el.style.height*devicePixelRatio, 10)
+                    || parseInt(self.el.style.height, 10) * app.devicePixelRatio
                     || 0
             },
             set: function (val) {
                 height = val
-                this.el.style.height = (height/devicePixelRatio) + 'px'
+                this.el.style.height = (height/app.devicePixelRatio) + 'px'
             }
         })
     }
@@ -302,9 +302,9 @@ var MX = MX || (function (undefined) {
                         + (-this.y).toFixed(floatPrecision) + 'px,'
                         + (-this.z).toFixed(floatPrecision) + 'px) '
                     + 'scale3d('
-                        + (devicePixelRatio * this.scaleX).toFixed(floatPrecision) + ','
-                        + (devicePixelRatio * this.scaleY).toFixed(floatPrecision) + ','
-                        + (devicePixelRatio * this.scaleZ).toFixed(floatPrecision) + ') '
+                        + (app.devicePixelRatio * this.scaleX).toFixed(floatPrecision) + ','
+                        + (app.devicePixelRatio * this.scaleY).toFixed(floatPrecision) + ','
+                        + (app.devicePixelRatio * this.scaleZ).toFixed(floatPrecision) + ') '
 
                 if (rotationTranslation) {
                     transformString += rotationTranslation.before
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index aecd6be..62a5682 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -913,6 +913,9 @@ border-left: 1px solid black;
 .no-templates {
 	display: none;
 }
+.no-templates a {
+	border-bottom: 1px solid;
+}
 
 .templates span {
 	display: block;
@@ -2357,6 +2360,7 @@ button {
   font-weight: 500;
   width: 100%;
 	font-size:14px;
+	font-family:'Lato', sans-serif;
 }
 
 #builder-units {