merge

1 files changed, 17 insertions, 1 deletions

diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 57c7197..814df90 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1844,7 +1844,7 @@ input[type="range"]::-webkit-slider-thumb {
    50% { opacity:0.7; }
 }
 
-#color-picker {
+.color-picker {
   position: relative;
 }
 .colorPicker {
@@ -1982,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);