diff options
| -rw-r--r-- | public/assets/javascripts/mx/mx.js | 14 | ||||
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.text.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.video.js | 4 | ||||
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.vimeo.js | 4 | ||||
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.youtube.js | 4 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 26 |
6 files changed, 32 insertions, 22 deletions
diff --git a/public/assets/javascripts/mx/mx.js b/public/assets/javascripts/mx/mx.js index 40a5f2e..d59a551 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, 10) + || parseInt(self.el.style.width*devicePixelRatio, 10) || 0 }, set: function (val) { width = val - this.el.style.width = width + 'px' + this.el.style.width = (width/devicePixelRatio) + 'px' } }) Object.defineProperty(this, 'height', { get: function () { return height - || parseInt(self.el.style.height, 10) + || parseInt(self.el.style.height*devicePixelRatio, 10) || 0 }, set: function (val) { height = val - this.el.style.height = height + 'px' + this.el.style.height = (height/devicePixelRatio) + 'px' } }) } @@ -302,9 +302,9 @@ var MX = MX || (function (undefined) { + (-this.y).toFixed(floatPrecision) + 'px,' + (-this.z).toFixed(floatPrecision) + 'px) ' + 'scale3d(' - + this.scaleX.toFixed(floatPrecision) + ',' - + this.scaleY.toFixed(floatPrecision) + ',' - + this.scaleZ.toFixed(floatPrecision) + ') ' + + (devicePixelRatio * this.scaleX).toFixed(floatPrecision) + ',' + + (devicePixelRatio * this.scaleY).toFixed(floatPrecision) + ',' + + (devicePixelRatio * this.scaleZ).toFixed(floatPrecision) + ') ' if (rotationTranslation) { transformString += rotationTranslation.before diff --git a/public/assets/javascripts/mx/primitives/mx.text.js b/public/assets/javascripts/mx/primitives/mx.text.js index a0f9283..6b5681b 100644 --- a/public/assets/javascripts/mx/primitives/mx.text.js +++ b/public/assets/javascripts/mx/primitives/mx.text.js @@ -47,7 +47,7 @@ MX.Text = MX.Object3D.extend({ if (! font.color || font.color[0] == "#") { font.color = [0,0,0] } this.inner.style.fontFamily = "'" + font.family + "',sans-serif" - this.el.style.fontSize = (2 * font.size) + "pt" + this.el.style.fontSize = (2 * font.size / devicePixelRatio) + "pt" this.el.style.textAlign = font.align this.el.style.color = rgb_string(font.color) }, diff --git a/public/assets/javascripts/mx/primitives/mx.video.js b/public/assets/javascripts/mx/primitives/mx.video.js index 333e1d2..c281f02 100644 --- a/public/assets/javascripts/mx/primitives/mx.video.js +++ b/public/assets/javascripts/mx/primitives/mx.video.js @@ -31,8 +31,8 @@ MX.Video = MX.Object3D.extend({ this.player.addEventListener("loadedmetadata", this.ready.bind(this)) this.player.addEventListener("error", this.error.bind(this)) this.player.addEventListener("ended", this.finished.bind(this)) - this.player.width = this.width - this.player.height = this.height + this.player.width = "100%" + this.player.height = "100%" this.player.src = this.media.url this.player.load() diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js index e71b105..fe5ce86 100644 --- a/public/assets/javascripts/mx/primitives/mx.vimeo.js +++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js @@ -32,8 +32,8 @@ MX.Vimeo = MX.Object3D.extend({ preload.id = uid preload.setAttribute("src", "//player.vimeo.com/video/" + this.media.token + "?api=1&badge=0&controls=0branding=0&byline=0&portrait=0&title=0&" + loop + "&player_id=" + uid) preload.style.backgroundImage = "url(" + this.media.thumbnail + ")" - preload.style.width = this.media.width + "px" - preload.style.height = this.media.height + "px" + preload.style.width = "100%" + preload.style.height = "100%" preload.style.border = "0" preload.style.pointerEvents = "none" preload.className = "preload" diff --git a/public/assets/javascripts/mx/primitives/mx.youtube.js b/public/assets/javascripts/mx/primitives/mx.youtube.js index 3f342a1..5c92378 100644 --- a/public/assets/javascripts/mx/primitives/mx.youtube.js +++ b/public/assets/javascripts/mx/primitives/mx.youtube.js @@ -31,8 +31,8 @@ MX.Youtube = MX.Object3D.extend({ preload.id = uid preload.style.backgroundImage = "url(" + this.media.thumbnail + ")" preload.style.backgroundSize = "cover" - preload.style.width = this.media.width + "px" - preload.style.height = this.media.height + "px" + preload.style.width = "100%" + preload.style.height = "100%" preload.style.pointerEvents = "none" preload.style.position = "absolute" preload.style.top = "0" diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 201819d..218f38b 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -13,11 +13,11 @@ input:-webkit-autofill { } .mobile input { -webkit-appearance: none; + border-radius:0; } -input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill { - background:white!important; -} + + *, *:before, *:after { moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; } @@ -44,6 +44,11 @@ body.editing *{ -moz-user-select: none; user-select: none; } + +body.editing input { + -webkit-user-select: auto; +} + body.noOverflow{ overflow:hidden; } @@ -432,10 +437,11 @@ iframe.embed { .projectList .projectItem { margin: 4%; + width: 22vw; display: inline-block; } .projectList .room { - width: 22vw; + width: 100%; height: 16vw; margin: 1vw 1vw 10px 1vw; display: table; @@ -882,6 +888,7 @@ iframe.embed { overflow: auto; max-height: 100%; width: 100%; + height: 100%; padding: 20px 0 40px 0; } .templates-list { @@ -911,6 +918,7 @@ border-left: 1px solid black; display: block; float: left; margin: 1vw 0; + width:20%; padding: 2vw; cursor: pointer; } @@ -918,7 +926,7 @@ border-left: 1px solid black; background-position: center; background-size: cover; background-color: #fff; - width: 20vw; + width: 100%; height: 15vw; display: block; background-color: #ddd; @@ -2503,7 +2511,7 @@ form li textarea { -moz-transition:0.2s background; transition:0.2s background; position: relative; - z-index: 5; + z-index: 6; } @@ -2722,7 +2730,7 @@ a[data-role="forgot-password"] { .share a:nth-child(3), .share a:nth-child(4) { margin-left:4px; } -.share a:hover{ +.desktop .share a:hover{ text-decoration:underline; } .vvbox.share { @@ -3102,6 +3110,9 @@ a[data-role="forgot-password"] { .reader .topLinks a { display:none; } + .reader iframe { + display:none; + } } @media screen and (orientation:portrait) { @@ -3125,7 +3136,6 @@ a[data-role="forgot-password"] { border-top: 1px solid; border-bottom: 1px solid; padding: 20px 0; - background-color:rgba(255,255,255,0.7); } } |