merge

1 files changed, 18 insertions, 8 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 201819d..218f38b 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -13,11 +13,11 @@ input:-webkit-autofill {
 }
 .mobile input {
 	-webkit-appearance: none;
+	border-radius:0;
 }
 
-input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
-	background:white!important;
-}
+
+
 *, *:before, *:after {
   moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
 }
@@ -44,6 +44,11 @@ body.editing *{
   -moz-user-select: none;
   user-select: none;
 }
+
+body.editing input {
+	-webkit-user-select: auto;
+}
+
 body.noOverflow{
   overflow:hidden;
 }
@@ -432,10 +437,11 @@ iframe.embed {
 
 .projectList .projectItem {
 	margin: 4%;
+	width: 22vw;
 	display: inline-block;
 }
 .projectList .room {
-	width: 22vw;
+	width: 100%;
 	height: 16vw;
 	margin: 1vw 1vw 10px 1vw;
 	display: table;
@@ -882,6 +888,7 @@ iframe.embed {
 	overflow: auto;
 	max-height: 100%;
 	width: 100%;
+	height: 100%;
 	padding: 20px 0 40px 0;
 }
 .templates-list {
@@ -911,6 +918,7 @@ border-left: 1px solid black;
 	display: block;
 	float: left;
 	margin: 1vw 0;
+	width:20%;
 	padding: 2vw;
 	cursor: pointer;
 }
@@ -918,7 +926,7 @@ border-left: 1px solid black;
   background-position: center;
   background-size: cover;
   background-color: #fff;
-  width: 20vw;
+  width: 100%;
   height: 15vw;
   display: block;
   background-color: #ddd;
@@ -2503,7 +2511,7 @@ form li textarea {
 	-moz-transition:0.2s background;
 	transition:0.2s background;
 	position: relative;
-	z-index: 5;
+	z-index: 6;
 }
 
 
@@ -2722,7 +2730,7 @@ a[data-role="forgot-password"] {
 .share a:nth-child(3), .share a:nth-child(4) {
 	margin-left:4px;
 }
-.share a:hover{
+.desktop .share a:hover{
   text-decoration:underline;
 }
 .vvbox.share {
@@ -3102,6 +3110,9 @@ a[data-role="forgot-password"] {
 	.reader .topLinks a {
 		display:none;
 	}
+	.reader iframe {
+		display:none;
+	}
 }
 
 @media screen and (orientation:portrait) {
@@ -3125,7 +3136,6 @@ a[data-role="forgot-password"] {
 			border-top: 1px solid;
 			border-bottom: 1px solid;
 			padding: 20px 0;
-			background-color:rgba(255,255,255,0.7);
 		}
 }