diff options
Diffstat (limited to 'public/assets')
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/map/ui_editor.js | 2 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/site/ProjectList.js | 20 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 13 |
3 files changed, 29 insertions, 6 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/ui_editor.js b/public/assets/javascripts/rectangles/engine/map/ui_editor.js index f9334e6..02218ed 100644 --- a/public/assets/javascripts/rectangles/engine/map/ui_editor.js +++ b/public/assets/javascripts/rectangles/engine/map/ui_editor.js @@ -50,7 +50,7 @@ Map.UI.Editor = function(map){ return r.focused = r.rect.contains(cursor.x.a, cursor.y.a) }) - if (intersects.length && base.permissions.destroy) { + if (intersects.length && (base.permissions.destroy || e.altKey)) { base.mouse.down = false room = intersects[0] diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js index 993d805..149cd41 100644 --- a/public/assets/javascripts/ui/site/ProjectList.js +++ b/public/assets/javascripts/ui/site/ProjectList.js @@ -4,13 +4,28 @@ var ProjectList = View.extend({ el: ".projectList", events: { - "mouseenter .room": 'spinOn', - "mouseleave .room": 'spinOff', + "mouseenter .room": 'enter', + "mouseleave .room": 'leave', }, initialize: function(){ }, + timeout: null, + enter: function(){ + clearTimeout(this.timeout) + this.advance() + }, + + leave: function(){ + clearTimeout(this.timeout) + }, + + advance: function(){ + this.timeout = setTimeout(this.advance.bind(this), 500) + } + +/* spinOn: function(e){ var iframe = $(e.currentTarget).find("iframe").get('0') if (! iframe) return @@ -22,5 +37,6 @@ var ProjectList = View.extend({ if (! iframe) return iframe.contentWindow.postMessage("spin-off", window.location.origin) } +*/ }) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index eebe6eb..d384dea 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -360,17 +360,23 @@ iframe.embed { .room .images { position: absolute; top: 0; left: 0; - z-index: 2; + z-index: -1; width: 100%; height: 100%; text-align: center; overflow: hidden; } -.room .images img { - width: 30%; +.room .images div { position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-size: cover; + background-position: center center; } +/* .room .images[data-mediacount='1'] img:nth-child(1) { left: 20%; top: 20%; } .room .images[data-mediacount='2'] img:nth-child(1) { left: 51%; bottom: 0%; width: auto; height: 40%; } @@ -384,6 +390,7 @@ iframe.embed { .room .images[data-mediacount='4'] img:nth-child(2) { left: 51%; bottom: 61%; } .room .images[data-mediacount='4'] img:nth-child(3) { right: 51%; top: 61%; } .room .images[data-mediacount='4'] img:nth-child(4) { left: 51%; top: 41%; } +*/ .page .btn { clear: both; |
