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

2017-12-11 15:46:38 +01:00
parent 230f9524be 4e46d0daa5
commit 16388a839c
16 changed files with 491 additions and 51 deletions
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -568,7 +568,7 @@
                width: 64px;
                font-size: 1em;
                color: inherit;
-                height: auto;
+                height: 64px;
                padding: 0px;
                margin: 0;
                &::before {