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

customize.dist/src/less/cryptpad.less

@@ -4,6 +4,7 @@
 @import "../less2/include/alertify.less";
 @import "../less2/include/colortheme.less";
 @import "../less2/include/modal.less";
+@import "../less2/include/font.less";
 @import "./bar.less";
 @import "./loading.less";
 @import "./dropdown.less";
@@ -12,6 +13,8 @@
 
 @toolbar-green: #5cb85c;
 
+.font_open-sans();
+
 .alertify_main();
 
 html.cp, .cp body {

customize.dist/src/less2/include/font.less

@@ -0,0 +1,9 @@
+.font_neuropolitical () {
+    @font-face {
+        font-family: Neuropolitical;
+        src: url(./customize/fonts/neuropolitical.ttf)
+    }
+}
+.font_open-sans () {
+    @import (once) '/customize/fonts/open-sans.less';
+}

customize.dist/src/less2/main.less

@@ -1,8 +1,6 @@
-@font-face {
-	font-family: Neuropolitical;
-	src: url(./customize/fonts/neuropolitical.ttf)
-}
-@import (once) '/customize/fonts/open-sans.less';
+@import (once) './include/font.less';
+.font_neuropolitical();
+.font_open-sans();
 
 body.cp-page-index { @import "./pages/page-index.less"; }
 body.cp-page-contact { @import "./pages/page-contact.less"; }

customize.dist/src/less2/pages/page-register.less

@@ -19,7 +19,7 @@
         #register {
             margin-top: 16px;
             font-size: 1.25em;
-            width: 30%;
+            min-width: 30%;
         }
     }
 }