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

1 files changed, 19 insertions, 4 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 9924b33..ef7736f 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -596,7 +596,6 @@ iframe.embed {
 	border-top: 0px solid;
 	font-weight: 500;
 	font-size: 40px;
-	text-transform:capitalize;
 }
 .docs .content img {
 	max-width: 90%;
@@ -643,8 +642,8 @@ iframe.embed {
   text-decoration:underline;
 }
 
-.docs .content.doc-privacy p,
-.docs .content.doc-terms p {
+.docs .content.doc-privacy,
+.docs .content.doc-terms {
   font-size: 15px;
   line-height: 25px;
   font-weight: 300;
@@ -1845,7 +1844,7 @@ input[type="range"]::-webkit-slider-thumb {
    50% { opacity:0.7; }
 }
 
-#color-picker {
+.color-picker {
   position: relative;
 }
 .colorPicker {
@@ -1983,6 +1982,22 @@ input[type="range"]::-webkit-slider-thumb {
   transition: -webkit-transform 0.2s ease-in-out;
 	width: 210px;
 }
+#textEditor.settings {
+  width: 320px;
+}
+#textEditor .swatch {
+  position: relative;
+  top: 6px;
+  margin-left: 6px;
+  cursor: pointer;
+  float: none;
+}
+#textEditor.color-mode {
+  width: 180px;
+}
+#textEditor.color-mode h4:after {
+  content: ' Colors';
+}
 
 .settings.active {
   -webkit-transform: translateY(0px);