summaryrefslogtreecommitdiff
path: root/public
diff options
context:
space:
mode:
Diffstat (limited to 'public')
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/resize.js3
-rw-r--r--public/assets/javascripts/ui/editor/EditorSettings.js4
-rw-r--r--public/assets/javascripts/ui/editor/EditorView.js2
-rwxr-xr-xpublic/assets/stylesheets/app.css4
4 files changed, 9 insertions, 4 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index dc1a39a..ca77525 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -31,7 +31,8 @@ Scenery.resize = new function(){
// generate a dot element
base.build_dot = function(side) {
var dot = new MX.Object3D('.dot')
- dot.width = dot.height = dot_side
+ dot.width = dot.height = dot_side * 2
+ dot.scale = 0.5
dot.side = side
$(dot.el).on({
mouseenter: function(){ base.hovering = true },
diff --git a/public/assets/javascripts/ui/editor/EditorSettings.js b/public/assets/javascripts/ui/editor/EditorSettings.js
index 8a88f7a..f47eb81 100644
--- a/public/assets/javascripts/ui/editor/EditorSettings.js
+++ b/public/assets/javascripts/ui/editor/EditorSettings.js
@@ -65,6 +65,10 @@ var EditorSettings = FormView.extend({
data.media && Scenery.deserialize(data.media)
}
+
+ app.on("rooms-built", function(){
+ Walls.paint()
+ })
},
showCollaborators: function(e){
diff --git a/public/assets/javascripts/ui/editor/EditorView.js b/public/assets/javascripts/ui/editor/EditorView.js
index f200d0f..6636a8c 100644
--- a/public/assets/javascripts/ui/editor/EditorView.js
+++ b/public/assets/javascripts/ui/editor/EditorView.js
@@ -31,7 +31,7 @@ var EditorView = View.extend({
ready: function(data){
$("#map").hide()
-
+
this.settings.load(data)
},
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6929cef..a2db961 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -673,8 +673,8 @@ iframe.embed {
.dot {
background:white;
- border-radius:20px;
- border: 1px solid black;
+ border-radius: 50%;
+ border: 2px solid black;
}
.image {