merge

3 files changed, 20 insertions, 11 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 32da0be..5aca224 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -769,7 +769,7 @@ iframe.embed {
 #minotaur.saving {
 	padding: 20px 8px;
 	color: white;
-	background: black;
+	background: red;
 	font-weight: 300;
 	text-decoration: none;
 	z-index: 33;
@@ -1858,6 +1858,7 @@ form h3 {
 }
 #form_container {
   clear:both;
+	padding-bottom: 50px;
 }
 .errors {
 	display: none;
@@ -1917,7 +1918,11 @@ form li textarea {
 	color:white;
 	cursor:pointer;
 }
-
+.chardinjs-tooltiptext {
+	font-weight: 300;
+	line-height: 20px;
+	font-size: 16px;
+}
 
 .box {
   display: table-cell;
@@ -1946,8 +1951,10 @@ form li textarea {
 	border: 1px solid black;
 	box-shadow: -3px 4px black;
 	line-height: 75px;
+
 }
 
+
 .desktop .close:hover {
   background:black;
 	color:white;
diff --git a/views/partials/confirm-modal.ejs b/views/partials/confirm-modal.ejs
index 60fbd31..5b2ff46 100644
--- a/views/partials/confirm-modal.ejs
+++ b/views/partials/confirm-modal.ejs
@@ -1,5 +1,4 @@
 <div class="mediaDrawer fixed animate alert">
-	<span class="close">X</span>
 	<div class="box">
 		<form>
 			<span class="message"></span>
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index f3332b2..a12f237 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -14,15 +14,18 @@
             <img src="[[- media.media.url ]]">
           [[ }) ]]
 			  </span>
+
 				<div class="holder">
-				[[ if (String(user._id) == String(project.user_id)) { ]]
-        <a href="/project/[[- project.slug ]]/edit">
-				[[ } else { ]]
-				<a href="/project/[[- project.slug ]]" class="roomName">
-				[[ } ]]
-					[[- project.name ]]<br>
-					[[- project.date ]]
-				</a>
+			 	 [[ if (String(user._id) == String(project.user_id)) { ]]
+         <a href="/project/[[- project.slug ]]/edit">
+					 [[- project.name ]]<br>
+				 	 [[- project.date ]]
+				 </a>
+				 [[ } else  { ]]
+					<a href="/project/[[- project.slug ]]" class="roomName">
+						[[- project.name ]]<br>
+						[[- project.date ]]
+					[[ } ]]
 				</div>
 			</span>