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

2017-12-05 18:32:29 +01:00
parent 1dabea84d9 1613b1c086
commit ba74f9d37a
54 changed files with 2418 additions and 1586 deletions
--- a/customize.dist/src/less2/pages/page-404.less
+++ b/customize.dist/src/less2/pages/page-404.less
@@ -0,0 +1,37 @@
+@import (once) "../include/colortheme.less";
+@import (once) "../include/font.less";
+.font_neuropolitical();
+.font_open-sans();
+
+html, body {
+    margin: 0px;
+    padding: 0px;
+    #cp-main {
+
+        height: 100vh;
+        margin: 0px;
+        width: 100%;
+        padding-top: 5%;
+        text-align: center;
+        #cp-logo {
+            display: block;
+            max-width: 15%;
+            margin: auto;
+        }
+        #cp-brand {
+            font-family: neuropolitical;
+            font-size: 40px;
+        }
+        #cp-title {
+            font-size: 30px;
+        }
+        #cp-scramble, #cp-link {
+            font-size: 20px;
+        }
+        #cp-title, #cp-scramble, #cp-link {
+            //font-family: 'Open Sans';
+            font-family: monospace;
+        }
+    }
+}
+