From 06e38245987304ef6bddb1f9c3e6cad16a215209 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Tue, 7 Oct 2014 16:12:09 -0400
Subject: new font

---
 views/controls/editor/wallpaper.ejs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'views/controls/editor/wallpaper.ejs')

diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 95cf827..01cf771 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -3,12 +3,12 @@
 	<!-- IF NO WALL PAPER -->
 	<span class="txt">Add custom wallpaper to walls. Begin by uploading a pattern. Or try this one -> </span>
 	
-  <div class="swatches"></div>
+  <span class="swatches"></span>
   
   <div class="wallpaperUpload">
     <form>
 
-      <span class="icon-ios7-upload-outline upload-icon"></span>
+      <span class="ion-ios7-upload-outline upload-icon"></span>
       <label>Upload wallpaper</label>
       <input type="file" accept="image/*" class="file" multiple>
     </form>
@@ -17,9 +17,14 @@
  -->
   </div>
   <div class="wallpaperRemove">
-    <img src="/assets/img/scissors.png">
+    <span class="ion-scissors"></span>
     <label>Remove Wallpaper</label>
   </div>
+
+  <div class="wallpaperResize">
+    <span class="ion-scissors"></span>
+    <label>Resize Wallpaper</label>
+  </div>
 </div>
 
 <div class="floatingSwatch"></div>
-- 
cgit v1.2.3-70-g09d2


From 49ce8683ce072d8ae24176aff7fadbf5195f5922 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Tue, 7 Oct 2014 16:48:11 -0400
Subject: wallpaper buttons

---
 public/assets/stylesheets/app.css   | 12 +++++++-----
 views/controls/editor/wallpaper.ejs |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'views/controls/editor/wallpaper.ejs')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6a034ea..943fc8e 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1332,7 +1332,7 @@ iframe.embed {
 	padding-bottom: 6px;
 }
 
-.wallpaperUpload, .wallpaperRemove {
+.toolButton {
 	border: 1px solid;
 	display: inline-block;
 	width: 100%;
@@ -1341,9 +1341,9 @@ iframe.embed {
 	font-weight: 300;
 }
 
-.wallpaper label {
+.toolButton label {
   position: relative;
-  top: -6px;
+  vertical-align: middle;
   float: none;
 }
 .wallpaper form {
@@ -1357,8 +1357,10 @@ iframe.embed {
 	color:white;
 	cursor:pointer;
 }
-.wallpaper .ion-ios7-upload-outline {
-  font-size: 26px;
+.toolButton > span, .toolButton form > span{
+	font-size: 26px;
+	margin: 0 7px;
+	vertical-align: middle;
 }
 .wallpaper .wallpaperRemove {
   cursor: pointer;
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 01cf771..97a9232 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -5,7 +5,7 @@
 	
   <span class="swatches"></span>
   
-  <div class="wallpaperUpload">
+  <div class="wallpaperUpload toolButton">
     <form>
 
       <span class="ion-ios7-upload-outline upload-icon"></span>
@@ -16,13 +16,13 @@
     <input type="text" placeholder="Enter Image URL" class="url">
  -->
   </div>
-  <div class="wallpaperRemove">
+  <div class="wallpaperRemove toolButton">
     <span class="ion-scissors"></span>
     <label>Remove Wallpaper</label>
   </div>
 
-  <div class="wallpaperResize">
-    <span class="ion-scissors"></span>
+  <div class="wallpaperResize toolButton">
+    <span class="ion-arrow-resize"></span>
     <label>Resize Wallpaper</label>
   </div>
 </div>
-- 
cgit v1.2.3-70-g09d2