From 1258966c2879faffc7148b2d58ebc91985c6afc2 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 8 Oct 2014 18:10:27 -0400
Subject: no media warning

---
 views/controls/editor/media-drawer.ejs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'views/controls/editor')

diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 10a160e..dedfbb0 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -20,6 +20,7 @@
 	<h3 class="editBtn warn" id="deleteMedia"></h3>
 
 	<div class="myMedia">
+	  <div class="noMedia">You have no media yet.  Upload some!</div>
 	</div>
 	
 	<div class="foundMedia">
-- 
cgit v1.2.3-70-g09d2


From b86a0ac642a2623fd9d8346c2691ef5a2d290b56 Mon Sep 17 00:00:00 2001
From: ryderr <r@okfoc.us>
Date: Wed, 8 Oct 2014 18:15:31 -0400
Subject: favicon

---
 public/assets/stylesheets/app.css      |  29 ++++++++++++++++++-----------
 public/favicon.ico                     | Bin 0 -> 32988 bytes
 views/controls/editor/media-drawer.ejs |   2 +-
 views/home.ejs                         |   2 +-
 4 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 public/favicon.ico

(limited to 'views/controls/editor')

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index d384dea..3aafc7d 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -246,6 +246,11 @@ h5 {
 	display: inline-block;
 }
 
+.projectList {
+	border-top: 1px solid;
+}
+
+
 .projectList.about {
 	text-align: left;
 	border-top: 1px solid;
@@ -415,18 +420,15 @@ iframe.embed {
 }
 
 .page .projectList label {
-	font-weight: 100;
+	font-weight: 600;
 	font-size: 12px;
 	color: black;
-	padding: 5px;
 	text-decoration: none;
 	display: inline-block;
 	cursor: pointer;
 	border: 1px solid transparent;
-	text-transform: uppercase;
-	font-family: monospace;
 	line-height: 18px;
-	letter-spacing: 1px;
+	padding:0 5px;
 }
 
 .page .room .holder a:hover {
@@ -1080,10 +1082,13 @@ border-left: 1px solid black;
 .mediaDrawer {
   -webkit-transform:translateY(-100%);
   transform:translateY(-100%);
-  background:rgba(255,255,255,0.9);
+  background:white;
   text-align:center;
   overflow-x: hidden;
 }
+.editing .mediaDrawer {
+	background:rgba(255,255,255,0.95);
+}
 .mediaDrawer.active {
   -webkit-transform:translateY(0%);
   transform:translateY(0%);
@@ -1203,7 +1208,7 @@ border-left: 1px solid black;
   border: 1px solid #ccc;
   font-size: 15px;
   padding: 5px;
-  width: 220px;
+  width: 290px;
   text-align: center;
   border-radius: 20px;
 }
@@ -1295,8 +1300,6 @@ border-left: 1px solid black;
   color:white;
 }
 
-.deleteArmed .mediaContainer {
-}
 
 .deleteArmed .mediaContainer:hover {
   background:#FF3B30;
@@ -1352,12 +1355,11 @@ border-left: 1px solid black;
 
 
 .mediaContainer {
-  border: 1px solid white;
   display: inline-block;
   width: 25%;
   margin: 4%;
   vertical-align: top;
-  border:1px solid white;
+  border:1px solid transparent;
   padding:2%;
 }
 .mediaContainer:hover {
@@ -2447,6 +2449,11 @@ a[data-role="forgot-password"] {
 	width: 50%;
 	height: 180px;
 	}
+	.profilepage .about h2 {
+	text-align: center;
+	font-weight: 500;
+	font-size: 17px;
+	}
 	.projectList.about {
 	text-align: center;
 	padding: 20px 0;
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..19c9da3
Binary files /dev/null and b/public/favicon.ico differ
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 10a160e..22ae43f 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -6,7 +6,7 @@
 		<input type="file" accept="image/*" class="file" multiple>
 	</form>
 	<small>~ or ~</small><br>
-	<input type="text" placeholder="Enter Vimeo or YouTube Link" class="url">
+	<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
 </span>
 
 <div class="ants">
diff --git a/views/home.ejs b/views/home.ejs
index 51d5a92..659e1bc 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -23,7 +23,7 @@
 			</div>
 	</div>
 	
-	<h1>Whats VValls For?</h1>
+	<h1>What's VValls For?</h1>
 	
 	<div class="projectList about">
 		<div class="item wow bounceInLeft">
-- 
cgit v1.2.3-70-g09d2