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/builder/settings.ejs    |  2 +-
 views/controls/builder/toolbar.ejs     | 14 +++++++-------
 views/controls/editor/media-drawer.ejs |  2 +-
 views/controls/editor/media-editor.ejs |  4 ++--
 views/controls/editor/settings.ejs     |  4 ++--
 views/controls/editor/toolbar.ejs      | 16 ++++++++--------
 views/controls/editor/wallpaper.ejs    | 11 ++++++++---
 views/controls/reader/media-player.ejs |  8 ++++----
 8 files changed, 33 insertions(+), 28 deletions(-)

(limited to 'views/controls')

diff --git a/views/controls/builder/settings.ejs b/views/controls/builder/settings.ejs
index dd2496b..aae67d0 100644
--- a/views/controls/builder/settings.ejs
+++ b/views/controls/builder/settings.ejs
@@ -4,7 +4,7 @@
 
 	<div class="setting">
 		<a href="#" id="startpoint">
-			<span class="icon-ios7-navigate-outline"></span>
+			<span class="ion-ios7-navigate-outline"></span>
 			<span id="startText">Select Startpoint</span>
 			<span id="moveText">Move to Desired Point</span></a>
 	</div>
diff --git a/views/controls/builder/toolbar.ejs b/views/controls/builder/toolbar.ejs
index a00249c..8b2e9b8 100644
--- a/views/controls/builder/toolbar.ejs
+++ b/views/controls/builder/toolbar.ejs
@@ -2,33 +2,33 @@
 	<span
 		data-role='toggle-map-view'
 		data-info="toggle map view"
-		class="icon-ios7-photos-outline"></span>
+		class="ion-ios7-photos-outline"></span>
 <!--
 	<span
 		data-role='create-mode'
 		data-info="draw"
-		class="icon-plus"></span>
+		class="ion-plus"></span>
 	<span
 		data-role='move-mode'
 		data-info="move"
-		class="icon-arrow-move"></span>
+		class="ion-arrow-move"></span>
 	<span
 		data-role='resize-mode'
 		data-info="resize"
-		class="icon-arrow-resize"></span>
+		class="ion-arrow-resize"></span>
 -->
 	<span
 		data-role='destroy-mode'
 		data-info="delete"
-		class="icon-ios7-trash-outline"></span>
+		class="ion-ios7-trash-outline"></span>
 <!--
 	<span
 		data-role='undo'
 		data-info="undo"
-		class="icon-reply"></span>
+		class="ion-reply"></span>
 -->
 	<span
 		data-role='toggle-layout-settings'
 		data-info="save layout"
-		class="icon-ios7-compose-outline"></span>
+		class="ion-ios7-compose-outline"></span>
 </div>
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 3d95fb9..10a160e 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -1,7 +1,7 @@
 <span class="fileUpload">
 	<input type="hidden" name="_csrf" value="[[- token ]]">
 	<form>
-		<span class="icon-ios7-upload-outline upload-icon"></span><br>
+		<span class="ion-ios7-upload-outline upload-icon"></span><br>
 		Upload File
 		<input type="file" accept="image/*" class="file" multiple>
 	</form>
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 305a602..f5e3b5b 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -13,8 +13,8 @@
 	
 	<div class="video setting">
 		<span class="playButton" data-role="play-media">
-			<span class="on icon-play"></span>
-			<span class="off icon-pause"></span>
+			<span class="on ion-play"></span>
+			<span class="off ion-pause"></span>
 		</span>
 <!-- 
 		ion-volume-high
diff --git a/views/controls/editor/settings.ejs b/views/controls/editor/settings.ejs
index ad62b55..5b3b553 100644
--- a/views/controls/editor/settings.ejs
+++ b/views/controls/editor/settings.ejs
@@ -5,13 +5,13 @@
 
 	<div class="setting">
 		<a href="#" class="modalLink" id="startpoint">
-			<span class="icon-ios7-navigate-outline"></span>
+			<span class="ion-ios7-navigate-outline"></span>
 			<span id="startText">Select Startpoint</span>
 			<span id="moveText">Move to Desired Point</span></a>
 	</div>
 	<div class="setting">
 	  <a href="#" class="modalLink" data-role='show-collaborators'>
-      <span class="icon-ios7-plus-outline"></span>
+      <span class="ion-ios7-plus-outline"></span>
       Add Collaborators
 	  </a>
 	</div>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index 586194b..7d53315 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -3,39 +3,39 @@
 	<span
 		data-role='open-media-viewer'
 		data-info="add media"
-		class="icon-ios7-photos-outline"></span>
+		class="ion-ios7-photos-outline"></span>
 <!-- 
 	<span
 		data-role='resize-media'
 		data-info="resize media"
-		class="icon-arrow-resize"></span>
+		class="ion-arrow-resize"></span>
 	<span
 		data-role='destroy-media'
 		data-info="delete media"
-		class="icon-ios7-trash-outline"></span>
+		class="ion-ios7-trash-outline"></span>
 	<span
 		data-role='toggle-text-editor'
 		data-info="edit wall text"
-		class="icon-ios7-compose-outline"></span>
+		class="ion-ios7-compose-outline"></span>
  -->
 	<span
 		data-role='toggle-wallpaper-panel'
 		data-info="add wallpaper"
-		class="icon-ios7-keypad-outline"></span>
+		class="ion-ios7-keypad-outline"></span>
 	<span
 		data-role='toggle-light-control'
 		data-info="edit room colors"
-		class="icon-ios7-sunny-outline"></span>
+		class="ion-ios7-sunny-outline"></span>
 
 [[ if (user.username == "test12343") { ]]
 	<span
 		data-role='toggle-text-editor'
 		data-info="edit wall text"
-		class="icon-ios7-compose-outline"></span>
+		class="ion-ios7-compose-outline"></span>
 [[ } ]]
 		
 	<span
 		data-role='toggle-project-settings'
 		data-info="room settings"
-		class="icon-key"></span>
+		class="ion-key"></span>
 </div>
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>
diff --git a/views/controls/reader/media-player.ejs b/views/controls/reader/media-player.ejs
index ca03ec8..0ca89c5 100644
--- a/views/controls/reader/media-player.ejs
+++ b/views/controls/reader/media-player.ejs
@@ -1,13 +1,13 @@
 <div class="vvbox settings" id="mediaPlayer">
 
 	<span class="playButton video" data-role="play-media">
-		<span class="on icon-play"></span>
-		<span class="off icon-pause"></span>
+		<span class="on ion-play"></span>
+		<span class="off ion-pause"></span>
 	</span>
 
 	<span class="muteButton video" data-role="mute-media">
-		<span class="on icon-volume-high"></span>
-		<span class="off icon-volume-mute"></span>
+		<span class="on ion-volume-high"></span>
+		<span class="off ion-volume-mute"></span>
 	</span>
 
 	<span class="name"></span>
-- 
cgit v1.2.3-70-g09d2