Merge branch 'soon'

8 years ago · 2acbb37291
parent 3fe0baa956 d7f9ddd8d2
commit 2acbb37291
1 changed files with 3 additions and 6 deletions
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@ -12,6 +12,9 @@
    user-select: none;
 }

+.cke_reset_all * {
+    color: inherit;
+}

 .padColor { color: @toolbar-pad-bg; }
 .codeColor { color: @toolbar-code-bg; }
@ -25,9 +28,6 @@
 .toolbar-container {
    display: flex;
 }
-.cke_reset_all * {
-    color: inherit;
-}
 #cke_editor1 .cke_inner {
    position: absolute;
    top: 0;
@ -855,9 +855,6 @@ body .cryptpad-toolbar {
                    width: 100%;
                    cursor: default;
                    font-size: 32px;
-                    .fa {
-                        margin-left: 3px;
-                    }
                }
            }
        }