From d9a6199f75d324c7b644beb1c732680a67ab8047 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 17 Oct 2014 13:37:23 -0400
Subject: layout editor stuff

---
 public/assets/stylesheets/app.css | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 28eabd9..9df1573 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1507,9 +1507,12 @@ border-left: 1px solid black;
 
 .toolButton {
 	border: 1px solid;
-	display: inline-block;
-	width: 100%;
-	margin-top: 5px;
+	position: relative;
+	display: block;
+	float: right;
+	margin-left: 3px;
+  width: 35px;
+  height: 35px;
 	font-size: 14px;
 	font-weight: 300;
 }
@@ -1524,9 +1527,9 @@ border-left: 1px solid black;
 }
 .wallpaper form {
   position: relative;
-  padding: 2px 0 0 0;
   font-size: 14px;
   font-weight: 300;
+  overflow: hidden;
 }
 .toolButton:hover {
 	background:black;
@@ -1550,14 +1553,19 @@ border-left: 1px solid black;
 .wallpaper .wallpaperRemove:hover img {
   -webkit-filter:invert(100%);
 }
+.wallpaperUpload .upload-icon {
+  margin: 0 8px;
+}
 .wallpaperUpload .upload-icon.uploading {
 }
 .wallpaperUpload .upload-icon.uploading:before {
 	content: ' ' !important;
 	background-image: url("/assets/img/loader.gif");
 	background-repeat: no-repeat;
-	width: 40px;
-	height: 40px;
+	background-position: center;
+	width: 100%;
+	height: 100%;
+	position:absolute;top:0;left:0;
 }
 .wallpaperUpload input[type="text"]{
   border: 1px solid #ccc;
@@ -1575,7 +1583,7 @@ border-left: 1px solid black;
   top: 0;
   left: 0;
 	background: blue;
-	height: 28px;
+	height: 100%;
 	width: 100%;
 	opacity: 0;
 	cursor: pointer;
-- 
cgit v1.2.3-70-g09d2


From a6d479579964014077502db5bc6e3af59c1f317e Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Sat, 18 Oct 2014 09:34:46 -0400
Subject: reader adjustments

---
 public/assets/javascripts/rectangles/models/floor.js |  2 ++
 public/assets/javascripts/ui/builder/BuilderInfo.js  |  2 ++
 public/assets/javascripts/ui/reader/MediaPlayer.js   |  2 +-
 public/assets/stylesheets/app.css                    | 11 +++++++++--
 4 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'public/assets/stylesheets/app.css')

diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index 3f452e1..2fb870f 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -82,6 +82,8 @@
 
             // TODO: watch individual scenery object here
             Minotaur.watch( app.router.editorView.settings )
+
+						app.controller.pickWall(base, null)
           }
           else {
             app.controller.pickWall(base, null)
diff --git a/public/assets/javascripts/ui/builder/BuilderInfo.js b/public/assets/javascripts/ui/builder/BuilderInfo.js
index 4408511..4fd145d 100644
--- a/public/assets/javascripts/ui/builder/BuilderInfo.js
+++ b/public/assets/javascripts/ui/builder/BuilderInfo.js
@@ -96,6 +96,7 @@ var BuilderInfo = View.extend({
 		this.room.rect.x.setLength( this.$width.unitVal() )
     Rooms.rebuild()
 	},
+	
 	enterDepth: function(e){
 	  if (e.keyCode == 13) this.changeDepth(e)
 	},
@@ -104,6 +105,7 @@ var BuilderInfo = View.extend({
 		this.room.rect.y.setLength( this.$depth.unitVal() )
     Rooms.rebuild()
 	},
+	
 	enterHeight: function(e){
 	  if (e.keyCode == 13) this.changeHeight(e)
 	},
diff --git a/public/assets/javascripts/ui/reader/MediaPlayer.js b/public/assets/javascripts/ui/reader/MediaPlayer.js
index 6195ab6..7f73e1b 100644
--- a/public/assets/javascripts/ui/reader/MediaPlayer.js
+++ b/public/assets/javascripts/ui/reader/MediaPlayer.js
@@ -44,7 +44,7 @@ var MediaPlayer = FormView.extend({
 			this.unbind()
 		}
 		if (media.type == "image") {
-			if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length)) {
+			if ((! media.title || ! media.title.length) && (! media.description || ! media.description.length) || (media.title == filenameFromUrl(media.url)) ) {
 				this.hide()
 				return
 			}
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 9df1573..226fe98 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1930,8 +1930,8 @@ input[type="range"]::-webkit-slider-thumb {
 }
 
 .playButton,.muteButton {
-	border-radius: 50px;
-	font-size: 22px;
+	border-radius: 50%;
+	font-size: 23px;
 	padding: 5px 0;
 	cursor: pointer;
 	margin-right: 5px;
@@ -1942,6 +1942,8 @@ input[type="range"]::-webkit-slider-thumb {
 }
 .playButton .on {
 	display: inline;
+  position: relative;
+  left: 1px;
 }
 .playButton.paused .on {
 	display: none;
@@ -1956,6 +1958,8 @@ input[type="range"]::-webkit-slider-thumb {
 .muteButton .on {
 	display: inline;
 	padding-right: 3px;
+  position: relative;
+  left: 2px;
 }
 .muteButton.muted .on {
 	display: none;
@@ -1966,6 +1970,9 @@ input[type="range"]::-webkit-slider-thumb {
 .muteButton.muted .off {
 	display: inline;
 	padding-right: 3px;
+  position: relative;
+  left: 2px;
+  top: -1px;
 }
 
 .btn, button {
-- 
cgit v1.2.3-70-g09d2