Merge branch 'master' of github.com:okfocus/vvalls

2 files changed, 21 insertions, 13 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index b29c613..20498c0 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1512,13 +1512,12 @@ border-left: 1px solid black;
 .toolButton {
 	border: 1px solid;
 	position: relative;
-	display: block;
-	float: right;
-	margin-left: 3px;
-  width: 35px;
+	float: left;
+  width: 86px;
   height: 35px;
-	font-size: 14px;
+	font-size: 12px;
 	font-weight: 300;
+	cursor: pointer;
 }
 
 .toolButton label {
@@ -1526,12 +1525,14 @@ border-left: 1px solid black;
   vertical-align: middle;
   float: none;
 }
+.wallpaperRemove {
+	margin-right: 4px;
+}
 .wallpaperUpload:hover {
 	cursor:pointer;
 }
 .wallpaper form {
   position: relative;
-  font-size: 14px;
   font-weight: 300;
   overflow: hidden;
 }
@@ -1633,13 +1634,18 @@ input[type="range"]::-webkit-slider-thumb {
   cursor:pointer;
 	border:3px solid #000;
 }
-
+.wallpaperResizeControls {
+	transition: all 0.2s;
+	float: left;
+	height: 28px;
+	overflow: hidden;
+}
 .wallpaperResizeControls.disabled {
-  pointer-events: none;
+	height: 0;
   opacity: 0.3;
 }
 .wallpaperResizeControls input[type=range] {
-  width: 130px;
+  width: 150px;
   position: relative;
   top: -10px;
 }
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index e675afa..6d8f209 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -12,17 +12,19 @@
 
   <input type="text" class="url" placeholder="Enter image URL 2 Flood...!">
   
+  <div class="wallpaperRemove toolButton">
+    <span class="ion-scissors"></span>
+    <label>Remove</label>
+  </div>
+
   <div class="wallpaperUpload toolButton">
     <form>
       <span class="ion-ios7-upload-outline upload-icon"></span>
+			<label>Upload</label>
       <input type="file" accept="image/*" multiple>
     </form>
   </div>
   
-  <div class="wallpaperRemove toolButton">
-    <span class="ion-scissors"></span>
-  </div>
-
   <div class="wallpaperResizeControls">
     <span data-role="wallpaper-position" class="ion-arrow-expand"></span>
     <input data-role="wallpaper-scale" type="range" min="-4" max="4" step="0.01" value="0.0">