summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryderr <r@okfoc.us>2014-11-10 16:36:50 -0500
committerryderr <r@okfoc.us>2014-11-10 16:36:50 -0500
commitff6ba4b914d56324765b369467a2daf4e2612da8 (patch)
tree6cceb3cb4f755ba3e2ef92b2f4080b97a55c1b37
parent5673a05184ed0624ec33bfea27686e7e70b1d619 (diff)
minimap placement
-rw-r--r--public/assets/javascripts/mx/extensions/mx.movements.js2
-rwxr-xr-xpublic/assets/stylesheets/app.css19
2 files changed, 19 insertions, 2 deletions
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 */