merge

1 files changed, 37 insertions, 8 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 988dd89..6a034ea 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;
@@ -412,12 +414,16 @@ iframe.embed {
 .page h1 {
 	font-size: 80px;
 	font-weight: 100;
-	padding: 20px 0 25px 0;
+	padding: 60px 0 25px 0;
 	float: left;
 	width: 100%;
 	border-top: 1px solid;
 }
 
+.page p {
+	margin: 20px;
+}
+
 /* DOCUMENTATION / ABOUT SECTION / FAQ PAGES */
 
 .docs .content {
@@ -667,9 +673,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 +704,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;
@@ -1410,6 +1429,7 @@ h4 {
 input[type=range] {
   -webkit-appearance: none;
   -moz-appearance: none;
+  cursor: pointer;
   background-color: black;
   width: 180px;
   height:3px;
@@ -1455,13 +1475,17 @@ input[type="range"]::-webkit-slider-thumb {
 .color-swatches {
   margin-top: 10px;
 }
-.color-swatches.defaults {
+.presets {
 	margin-top: 10px;
 }
 
-.color-swatches.defaults span{
+.presets span {
 	font-size:12px;
 	font-weight:500;
+	display: inline-block;
+	width: 50%;
+	float:left;
+	cursor:pointer;
 }
 .color-swatches span {
 	display: inline-block;
@@ -1517,13 +1541,14 @@ input[type="range"]::-webkit-slider-thumb {
 
 .settings {
   padding: 10px 12px 12px 12px;
-  bottom: 20px;
+  bottom: 10px;
   right: 10px;
   font-size: 12px;
   -webkit-transform: translateY(450px);
   -webkit-transition: -webkit-transform 0.2s ease-in-out;
   transform: translateY(450px);
   transition: -webkit-transform 0.2s ease-in-out;
+	width: 210px;
 }
 
 .settings.active {
@@ -1575,6 +1600,7 @@ input[type="range"]::-webkit-slider-thumb {
 .settings input[type="text"] {
   border: 1px solid #000;
   font-size: 15px;
+  max-width: 100%;
   padding: 5px;
 }
 
@@ -1584,7 +1610,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{
@@ -2114,7 +2143,7 @@ a[data-role="forgot-password"] {
   background: white;
   padding: 10px;
   margin: 20px auto;
-position: relative;
+  position: relative;
 }
 
 .collaborators button {