Merge branch 'master' of github.com:okfocus/vvalls

1 files changed, 57 insertions, 22 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 70cf498..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;
 }
@@ -597,7 +592,7 @@ iframe.embed {
   -webkit-box-sizing: content-box;
   box-sizing: content-box;
 }
-.destroyActive .mx-scene, .destroyActive .mx-object3d.image {
+.destroyActive .mx-scene, .destroyActive .mx-object3d.image, .menu span.inuse[data-role="destroy-media"] {
 	cursor:url(/assets/img/delete-cursor.png), auto;
 }
 
@@ -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';
@@ -1127,7 +1138,19 @@ iframe.embed {
 .mediaContainer img, .mediaContainer video {
   max-width:100%;
 }
-
+#reset {
+	position: fixed;
+	bottom: 160px;
+	left: 20px;
+	border-bottom: 1px solid black;
+	padding-bottom: 3px;
+	z-index:3;
+}
+#reset:hover {
+	cursor:pointer;
+	background:black;
+	color:white;
+}
 #minimap {
 	position: fixed;
 	bottom: 20px;
@@ -1168,6 +1191,7 @@ iframe.embed {
   -webkit-transform: translateX(400px);
   transition: transform 0.1s ease-in-out;
   transform: translateX(400px);
+	padding: 5px 5px 9px 5px;
 }
 .wallpaper.active {
   display:inline-block;
@@ -1192,13 +1216,13 @@ iframe.embed {
 }
 .wallpaper .swatches {
   width: 100%;
-  border-bottom: 1px solid black;
   min-height: 30px;
 }
-.wallpaper {
-  font-size: 14px;
-  font-weight: 300;
+
+.wallpaperUpload {
+	border: 1px solid;
 }
+
 .wallpaper label {
   position: relative;
   top: -6px;
@@ -1206,6 +1230,12 @@ iframe.embed {
 }
 .wallpaper form {
   padding: 2px 0 0 0;
+  font-size: 14px;
+  font-weight: 300;
+}
+.wallpaper form:hover {
+	background:black;
+	color:white;
 }
 .wallpaper .icon-ios7-upload-outline {
   font-size: 26px;
@@ -1367,7 +1397,7 @@ span:hover .swatch {
 }
 
 .settings {
-  padding: 10px 20px 20px 20px;
+  padding: 10px 12px 12px 12px;
   bottom: 20px;
   right: 10px;
   font-size: 12px;
@@ -1872,6 +1902,11 @@ a[data-role="forgot-password"] {
 	padding:5px 0;
 	display: inline-block;
 }
+
+.vvbox .txt {
+	padding:5px;
+}
+
 .aboutRoom h1 a{
   text-decoration: none;
   font-style: italic;
@@ -1912,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;
 }