merge

1 files changed, 31 insertions, 15 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 793697c..1c20493 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -4,9 +4,11 @@
 	margin:0;
 	padding:0;
 	outline:0;
-	font-family: 'Lato', sans-serif;
 	-webkit-font-smoothing: subpixel-antialiased;
 }
+body,textarea,input {
+	font-family: 'Lato', sans-serif;
+}
 
 *, *:before, *:after {
   moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
@@ -667,9 +669,12 @@ iframe.embed {
   -webkit-box-sizing: content-box;
   box-sizing: content-box;
 }
-.destroyActive .mx-scene, .destroyActive .mx-object3d.image, .menu span.inuse[data-role="destroy-media"] {
+.destroyActive .mx-scene, .destroyActive .mx-object3d.image {
 	cursor:url(/assets/img/delete-cursor.png), auto;
 }
+.addText .mx-scene, .menu span.inuse[data-role="toggle-text-editor"] {
+	cursor:url(/assets/img/text-cursor.png), auto;
+}
 
 .mx-scenery:active {
   cursor: pointer;
@@ -695,6 +700,16 @@ iframe.embed {
 .mx-object3d video {
 	pointer-events: none;
 }
+.mx-text {
+  overflow: hidden;
+}
+.mx-text .inner {
+  width: 100%;
+  pointer-events: none;
+}
+.mx-text p {
+  margin-bottom: 1em;
+}
 #keyhint {
 	position: fixed;
 	bottom:0;
@@ -1584,7 +1599,10 @@ input[type="range"]::-webkit-slider-thumb {
   font-size: 12px;
   width: 100%;
   max-height: 200px;
-  max-width: 180px;
+}
+#textEditor.settings textarea {
+  max-height: none;
+  height: 290px;
 }
 
 .settings input[type="text"]:focus{
@@ -2076,25 +2094,20 @@ a[data-role="forgot-password"] {
   font-size: 13px;
   margin: 5px 0 0 0;
 }
-
 .share {
-  position: fixed;
-  right: 0px;
-  bottom: 10px;
-  padding: 3px 10px 3px 4px;
-  background:rgba(255,255,255,0.1);
-  z-index: 2;
+	display:inline-block;
+	width:100%;
+	margin-bottom:5px;
 }
-
 .share h2 {
-  font-weight: 300;
-  font-size: 18px;
+	font-weight: 400;
+	font-size: 13px;
 }
 
 .share a{
   color: #017cfe;
   text-decoration: none;
-  font-size: 13px;
+  font-size: 12px;
   font-weight: 600;
 }
 .share a:nth-child(3){
@@ -2119,7 +2132,7 @@ a[data-role="forgot-password"] {
   background: white;
   padding: 10px;
   margin: 20px auto;
-position: relative;
+  position: relative;
 }
 
 .collaborators button {
@@ -2313,4 +2326,7 @@ position: relative;
 .footer a, .footer span {
 margin: 9px;
 }
+#keyhint {
+	display:none;
+}
 }
\ No newline at end of file