From 433f56b6da8b9d5d42ebca566b22191e834eda66 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Fri, 10 Oct 2014 17:07:36 -0400
Subject: default patterns

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

(limited to 'views/controls')

diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index d54b9c1..ac025b5 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -4,10 +4,10 @@
 	<span class="txt" style="margin-bottom:7px">Add custom wallpaper to walls. Begin by uploading a pattern. Or try one of these -> </span>
 	
   <span class="swatches">
-  	  <span class="swatch"></span>
-			<span class="swatch"></span>
-			<span class="swatch"></span>
-			<span class="swatch"></span>
+  	  <span class="swatch" style="background-image:url(/assets/img/offbeatrepeat.jpg)"></span>
+			<span class="swatch" style="background-image:url(/assets/img/plainpattern3.png)"></span>
+			<span class="swatch" style="background-image:url(/assets/img/plainpattern.png)"></span>
+			<span class="swatch" style="background-image:url(/assets/img/plainpattern2.png)"></span>
   </span>
   
   <div class="wallpaperUpload toolButton">
-- 
cgit v1.2.3-70-g09d2


From ee322b213e68800e2f322fb527cc1b18cec01da3 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Fri, 10 Oct 2014 18:07:51 -0400
Subject: icon

---
 public/assets/stylesheets/app.css |  2 +-
 views/controls/editor/toolbar.ejs | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'views/controls')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 6248af7..047a559 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -331,7 +331,7 @@ iframe.embed {
 }
 
 
-.projectList a {
+.projectList .projectItem {
 	margin: 4%;
 	display: inline-block;
 }
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index c914970..85800f8 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -4,6 +4,10 @@
 		data-role='open-media-viewer'
 		data-info="add media"
 		class="ion-ios7-photos-outline"></span>
+		<span
+			data-role='toggle-presets'
+			data-info="preset styles"
+			class="ion-ios7-briefcase-outline"></span>
 <!-- 
 	<span
 		data-role='resize-media'
@@ -22,10 +26,13 @@
 		data-role='toggle-light-control'
 		data-info="edit room colors"
 		class="ion-ios7-sunny-outline"></span>
-	<span
-		data-role='toggle-text-editor'
-		data-info="add text to wall"
-		class="ion-ios7-compose-outline"></span>
+
+		<span
+			data-role='toggle-text-editor'
+			data-info="add text to wall"
+			class="ion-ios7-compose-outline"></span>
+			
+
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
-- 
cgit v1.2.3-70-g09d2