Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-02-02 18:37:09 +01:00
parent 9d0252e989 bed49d0b26
commit 85b49d5ec8
9 changed files with 21 additions and 23 deletions
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -402,7 +402,7 @@ body.html {
            margin: 2px 0px;
            cursor: pointer;
            &.half {
-                width: ~"calc(50% - 4px)";
+                width: ~"calc(50% - 2px)";
                &:not(.first) {
                    float: right;
                }
@@ -451,6 +451,9 @@ p.buttons, div.buttons {
        cursor: pointer;
        margin-top: 10px;
    }
+    .dropdown-bar {
+        margin-left: 4px;
+    }
 }

 #fileManagerIframe {