From 0f8be5bc39ca5049d3f29fe74eb423da4dcb055a Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 13 Nov 2014 13:03:20 -0500
Subject: text color picker

---
 views/controls/editor/color-control.ejs |  2 +-
 views/controls/editor/text-editor.ejs   | 17 ++++++++++++++---
 views/controls/editor/toolbar.ejs       |  2 --
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'views/controls/editor')

diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs
index 1fa1688..c035e24 100644
--- a/views/controls/editor/color-control.ejs
+++ b/views/controls/editor/color-control.ejs
@@ -4,7 +4,7 @@
   <div class="colors">
   </div>
 
-  <div id="color-picker">
+  <div class="color-picker">
   </div>
   
 	<div class="slider">
diff --git a/views/controls/editor/text-editor.ejs b/views/controls/editor/text-editor.ejs
index c30cb67..2423e9f 100644
--- a/views/controls/editor/text-editor.ejs
+++ b/views/controls/editor/text-editor.ejs
@@ -5,7 +5,7 @@
     Click a wall to add text.
   </div>
   
-	<div class="setting">
+	<div class="setting text-setting">
     <select name="font-family">
       <option>Baskerville</option>
       <option>Brush Script</option>
@@ -46,15 +46,26 @@
       <option value="right">Right</option>
       <option value="justify">Justify</option>
     </select>
+    <div class="swatch"></div>
   </div>
   
-	<div class="setting">
+	<div class="setting text-setting">
 	  <textarea name="text-body"></textarea>
   </div>
   
-	<div class="setting">
+	<div class="setting text-setting">
 		<a href="#" class="warn btn" data-role="destroy-text">remove from wall</a>
 	</div>
+	
+	<div class="setting color-setting">
+    <a href="#" class="btn" data-role="hide-color-picker">done</a>
+
+    <div class="color-picker">
+    </div>
+  
+    <div class="slider">
+    </div>
+	</div>
 </div>
 
 <style>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 23d5eb4..6960cbc 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -32,12 +32,10 @@
 		data-role='toggle-color-control'
 		data-info="edit room colors"
 		class="ion-ios7-sunny-outline"></span>
-[[ if (user.username == "asdf") { ]]
   <span
     data-role='toggle-text-editor'
     data-info="add text to wall"
     class="ion-ios7-compose-outline"></span>
-[[ } ]]
 <!-- 
 	<span
 		data-role='toggle-map-view'
-- 
cgit v1.2.3-70-g09d2