delete thing

7 files changed, 31 insertions, 21 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 869e5ee..3464b5c 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -402,16 +402,7 @@ iframe.embed {
 	height: 50vh;
 	float: left;
 }
-.editProfile {
-  margin-right: 10px;
-  color: black;
-  font-weight: 100;
-  text-decoration: none;
-	padding: 50px 0 100px 0;
-}
-.editProfile span {
-  vertical-align: middle;
-}
+
 .topLinks {
   float: right;
 	z-index: 3;
@@ -425,7 +416,7 @@ iframe.embed {
   padding: 20px 8px;
   color: black;
   font-weight: 300;
-	float:right;
+	float:left;
   text-decoration: none;
   border-bottom:1px solid transparent;
 }
@@ -445,6 +436,10 @@ iframe.embed {
 	float: left;
 }
 
+.profilepage .bio a:hover {
+	text-decoration:underline;
+}
+
 .profilepage .bio.one {
   background-color: lightyellow;
 }
@@ -902,7 +897,23 @@ iframe.embed {
   background-image:url(https://s3.amazonaws.com/luckyplop/735c46b0268cd511a22c37bc0c11e9f60c4459b2.png)!important;
   cursor:move;
 }
-
+#deleteMedia:after {
+	content:"delete media?";
+}
+.deleteArmed #deleteMedia:after {
+	content:"click media you want to delete";
+}
+.deleteArmed #deleteMedia:before {
+	content: "X";
+	background: black;
+	width: 23px;
+	height: 23px;
+	position: absolute;
+	margin-left: -25px;
+	margin-top: -4px;
+	font-size: 19px;
+	
+}
 .deleteActive .mx-object3d.image:after {
   content: "\e68f";
   font-family: 'ionicons';
@@ -1936,17 +1947,17 @@ a[data-role="forgot-password"] {
 .share h2 {
   font-weight: 300;
   font-size: 18px;
-  text-align: right;
 }
 
 .share a{
   color: #017cfe;
   text-decoration: none;
-  margin-left: 6px;
   font-size: 13px;
   font-weight: 600;
 }
-
+.share a:nth-child(3){
+	margin-left:4px;
+}
 .share a:hover{
   text-decoration:underline;
 }
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index d73a3ef..dbab237 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -17,7 +17,7 @@
 <div class="mediaDrawer fixed animate mediaViewer">
 	<span class="close">X</span>
 	<h2><a href="#" class="userToggle active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
-	<h3 class="editBtn warn" id="deleteMedia">delete media?</h3>
+	<h3 class="editBtn warn" id="deleteMedia"></h3>
 	<div class="myMedia">
 	</div>
 	
diff --git a/views/controls/editor/media-editor.ejs b/views/controls/editor/media-editor.ejs
index 8f2c1c8..ef46e6f 100644
--- a/views/controls/editor/media-editor.ejs
+++ b/views/controls/editor/media-editor.ejs
@@ -52,6 +52,6 @@
 	</div>
 
 	<div class="setting">
-		<a href="#" class="warn btn" data-role="destroy-media">delete this media</a>
+		<a href="#" class="warn btn" data-role="destroy-media">remove from wall</a>
 	</div>
 </div>
diff --git a/views/controls/editor/signed-out.ejs b/views/controls/editor/signed-out.ejs
index 20e3715..118fb7c 100644
--- a/views/controls/editor/signed-out.ejs
+++ b/views/controls/editor/signed-out.ejs
@@ -8,7 +8,7 @@
 </div>
 
 <div class="share">
-	<h2>Share this on–</h2>
+	<h2>Share on–</h2>
 	<a href="#">Facebook</a>
 	<a href="#">Twitter</a>
 </div>
diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs
index d721c07..1c4c26f 100644
--- a/views/controls/editor/toolbar.ejs
+++ b/views/controls/editor/toolbar.ejs
@@ -8,11 +8,11 @@
 		data-role='resize-media'
 		data-info="resize media"
 		class="icon-arrow-resize"></span>
- -->
 	<span
 		data-role='destroy-media'
 		data-info="delete media"
 		class="icon-ios7-trash-outline"></span>
+ -->
 	<span
 		data-role='toggle-wallpaper-panel'
 		data-info="add wallpaper"
diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs
index e13f363..6a6effb 100644
--- a/views/controls/reader/about-room.ejs
+++ b/views/controls/reader/about-room.ejs
@@ -15,7 +15,7 @@
 </div>
 
 <div class="share">
-	<h2>Share this on–</h2>
+	<h2>Share on–</h2>
 	<a href="#">Facebook</a>
 	<a href="#">Twitter</a>
 </div>
diff --git a/views/editor.ejs b/views/editor.ejs
index d2823fa..9950878 100755
--- a/views/editor.ejs
+++ b/views/editor.ejs
@@ -24,7 +24,6 @@
 		<div id="minimap" class="vvbox">
 			<span class="el"></span>
 		</div>
-		<div id="reset">Reset Position</div>
 
 		<div id="hud">
 			<div id="map" style="display: block">