merge

1 files changed, 40 insertions, 21 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index b4b07b5..201819d 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1279,22 +1279,24 @@ border-left: 1px solid black;
   background: black;
 }
 .animate {
-  -webkit-transition:all 0.2s ease-in-out;
-  transform:translateY(-100%);
+  -webkit-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+  -webkit-transform: translateY(-100%);
+  transform: translateY(-100%);
 }
 .mediaDrawer {
-  -webkit-transform:translateY(-100%);
-  transform:translateY(-100%);
-  background:white;
-  text-align:center;
+  -webkit-transform: translateY(-100%);
+  transform: translateY(-100%);
+  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%);
+  -webkit-transform: translateY(0%);
+  transform: translateY(0%);
 }
 .mediaDrawer.table, .mediaDrawer.error,
 .mediaDrawer.signin, .mediaDrawer.signup,
@@ -1375,7 +1377,7 @@ border-left: 1px solid black;
   cursor:text;
 }
 
-.fileUpload{
+.fileUpload {
   position: fixed;
   width: 400px;
   text-align: center;
@@ -1389,14 +1391,14 @@ border-left: 1px solid black;
   -webkit-transform: translateY(-1000%);
   -webkit-transition: -webkit-transform 0.6s ease-in-out;
   transform: translateY(-1000%);
-  transition: -webkit-transform 0.6s ease-in-out;
+  transition: transform 0.6s ease-in-out;
   border: 1px solid;
   box-shadow: -3px 3px black;
 }
 
 .fileUpload.active {
-  -webkit-transform:translateY(0%);
-  transform:translateY(0%);
+  -webkit-transform: translateY(0%);
+  transform: translateY(0%);
 }
 
 .fileUpload .ion-ios7-upload-outline {
@@ -1594,12 +1596,12 @@ border-left: 1px solid black;
   -moz-user-select: none;
   user-select: none;
 }
-#minimap.hide{
+#minimap.hide {
   -webkit-transform: translateY(155px);
   transform: translateY(155px);
 }
-#minimap.hide canvas{
-  opacity:0;
+#minimap.hide canvas {
+  opacity: 0;
 }
 #minimap canvas {
 	display: block;
@@ -1621,9 +1623,9 @@ border-left: 1px solid black;
 }
 
 .reader #minimap.active {
-	-webkit-transform:translateX(0px);
-	-moz-transform:translateX(0px);
-	transform:translateX(0px);
+	-webkit-transform: translateX(0px);
+	-moz-transform: translateX(0px);
+	transform: translateX(0px);
 	left: auto;
 }
 
@@ -2547,11 +2549,14 @@ form li textarea {
 }
 #fixed_close {
 	display: none;
+	-webkit-transform: translateY(-200px) translateZ(0);
 	transform: translateY(-200px) translateZ(0);
 }
 #fixed_close.active {
-	animation:0.2s transform linear 1s;
+	-webkit-transition: 0.2s -webkit-transform linear 1s;
+	transition: 0.2s transform linear 1s;
 	display: block;
+	-webkit-transform: translateY(0px) translateZ(0);
 	transform: translateY(0px) translateZ(0);
 }
 
@@ -2895,6 +2900,14 @@ a[data-role="forgot-password"] {
   100%{height:500px;top:2px;}
 }
 
+/* KEYBOARD SHORTCUTS */
+
+.keyboard { float: left; width: 50%; margin-top: 50px; }
+.keyboard tr { margin: 0; padding: 0; }
+.keyboard td { padding: 2px 10px; margin: 0; }
+.keyboard.first-keyboard td:nth-child(1) { text-align: center; width: 50px; padding-left: 100px; }
+.keyboard td:nth-child(1) { text-align: right; width: 150px; }
+.keyboard td:nth-child(2) { font-weight: 300; }
 
 /* MOBILE */
 
@@ -3047,9 +3060,12 @@ a[data-role="forgot-password"] {
 		width: 100%;
 		text-align: left;
 	}
-	.aboutRoom {
+	.aboutRoom.vvbox {
 		width: 170px;
 		padding: 6px 8px 8px 8px;
+		box-shadow: 0 0;
+		bottom: 3px;
+		left: 3px;
 	}
 	.aboutRoom .profilePic {
 		display:none;
@@ -3083,6 +3099,9 @@ a[data-role="forgot-password"] {
 	.greenbtn.learn {
 		display:none;
 	}
+	.reader .topLinks a {
+		display:none;
+	}
 }
 
 @media screen and (orientation:portrait) {
@@ -3098,7 +3117,7 @@ a[data-role="forgot-password"] {
 			position: fixed;
 			display: inline-block;
 			width: 300px;
-			top: 80px;
+			top: 55px;
 			left: 6px;
 			font-size: 27px;
 			font-weight: 300;