From 7767259acb90375f55b15ad906e3d434219d43fc Mon Sep 17 00:00:00 2001 From: ryderr Date: Thu, 2 Oct 2014 12:26:38 -0400 Subject: no border on side --- public/assets/stylesheets/app.css | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'public') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index fbe9140..e278fab 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -69,6 +69,10 @@ a{ } #help-button { display: none; + border-right:0px!important; +} +.editProfile, .profileLink { + border-right:0px!important; } .editing #help-button { display: inline; @@ -318,15 +322,6 @@ iframe.embed { width: 100%; height: 50vh; } -.projectList .room:hover .holder{ - background: rgba(255,255,255,0); -} -.projectList .holder{ - background: rgba(255,255,255,0.7); - -webkit-transition:2s background; - -moz-transition:2s background; - transition:2s background; -} .room .images { position: absolute; @@ -491,7 +486,7 @@ iframe.embed { border-right:1px solid; } -.topLinks a:last-child { +.page .topLinks a:last-child { border-right:0px solid; } .topLinks a:hover { -- cgit v1.2.3-70-g09d2 From 6e5dbdeb78b72bf9775ed2ea233db0b2ad8b5e41 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 2 Oct 2014 13:03:24 -0400 Subject: get coordinates for point --- .../assets/javascripts/rectangles/models/wall.js | 8 ++++++ .../assets/javascripts/rectangles/util/coords.js | 33 ++++++++++++++++++++++ views/partials/scripts.ejs | 3 ++ 3 files changed, 44 insertions(+) create mode 100644 public/assets/javascripts/rectangles/util/coords.js (limited to 'public') diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js index 1b37aa0..07c3971 100644 --- a/public/assets/javascripts/rectangles/models/wall.js +++ b/public/assets/javascripts/rectangles/models/wall.js @@ -51,6 +51,14 @@ }) }, mousemove: function(e){ + var offset = offsetFromPoint(e, mx.el) + if (offset) { + console.log([offset.left * mx.width + mx.face.x.a, (1-offset.top) * mx.height + mx.face.y.a].map(Math.round)) +// console.log(mx) + } + else { + console.log("NONE") + } }, mousedown: function(e){ if (Scenery.nextMedia) { diff --git a/public/assets/javascripts/rectangles/util/coords.js b/public/assets/javascripts/rectangles/util/coords.js new file mode 100644 index 0000000..74b7fda --- /dev/null +++ b/public/assets/javascripts/rectangles/util/coords.js @@ -0,0 +1,33 @@ +function offsetFromPoint(event, element) { + function a(width) { + var l = 0, r = 200; + while (r - l > 0.0001) { + var mid = (r + l) / 2; + var a = document.createElement('div'); + a.style.cssText = 'position: absolute;left:0;top:0;background: red;z-index: 1000;'; + a.style[width ? 'width' : 'height'] = mid.toFixed(3) + '%'; + a.style[width ? 'height' : 'width'] = '100%'; + element.appendChild(a); + var x = document.elementFromPoint(event.clientX, event.clientY); + element.removeChild(a); + if (x === a) { + r = mid; + } else { + if (r === 200) { + return null; + } + l = mid; + } + } + return mid; + } + var l = a(1), + t = a(0); + return l && t ? { + left: l / 100, + top: t / 100, + toString: function () { + return 'left: ' + l + '%, top: ' + t + '%'; + } + } : null; +} diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 1ce180a..5ddab2a 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -21,8 +21,10 @@ + + @@ -33,6 +35,7 @@ + -- cgit v1.2.3-70-g09d2 From b512bcdfe49e0bce336f848dcf620c3c533e1f8c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 2 Oct 2014 13:12:40 -0400 Subject: saving icon --- public/assets/javascripts/rectangles/engine/scenery/move.js | 1 + public/assets/javascripts/rectangles/util/minotaur.js | 2 +- public/assets/stylesheets/app.css | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'public') diff --git a/public/assets/javascripts/rectangles/engine/scenery/move.js b/public/assets/javascripts/rectangles/engine/scenery/move.js index 55d6ef1..e7ca4ef 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/move.js +++ b/public/assets/javascripts/rectangles/engine/scenery/move.js @@ -88,6 +88,7 @@ Scenery.move = function(base){ } function up (e, cursor){ + console.log(dragging, oldState) if (! dragging || ! oldState) return dragging = false diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js index 4d9a795..d165ccc 100644 --- a/public/assets/javascripts/rectangles/util/minotaur.js +++ b/public/assets/javascripts/rectangles/util/minotaur.js @@ -4,7 +4,7 @@ var base = this base.$el = $("#minotaur") base.timeout = null - base.delay = 5000 + base.delay = 2500 base.objects = {} base.init = function () { diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index e278fab..57ca3c6 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -757,8 +757,8 @@ iframe.embed { #minotaur { position: absolute; - top: 0; - right: 230px; + top: 0px; + right: 0px; opacity: 0; } #minotaur .label:after { @@ -771,9 +771,9 @@ iframe.embed { color: white; background: black; font-weight: 300; - float: right; text-decoration: none; z-index: 33; + opacity: 1; } #minotaur.saving .label:after { content: 'SAVING'; -- cgit v1.2.3-70-g09d2 From d584725202624b2629a85dd209cebc701706ff4b Mon Sep 17 00:00:00 2001 From: ryderr Date: Thu, 2 Oct 2014 13:19:23 -0400 Subject: save position --- public/assets/stylesheets/app.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'public') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 57ca3c6..63d5a9f 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -758,7 +758,7 @@ iframe.embed { #minotaur { position: absolute; top: 0px; - right: 0px; + left: 150px; opacity: 0; } #minotaur .label:after { -- cgit v1.2.3-70-g09d2 From fe5ac8ac5921bcc47edd3cd7748414f5ecba0a9f Mon Sep 17 00:00:00 2001 From: ryderr Date: Thu, 2 Oct 2014 13:42:22 -0400 Subject: collaborators touchup --- package.json | 3 ++- public/assets/stylesheets/app.css | 17 +++++++++++++---- views/controls/editor/collaborators.ejs | 10 ++++++---- 3 files changed, 21 insertions(+), 9 deletions(-) (limited to 'public') diff --git a/package.json b/package.json index b4ac400..adefb82 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "multer": "~0.1.0", "body-parser": "1.3.0", "marked": "~0.3.2", - "emailjs": "~0.3.6" + "emailjs": "~0.3.6", + "intro.js": "^0.9.0" }, "devDependencies": { "grunt": "~0.4.1", diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 63d5a9f..3edad4f 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -2087,14 +2087,22 @@ a[data-role="forgot-password"] { /* COLLABORATORS */ -.collaborators > div { - width: 600px; +.collaborators .rap { + display: table; + width: 100%; + height: 100%; +} + +.collaborators .rap .holder .inner { + width: 480px; margin: 0 auto; text-align: left; background: white; padding: 10px; margin: 20px auto; +position: relative; } + .collaborators button { width: auto; position: relative; @@ -2121,14 +2129,15 @@ a[data-role="forgot-password"] { border-color: black; } .collaborators p { - margin: 20px 0; + margin: 10px 0 20px; + font-weight: 300; } .collaborators form input[type=text] { font-size: 16px; width: 300px; } .collaborators h2 { - margin: 20px auto 10px; + margin: 20px auto 0; } #collaborator-list { margin-top: 20px; diff --git a/views/controls/editor/collaborators.ejs b/views/controls/editor/collaborators.ejs index 69e5b64..b658bf6 100644 --- a/views/controls/editor/collaborators.ejs +++ b/views/controls/editor/collaborators.ejs @@ -1,7 +1,9 @@
X - -
+ +
+
+

Collaborators

@@ -21,9 +23,9 @@

-
- +
+