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

2017-08-17 12:51:58 +02:00 · 2017-08-17 12:51:58 +02:00 · 95404992da
commit 95404992da
parent ee874878dd 0a813b4fab
1 changed files with 1 additions and 0 deletions
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@ -600,6 +600,7 @@ noscript {
        width: ~"calc(100% - 6px)";
        height: 25px;
        line-height: 25px;
+        overflow: hidden;
        .usage {
            height: 100%;
            display: inline-block;