vvalls

From 17fabffafc8e0f9723db6e19ae2ff14012c56a63 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 10 Nov 2014 12:10:05 -0500 Subject: surface avatar --- public/assets/stylesheets/app.css | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index e6b5570..cb58ef6 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -2542,12 +2542,21 @@ a[data-role="forgot-password"] { .aboutRoom.vvbox .txt { padding: 5px 0 3px 0; } - -.aboutRoom h1 a{ +.aboutRoom h1 a { text-decoration: none; font-style: italic; font-weight:500; } +.aboutRoom .profilePic { + width: 34px; + height: 34px; + float: none; + display: inline-block; + vertical-align: middle; +} +.aboutRoom .authorName { + vertical-align: middle; +} .desktop .aboutRoom h1 a:hover { text-decoration:underline; -- cgit v1.2.3-70-g09d2 From 8e6693f0b98733b7958a33948e8705c42f35c571 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 10 Nov 2014 16:00:01 -0500 Subject: randomize button, minimap in a weird place --- public/assets/stylesheets/app.css | 18 ++++++++++++++++++ views/reader.ejs | 4 +--- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index cb58ef6..bf76a71 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1574,6 +1574,9 @@ border-left: 1px solid black; -webkit-transition:opacity 0.3s ease-in-out; transition:opacity 0.3s ease-in-out; } +.reader #minimap { + left: 210px; +} /* WALLPAPER PICKER */ @@ -2168,6 +2171,21 @@ input[type="range"]::-webkit-slider-thumb { margin-top:5px; width: 100%; } +#randomize { + background: white; + display: inline-block; + color: black; + text-decoration:none; + border:1px solid black; + text-align: center; + font-size: 13px; + padding: 3px; + cursor: pointer; +} +#randomize:hover { + color: white; + background: black; +} .warn { background:red; display: inline-block; diff --git a/views/reader.ejs b/views/reader.ejs index b9b53d2..09b702e 100644 --- a/views/reader.ejs +++ b/views/reader.ejs @@ -4,7 +4,7 @@ vvalls [[ include partials/meta ]] - +

@@ -18,11 +18,9 @@ [[ include controls/reader/embed ]] - [[ } ]] -- cgit v1.2.3-70-g09d2 From 8f04b3576d09db841c88a13442b4027810a25cc5 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 10 Nov 2014 16:17:58 -0500 Subject: ipad media queries for hero image --- public/assets/stylesheets/app.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index cb58ef6..4ec83b2 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -2375,6 +2375,8 @@ form li textarea { background-position: center; margin-top: 63px; } + + .hero .circle { font-size: 20px; font-weight: 300; @@ -3002,3 +3004,18 @@ a[data-role="forgot-password"] { width: 55%; } } + + +@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (-webkit-min-device-pixel-ratio: 1) { + .hero{ + height: 500pt; + } + +} + +@media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (-webkit-min-device-pixel-ratio: 2) { + .hero{ + height: 500pt; + } + +} \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 5673a05184ed0624ec33bfea27686e7e70b1d619 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 10 Nov 2014 16:23:42 -0500 Subject: more ipad stuff --- public/assets/stylesheets/app.css | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 444cd67..3148c97 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -3028,12 +3028,36 @@ a[data-role="forgot-password"] { .hero{ height: 500pt; } - + .mobile #scene:after{ + content:url(/assets/img/360.png); + z-index: 3; + position: fixed; + bottom: -3px; + right: -3px; + } + #keyhint { + display:none; + } + .topLinks a[data-role="new-project-modal"], .topLinks a[data-role="show-layouts-modal"] { + display:none; + } } @media only screen and (min-device-width : 768px) and (max-device-width : 1024px) and (-webkit-min-device-pixel-ratio: 2) { .hero{ height: 500pt; } - + .mobile #scene:after{ + content:url(/assets/img/360.png); + z-index: 3; + position: fixed; + bottom: -3px; + right: -3px; + } + #keyhint { + display:none; + } + .topLinks a[data-role="new-project-modal"], .topLinks a[data-role="show-layouts-modal"] { + display:none; + } } -- cgit v1.2.3-70-g09d2 From ff6ba4b914d56324765b369467a2daf4e2612da8 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 10 Nov 2014 16:36:50 -0500 Subject: minimap placement --- .../assets/javascripts/mx/extensions/mx.movements.js | 2 +- public/assets/stylesheets/app.css | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js index 2c231ae..82db40d 100644 --- a/public/assets/javascripts/mx/extensions/mx.movements.js +++ b/public/assets/javascripts/mx/extensions/mx.movements.js @@ -33,7 +33,7 @@ MX.Movements = function (cam) { var pos = { x: 0, y: 0, z: 0, rotationX: 0, rotationY: 0 } - $(document).one("keydown", function(){ $("#keyhint").fadeOut(250) }) + $(document).one("keydown", function(){ $("#keyhint").fadeOut(250); $('.reader #minimap').addClass('active'); }) function clampRotation( vr ) { if (Rooms.mover.noclip) { return clamp(vr, PI/-2, PI/2 ) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 3148c97..2bdd64f 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1575,9 +1575,26 @@ border-left: 1px solid black; transition:opacity 0.3s ease-in-out; } .reader #minimap { - left: 210px; + right: 20px; + left: auto; + -webkit-transform:translateX(180px); + -moz-transform:translateX(180px); + transform:translateX(180px); + -webkit-transition:0.6s -webkit-transform; + -moz-transition:0.6s -moz-transform; + transition:0.6s transform; +} + +.reader #minimap.active { + -webkit-transform:translateX(0px); + -moz-transform:translateX(0px); + transform:translateX(0px); + left: auto; } +.mobile .reader #minimap{ + display:none; +} /* WALLPAPER PICKER */ -- cgit v1.2.3-70-g09d2 From fc1c87b875d7a978747a819088883b6141f277f2 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 10 Nov 2014 16:53:31 -0500 Subject: settings overlap fix --- public/assets/stylesheets/app.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 2bdd64f..8c9a945 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -3078,3 +3078,9 @@ a[data-role="forgot-password"] { display:none; } } + +@media (max-height: 680px) { + .settings { + right: 80px; + } +} \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 0f593787817d074ac00f55570a68838dd076ea3c Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 10 Nov 2014 17:30:20 -0500 Subject: hover --- public/assets/stylesheets/app.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 8c9a945..e97ffa1 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -953,7 +953,7 @@ border-left: 1px solid black; } .editing .mx-scenery:hover, .editing .mx-scenery.picked { - border: 1px dashed #000; + border: 15px dashed yellow; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; @@ -3079,7 +3079,7 @@ a[data-role="forgot-password"] { } } -@media (max-height: 680px) { +@media (max-height: 650px) { .settings { right: 80px; } -- cgit v1.2.3-70-g09d2 From 32c2630d6f384f3315b514ddf6d71dd4753dda66 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 11 Nov 2014 15:34:48 -0500 Subject: resize text field without scaling --- .../rectangles/engine/scenery/_scenery.js | 1 + .../rectangles/engine/scenery/resize.js | 55 +++++++++++++++++----- .../rectangles/engine/scenery/types/text.js | 21 +-------- .../assets/javascripts/rectangles/models/vec3.js | 3 ++ public/assets/stylesheets/app.css | 2 + 5 files changed, 49 insertions(+), 33 deletions(-) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js index 8ca00d3..436712a 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js +++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js @@ -29,6 +29,7 @@ var Scenery = new function(){ case 'text': scene_media = new Scenery.types.text (opt) + scene_media.focused = true break } base.list[scene_media.id] = scene_media diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js index e424829..5af7f3f 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/resize.js +++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js @@ -6,7 +6,7 @@ Scenery.resize = new function(){ var obj var x, y, z, bounds var dragging = false - var naturalDimension, dimension, position, scale + var naturalDimension, naturalDimensionCopy, dimension, position, scale var oldState var dots = [], dot, selected_dot @@ -143,6 +143,11 @@ Scenery.resize = new function(){ dimension = obj.dimensions position = new vec3(obj.mx.x, obj.mx.y, obj.mx.z) oldState = obj.serialize() + + if (obj.type == "text") { + naturalDimensionCopy = naturalDimension.clone() + positionCopy = position.clone() + } document.body.classList.add("dragging") } @@ -163,15 +168,23 @@ Scenery.resize = new function(){ mag = y_sign * mag * sign(height) } - obj.set_scale( ( dimension.a + mag ) / naturalDimension.a ) - - if (selected_dot.side & LEFT_RIGHT) { - obj.mx.x = position.a + cos(rotationY) * mag/2 * (x_sign) - obj.mx.z = position.c + sin(rotationY) * mag/2 * (x_sign) - } - if (selected_dot.side & TOP_BOTTOM) { - obj.mx.y = position.b - mag/2 * y_sign - } + if (obj.type == "text") { + obj.mx.width = obj.media.width = naturalDimension.a = naturalDimensionCopy.a + (mag * 2) + obj.mx.height = obj.media.height = naturalDimension.b = naturalDimensionCopy.b + (mag * 2) + dimension.a = naturalDimension.a * obj.scale + dimension.b = naturalDimension.b * obj.scale + } + else { + obj.set_scale( ( dimension.a + mag ) / naturalDimension.a ) + } + + if (selected_dot.side & LEFT_RIGHT) { + obj.mx.x = position.a + cos(rotationY) * mag/2 * (x_sign) + obj.mx.z = position.c + sin(rotationY) * mag/2 * (x_sign) + } + if (selected_dot.side & TOP_BOTTOM) { + obj.mx.y = position.b - mag/2 * y_sign + } base.move_dots() @@ -181,11 +194,26 @@ Scenery.resize = new function(){ function up (e, cursor){ if (! dragging) return dragging = false - selected_dot = null if (! editor.permissions.resize) { return } - obj.scale = obj.mx.ops.scale = obj.mx.scale - obj.dimensions.assign(obj.naturalDimensions).mul(obj.scale) + if (obj.type == "text") { + var newHeight = $(obj.mx.inner).height() + if (selected_dot.side & BOTTOM) { + obj.mx.y = position.b + (naturalDimensionCopy.b - newHeight) / 2 * obj.scale + } + else { + obj.mx.y = dots[0].y - newHeight/2*obj.scale + } + obj.mx.height = obj.media.height = naturalDimension.b = newHeight + dimension.a = naturalDimension.a * obj.scale + dimension.b = naturalDimension.b * obj.scale + base.move_dots() + } + else { + obj.scale = obj.mx.ops.scale = obj.mx.scale + obj.dimensions.assign(obj.naturalDimensions).mul(obj.scale) + } + UndoStack.push({ type: 'update-scenery', undo: oldState, @@ -196,6 +224,7 @@ Scenery.resize = new function(){ Minotaur.watch( app.router.editorView.settings ) document.body.classList.remove("dragging") + selected_dot = null } } diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/text.js b/public/assets/javascripts/rectangles/engine/scenery/types/text.js index dd1385f..6e11da2 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/types/text.js +++ b/public/assets/javascripts/rectangles/engine/scenery/types/text.js @@ -13,26 +13,7 @@ Scenery.types.text = Scenery.types.base.extend(function(base){ this.build() this.bind() - - if (opt.data) { - if (opt.wall) { - var position = opt.wall.mxToPosition(opt.data.position) - opt.index = opt.wall.surface.index_for_x( position.a, 0 ) - } - this.set_wall(opt) - this.deserialize(opt.data) - } - else { - this.set_wall(opt) - if (this.bounds) { - this.recenter() - if (opt.position) { - this.translateTo(opt.position) - } - var mx_position = this.wall.positionToMx( this.position, this.dimensions ) - this.mx.move(mx_position) - } - } + this.place(opt) }, build: function(){ diff --git a/public/assets/javascripts/rectangles/models/vec3.js b/public/assets/javascripts/rectangles/models/vec3.js index 4e00b0c..c44dfe6 100644 --- a/public/assets/javascripts/rectangles/models/vec3.js +++ b/public/assets/javascripts/rectangles/models/vec3.js @@ -15,6 +15,9 @@ vec3.prototype.sub = function(v){ this.c -= v.c return this } +vec3.prototype.clone = function(){ + return new vec3(this.a, this.b, this.c) +} // input: mat4 projection matrix vec3.prototype.apply_projection = function (m) { diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index e97ffa1..7b53cca 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -990,7 +990,9 @@ border-left: 1px solid black; pointer-events: none; } .mx-text { +/* overflow: hidden; + */ } .mx-text .inner { width: 100%; -- cgit v1.2.3-70-g09d2