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

customize.dist/CryptPad_logo_color.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360.4 94.7"><defs><style>.cls-1{fill:#4591c4}.cls-2{fill:#999}</style></defs><title>CryptPad_logo_color</title><g id="Layer_2" data-name="Layer 2"><g id="svg2"><g id="g4845"><path id="path4811" class="cls-1" d="M99.5 63.6a24.8 24.8 0 0 1-5.9-.6 8.5 8.5 0 0 1-3.8-1.9 7.1 7.1 0 0 1-2-3.4 19.4 19.4 0 0 1-.6-5.2v-10a19.4 19.4 0 0 1 .6-5.1 7.1 7.1 0 0 1 2-3.4 8.5 8.5 0 0 1 3.8-2 24.8 24.8 0 0 1 5.9-.6h22.3v6.2h-22a11.8 11.8 0 0 0-2.7.3 3.5 3.5 0 0 0-1.7.9 3.3 3.3 0 0 0-.9 1.6 11.1 11.1 0 0 0-.2 2.5v9.4a11.1 11.1 0 0 0 .2 2.5 3.3 3.3 0 0 0 .9 1.6 3.3 3.3 0 0 0 1.7.8l2.7.2h22v6.1z"/><path id="path4813" class="cls-1" d="M126.5 63.6V48.8a16 16 0 0 1 .7-4.9 7.5 7.5 0 0 1 2.1-3.3 8.9 8.9 0 0 1 3.7-1.9 21.4 21.4 0 0 1 5.5-.6h4.6v5.7h-4.4l-2.5.2a3.3 3.3 0 0 0-1.6.8 3.2 3.2 0 0 0-.8 1.6 10.1 10.1 0 0 0-.3 2.5v14.7z"/><path id="path4815" class="cls-1" d="M154.1 51.4a3.8 3.8 0 0 0 .9 3 4.6 4.6 0 0 0 3.1.8h15.7V38h6.8v25.2q0 4.3-2.1 6.2t-6.9 1.9h-10.2v-5.8h9.6a3.3 3.3 0 0 0 2.1-.6 2.7 2.7 0 0 0 .7-2.2v-2h-16.1a19 19 0 0 1-4.9-.5 7.8 7.8 0 0 1-3.3-1.7 6.5 6.5 0 0 1-1.8-2.8 12.7 12.7 0 0 1-.6-4V38h6.9z"/><path id="path4817" class="cls-1" d="M207.5 38a25.1 25.1 0 0 1 5.9.6 8.5 8.5 0 0 1 3.8 1.9 7.1 7.1 0 0 1 2 3.4 19.7 19.7 0 0 1 .6 5.2v3.4a19.4 19.4 0 0 1-.6 5.2 7.1 7.1 0 0 1-2 3.4 8.5 8.5 0 0 1-3.8 1.9 25.1 25.1 0 0 1-5.9.6h-14.3v7.6h-7V49.1a19.7 19.7 0 0 1 .6-5.2 7.1 7.1 0 0 1 2-3.4 8.6 8.6 0 0 1 3.8-1.9 25.1 25.1 0 0 1 5.9-.6zm5.3 11.3a11.7 11.7 0 0 0-.3-2.7 2.9 2.9 0 0 0-1-1.6 4 4 0 0 0-1.9-.8l-3-.2h-7.8l-2.7.2a3.5 3.5 0 0 0-1.7.8 3.2 3.2 0 0 0-.8 1.6 11.7 11.7 0 0 0-.2 2.6v8.4h13.4l3-.2a3.8 3.8 0 0 0 1.9-.7 2.9 2.9 0 0 0 1-1.6 11.9 11.9 0 0 0 .3-2.8z"/><path id="path4819" class="cls-1" d="M226.5 63.6V43.8H223V38h3.6v-7.2h7.2V38h8.1v5.7h-8.1v19.9z"/><path id="path4821" class="cls-2" d="M252.4 54.4v9.2h-7.2V31.4H271a25.7 25.7 0 0 1 5.8.5 8.4 8.4 0 0 1 3.7 1.8 6.8 6.8 0 0 1 2 3.2 17.1 17.1 0 0 1 .6 4.8v2.8a16.9 16.9 0 0 1-.6 4.8 6 6 0 0 1-2 3 8.3 8.3 0 0 1-3.7 1.6 31.6 31.6 0 0 1-5.9.4zm23.5-12.3q0-2.6-1.1-3.5t-4-.9h-18.4v11h18.5a6.5 6.5 0 0 0 3.9-.9q1.1-.9 1.1-3.4z"/><path id="path4823" class="cls-2" d="M296.2 63.6a18.4 18.4 0 0 1-4.6-.5 7.4 7.4 0 0 1-2.9-1.3 4.6 4.6 0 0 1-1.5-2.1 8.7 8.7 0 0 1-.4-2.8v-2.4a9.3 9.3 0 0 1 .4-2.9 4.7 4.7 0 0 1 1.4-2.1 6.5 6.5 0 0 1 2.7-1.3 17.7 17.7 0 0 1 4.4-.4h18.9v-.6q0-2.5-1-3.3a5.3 5.3 0 0 0-3.4-.8h-7V38h7a20.7 20.7 0 0 1 5.2.6 8.9 8.9 0 0 1 3.5 1.7 6.7 6.7 0 0 1 2 2.9 12.5 12.5 0 0 1 .6 4.2v6.2a17.2 17.2 0 0 1-.5 4.7 6.3 6.3 0 0 1-1.9 3.1 7.9 7.9 0 0 1-3.6 1.7 26.8 26.8 0 0 1-5.6.5zM314.7 52h-18.2a3.1 3.1 0 0 0-1.9.5 2.5 2.5 0 0 0-.7 2.1v1.7a2.1 2.1 0 0 0 .8 1.9 3.7 3.7 0 0 0 2.1.5H310l2.1-.2a3.2 3.2 0 0 0 1.5-.7 3 3 0 0 0 .9-1.4 7.8 7.8 0 0 0 .3-2.3z"/><path id="path4825" class="cls-2" d="M339.1 63.6a25.4 25.4 0 0 1-6-.6 8.6 8.6 0 0 1-3.8-1.9 7.1 7.1 0 0 1-2-3.4 19.4 19.4 0 0 1-.6-5.2v-3.4a19.7 19.7 0 0 1 .6-5.2 7.1 7.1 0 0 1 2-3.4 8.6 8.6 0 0 1 3.8-1.9 25.4 25.4 0 0 1 6-.6h14.2v-8.2h7v22.8a19.4 19.4 0 0 1-.6 5.2 7.1 7.1 0 0 1-2 3.4A8.5 8.5 0 0 1 354 63a25.1 25.1 0 0 1-5.9.6zm-5.3-11.2a11.7 11.7 0 0 0 .3 2.7 2.9 2.9 0 0 0 1 1.6 4 4 0 0 0 1.9.8l3.1.2h7.8l2.7-.2a3.3 3.3 0 0 0 1.7-.8 3.2 3.2 0 0 0 .9-1.6 11.9 11.9 0 0 0 .2-2.6v-8.4H340l-3 .2a4 4 0 0 0-1.9.8 2.9 2.9 0 0 0-1 1.6 11.7 11.7 0 0 0-.3 2.7z"/><path id="path4827" class="cls-1" d="M39.2 0L9.9 5.4A6.3 6.3 0 1 0 3.2 16v42.2c0 4 1.8 8.3 5.3 12.7A65.5 65.5 0 0 0 21.6 83a128.2 128.2 0 0 0 17.6 10.5A128.1 128.1 0 0 0 56.7 83a65.4 65.4 0 0 0 13.1-12.1c3.5-4.5 5.3-8.8 5.3-12.7V16A6.3 6.3 0 0 0 72 4.2a6.2 6.2 0 0 0-3.6 1.2zm-.1 6.2l26.7 4.9a5.9 5.9 0 0 0 .2 1.1L50.3 22.5a15.3 15.3 0 0 0-22.6.1l-15.5-10a6.3 6.3 0 0 0 .3-1.4zm28.8 9a6.5 6.5 0 0 0 1.8 1.1v41a10.4 10.4 0 0 1-.1 1.7 21.5 21.5 0 0 1-4.1 7.8 56.1 56.1 0 0 1-11.3 10.4 110.6 110.6 0 0 1-15 9 110.8 110.8 0 0 1-15-9A55.8 55.8 0 0 1 13 66.8a19.8 19.8 0 0 1-4.4-9.3V16.4a6.3 6.3 0 0 0 1.7-1l19.8 12.7a10.1 10.1 0 0 1 9-5.4 10 10 0 0 1 9 5.4z"/><g id="g4829"><path id="path4831" class="cls-2" d="M23 54.8a4.6 4.6 0 1 0 0 9.3 4.6 4.6 0 0 0 0-9.3z"/><path id="path4833" class="cls-2" d="M24.3 28.5a14.9 14.9 0 0 0 4.2 15.4l-7.3 14.8a2.8 2.8 0 0 0 2.3 3.8h11v-5.2h-6.8l6.4-12.8a2.7 2.7 0 0 0-.8-3.3 9.7 9.7 0 0 1-4.3-9.6z"/></g><g id="g4835"><path id="path4837" class="cls-2" d="M55.3 54.8a4.6 4.6 0 1 0 0 9.3 4.6 4.6 0 0 0 0-9.3z"/><path id="path4839" class="cls-2" d="M53.8 28.6l-4.7 3.1a10.2 10.2 0 0 1 .1 1.2 10 10 0 0 1-4.3 8.3 2.7 2.7 0 0 0-.8 3.3l6.3 12.8h-6.8v5.2h11a2.8 2.8 0 0 0 2.3-3.8l-7.3-14.8a15.2 15.2 0 0 0 4.8-11 15.3 15.3 0 0 0-.6-4.3z"/></g><path id="path4841" class="cls-1" d="M43.2 33.3a4.2 4.2 0 1 1-4.2-4.2 4.2 4.2 0 0 1 4.2 4.2z"/><path id="path4843" class="cls-1" d="M45.3 88.4a6.3 6.3 0 1 1-6.3-6.3 6.3 6.3 0 0 1 6.3 6.3z"/></g></g></g></svg>

customize.dist/pages.js

@@ -16,7 +16,7 @@ define([
     var footerCol = function (title, L, literal) {
         return h('div.col', [
             h('ul.list-unstyled', [
-                h('li.title', {
+                h('li.footer-title', {
                     'data-localization': title,
                 }, title? Msg[title]: literal )
                 ].concat(L.map(function (l) {
@@ -77,6 +77,21 @@ define([
     };
 
     var infopageTopbar = function () {
+        var rightLinks;
+        var username = window.localStorage.getItem('User_name');
+        if (username === null) {
+            rightLinks = [
+                h('a.nav-item.nav-link.cp-login-btn', { href: '/login'}, Msg.login_login),
+                h('a.nav-item.nav-link.cp-register-btn', { href: '/register'}, Msg.login_register)
+            ];
+        } else {
+            rightLinks = h('a.nav-item.nav-link.cp-user-btn', { href: '/drive' }, [
+                h('i.fa.fa-user-circle'),
+                " ",
+                username
+            ]);
+        }
+
         return h('nav.navbar.navbar-toggleable-md',
                      h('button.navbar-toggler.navbar-toggler-right', {'type':'button'}, {'data-toggle':'collapse'}, {'data-target':'#menuCollapse'}, {'aria-controls': 'menuCollapse'}, {'aria-expanded':'false'}, {'aria-label':'Toggle navigation'},
                     [h('i.fa.fa-bars ')
@@ -87,9 +102,7 @@ define([
                     h('a.nav-item.nav-link', { href: 'https://blog.cryptpad.fr/'}, Msg.blog),
                     h('a.nav-item.nav-link', { href: '/contact.html'}, Msg.contact),
                     h('a.nav-item.nav-link', { href: '/about.html'}, Msg.about),
-                    h('a.nav-item.nav-link.cp-login-btn', { href: '/login'}, Msg.login_login),
+                ].concat(rightLinks))
-                    h('a.nav-item.nav-link.cp-register-btn', { href: '/register'}, Msg.login_register)
-                ])
         );
     };
 
@@ -122,14 +135,14 @@ define([
                 h('h2', 'Key Contributors'),
                 h('div.row', [
                     h('div.col-md-4', [
-                        h('img.bio-avatar', {'src': '/customize/images/pierre.jpg'}),
+                        h('img.bio-avatar', {'src': '/customize/images/Pierre-new.jpg'}),
                         h('h3', "Pierre Bondoerffer"),
                         setHTML(h('div#bio'), '<p>Resident CSS wizard and emoji extraordinaire, Pierre is passionate about anything related to technology. He loves to hack around computers and put parts together.</p><p>He is currently studying at 42, where he learns about algorithms, networking, kernel programming and graphics.</p><p>As a part of an internship, he joined XWiki SAS and worked on CryptPad to improve user experience. He also maintains the Spanish translation.</p>')
                     ]),
                     h('div.col-md-4', [
-                        h('img.bio-avatar', {'src': '/customize/images/avatar.png'}),
+                        h('img.bio-avatar', {'src': '/customize/images/Catalin.jpg'}),
                         h('h3', "Catalin Scripcariu"),
-                        setHTML(h('div#bio'), '')
+                        setHTML(h('div#bio'), '<p> Catalin is a Maths majour and has worked in B2B sales for 12 years. Design was always his passion and 3 years ago he started to dedicate himself to web design and front-end.</p><p>At the beginning of 2017 he joined the Xwiki family, where he worked both on the business and the community side of XWiki, including the research team and CryptPad. </p>')
                     ]),
                     h('div.col-md-4', [
                         h('img.bio-avatar', {'src': '/customize/images/ludovic.jpg'}),
@@ -285,7 +298,7 @@ define([
                         ])
                     ])
                 ]),
-            ])
+            ]),
         ];
     };
 
@@ -336,20 +349,26 @@ define([
                     }),
                     h('div.checkbox-container', [
                         h('input#import-recent', {
+                            name: 'import-recent',
                             type: 'checkbox',
                             checked: true
                         }),
-                        h('label', {
+                        // hscript doesn't generate for on label for some
+                        // reason... use jquery as a temporary fallback
+                        setHTML($('<label for="import-recent"></label>')[0], Msg.register_importRecent)
+                        /*h('label', {
                             'for': 'import-recent',
-                        }, Msg.register_importRecent),
+                        }, Msg.register_importRecent),*/
                     ]),
                     h('div.checkbox-container', [
                         h('input#accept-terms', {
+                            name: 'accept-terms',
                             type: 'checkbox'
                         }),
-                        setHTML(h('label', {
+                        setHTML($('<label for="accept-terms"></label>')[0], Msg.register_acceptTerms)
+                        /*setHTML(h('label', {
                             'for': 'accept-terms',
-                        }), Msg.register_acceptTerms),
+                        }), Msg.register_acceptTerms),*/
                     ]),
                     h('button#register.btn.btn-primary', Msg.login_register)
                 ])

customize.dist/src/less/bar.less

@@ -1,4 +1,5 @@
 /* Bottom Bar */
+@import (once) "../less2/include/colortheme.less";
 
 .top-bar, .bottom-bar {
     position:fixed;
@@ -16,7 +17,7 @@
     }
     p {
         margin: -1px;
-        font-family: Arial, Helvetica, Tahoma, Verdana, sans-serif;
+        font-family: @colortheme_font;
 
         font-size: 20px;
         display:block;

customize.dist/src/less/cryptpad.less

@@ -2,6 +2,7 @@
 @import "./mixins.less";
 
 @import "../less2/include/alertify.less";
+@import "../less2/include/colortheme.less";
 @import "./bar.less";
 @import "./loading.less";
 @import "./dropdown.less";
@@ -27,7 +28,7 @@ html.cp, .cp body {
 
 // add font for tooltips
 .tippy-popper {
-    font: normal normal normal 16px Arial, Helvetica, Tahoma, Verdana, Sans-Serif;
+    font: 16px @colortheme_font;
 }
 
 // override bootstrap colors
@@ -69,7 +70,7 @@ a.github-corner > svg {
 h1,h2,h3,h4,h5,h6 {
     color: @fore;
 
-    font-family: "Source Sans Pro","Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-family: @colortheme_font;
     -webkit-font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
     -moz-font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
     font-feature-settings: 'dlig' 1,'liga' 1,'lnum' 1,'kern' 1;
@@ -427,7 +428,7 @@ noscript {
         max-width: 40%;
         padding: 10px;
         box-sizing: border-box;
-        font-family: lato, Helvetica, sans-serif;
+        font-family: @colortheme_font;
         color: @main-color;
 
         label {
@@ -641,7 +642,7 @@ noscript {
     box-sizing: border-box;
     z-index:10000;
     display: none;
-    font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
+    font-family: @colortheme_font;
     #uploadStatus {
         width: 80vw;
         border: 1px solid black;

customize.dist/src/less/dropdown.less

@@ -1,3 +1,4 @@
+@import (once) "../less2/include/colortheme.less";
 
 /* The container <div> - needed to position the dropdown content */
 .dropdown-bar {
@@ -36,7 +37,7 @@
         z-index: 1000;
         max-height: 300px;
         overflow-y: auto;
-        font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
+        font-family: @colortheme_font;
         font-size: 16px;
         line-height: 1em;
 

customize.dist/src/less/footer.less

@@ -1,8 +1,9 @@
 @import "./variables.less";
+@import (once) "../less2/include/colortheme.less";
 
 .cp footer {
     background: @category-bg;
-    font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
+    font-family: @colortheme_font;
     padding-top: 1em;
     font-size: 1.2em;
     a {

customize.dist/src/less/loading.less

@@ -1,4 +1,5 @@
 @import "./variables.less";
+@import (once) "../less2/include/colortheme.less";
 
 .cp #loading {
     position: fixed;
@@ -51,7 +52,7 @@
         text-align: center;
         font-size: 1.5em;
         opacity: 0.7;
-        font-family: lato, Helvetica, sans-serif;
+        font-family: @colortheme_font;
         padding: 15px;
         max-width: 60%;
         display: inline-block;

customize.dist/src/less/toolbar.less

@@ -2,6 +2,7 @@
 @import "./mixins.less";
 
 @import "./dropdown.less";
+@import (once) "../less2/include/colortheme.less";
 
 .unselectable {
     -webkit-touch-callout: none;
@@ -61,7 +62,7 @@
 }
 
 body .userlist-drawer {
-    font: normal normal normal @main-font-size Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
+    font: @main-font-size @colortheme_font;
     min-width: 175px;
     width: 175px;
     display: block;
@@ -100,7 +101,7 @@ body .userlist-drawer {
     }
 
     & > p {
-        font: normal normal normal @main-font-size Arial,Helvetica,Tahoma,Verdana,Sans-Serif;
+        font: @main-font-size @colortheme_font;
         margin: 0;
         padding: 0;
         display: block;

customize.dist/src/less/topbar.less

@@ -1,4 +1,5 @@
 @import "./variables.less";
+@import (once) "../less2/include/colortheme.less";
 
 #cryptpadTopBar {
     background: @topbar-back;
@@ -8,7 +9,7 @@
     right: 0;
     height: @topbar-height;
     color: @topbar-color;
-    font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-family: @colortheme_font;
     padding: 5px;
     box-sizing: border-box;
     font-size: 30px;

customize.dist/src/less/variables.less

@@ -49,7 +49,7 @@
 
 // Dropdown
 
-@dropdown-font: @main-font-size -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+@dropdown-font: @main-font-size @colortheme_font;
 @dropdown-bg: #f9f9f9;
 @dropdown-color: black;
 @dropdown-bg-hover: #f1f1f1;

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

@@ -2,26 +2,25 @@
 @import (once) "./browser.less";
 
 .alertify_main () {
-    @alertify-fore: @colortheme_old-fore;
+    @alertify-fore: @colortheme_modal-fg;
-    @alertify-base: @colortheme_old-base;
+    @alertify-base: @colortheme_modal-bg;
 
-    @alertify-dialog-bg: #444;
+    @alertify-dialog-bg: @alertify-base;
-    @alertify-dialog-fg: @colortheme_old-fore;
+    @alertify-dialog-fg: @alertify-fore;
 
-    @alertify-btn-fg: @colortheme_old-fore;
+    @alertify-btn-fg: @alertify-fore;
 
-    @alertify-btn-bg: rgba(200, 200, 200, 0.05);
+    @alertify-btn-bg: rgba(200, 200, 200, 0.1);
-    @alertify-btn-bg-hover: rgba(200, 200, 200, .15);
+    @alertify-btn-bg-hover: rgba(200, 200, 200, .3);
 
-    @alertify-bg: rgba(0, 0, 0, .3);
+    @alertify-bg: @colortheme_modal-dim;
-    @alertify-fg: @colortheme_old-fore;
+    @alertify-fg: @alertify-fore;
 
-    @alertify-input-bg: @colortheme_old-base;
+    @alertify-input-bg: @colortheme_modal-input;
-    @alertify-input-fg: @colortheme_old-fore;
+    @alertify-input-fg: @colortheme_modal-fg;
 
-    @alertify_padding-base: 12px;
+    @alertify_padding-base: @colortheme_modal-padding;
-    @alertify_box-shadow: 0 2px 5px 0 rgba(0,0,0,.2);
+    @alertify_box-shadow: @colortheme_modal-shadow;
-    @alertify_border-radius: 1px;
 
     // Logs to show that something has happened
     // These show only once
@@ -34,20 +33,20 @@
             padding: @alertify_padding-base @alertify_padding-base * 4;
             color: @alertify-fore;
 
-            font-weight: bold;
+            font-family: @colortheme_font;
             font-size: large;
 
             box-shadow: @alertify_box-shadow;
-            border-radius: @alertify_border-radius;
             &, &.default {
                 // FIXME
                 background: rgba(0, 0, 0, .8);
             }
             &.error {
+                font-weight: bold;
                 background: @colortheme_cp-red;
             }
             &.success {
-                background: @colortheme_cp-green;
+                background: rgba(0, 0, 0, .8);
             }
         }
     }
@@ -64,6 +63,10 @@
         height: 100%;
         z-index: 99999;
 
+        h1, h2, h3 {
+            margin-top: 0;
+        }
+
         &.hide {
             opacity: 0;
             pointer-events: none;
@@ -89,7 +92,6 @@
 
             & > div {
                 background-color: @alertify-dialog-bg;
-                border-radius: 5px;
                 &.half {
                     width: 50%;
                     @media (max-width: @browser_media-medium-screen) {
@@ -106,10 +108,10 @@
 
             > * {
                 width: 30%;
-                width: 500px;
+                min-width: 500px;
                 max-width: 95%;
                 margin: 0 auto;
-                text-align: center;
+                text-align: left;
                 padding: @alertify_padding-base;
                 background: #fff;
                 // FIXME
@@ -120,14 +122,12 @@
                 padding: @alertify_padding-base;
                 margin-bottom: @alertify_padding-base;
                 margin: 0;
-                text-align: left;
             }
 
-            input:not(.form-control){
+            input:not(.form-control), textarea {
                 background-color: @alertify-input-bg;
                 color: @alertify-input-fg; 
                 border: 0px;
-                border-radius: 5px;
 
                 margin-bottom: 15px;
                 width: 100%;
@@ -137,6 +137,13 @@
                     //outline-offset: -2px;
                 }
             }
+
+            input[type="checkbox"] {
+                padding: 0;
+                margin: 0;
+                margin-right: 0.5em;
+            }
+
             nav {
 
                 text-align: right;
@@ -161,10 +168,10 @@
                     font-size: 14px;
                     text-decoration: none;
                     cursor: pointer;
+                    border-radius: 0;
 
                     color: @alertify-btn-fg;
-                    border: 1px solid @alertify-base;
+                    border: 1px solid transparent;
-                    border-radius: 5px;
 
                     &.safe, &.danger {
                         color: @colortheme_old-base;
@@ -172,16 +179,16 @@
                         font-weight: bold;
                     }
                     &.danger {
-                        background-color: @colortheme_cp-red;
+                        background-color: @colortheme_alertify-red;
                         &:hover, &:active {
-                            background-color: lighten(@colortheme_cp-red, 5%);
+                            background-color: lighten(@colortheme_alertify-red, 5%);
                         }
                     }
 
                     &.safe {
-                        background-color: @colortheme_cp-green;
+                        background-color: @colortheme_alertify-green;
                         &:hover, &:active {
-                            background-color: lighten(@colortheme_cp-green, 10%);
+                            background-color: lighten(@colortheme_alertify-green, 10%);
                         }
                     }
 

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

@@ -1,3 +1,5 @@
+@colortheme_font: 'Open Sans', 'Helvetica Neue', sans-serif;
+
 @colortheme_link-color: #0275D8;
 @colortheme_link-color-visited: #005999;
 @colortheme_info-background: #fafafa;
@@ -11,6 +13,19 @@
 @colortheme_cp-red: #FA5858; // remove red
 @colortheme_cp-green: #46E981;
 
+@colortheme_modal-bg: #222;
+@colortheme_modal-fg: #fff;
+@colortheme_modal-dim: rgba(0, 0, 0, 0.4);
+@colortheme_modal-padding: 12px;
+@colortheme_modal-shadow: 0 8px 32px 0 rgba(0,0,0,.4);
+
+@colortheme_modal-input: #111;
+
+@colortheme_alertify-red: #E55236;
+@colortheme_alertify-green: #77C825;
+
+// Apps
+
 @colortheme_pad-bg: #1c4fa0;
 @colortheme_pad-color: #fff;
 
@@ -43,3 +58,6 @@
 
 @colortheme_profile-bg: #0087ff;
 @colortheme_profile-color: #fff;
+
+@cryptpad_color_blue: #4591C4; 
+@cryptpad_color_grey: #999999;

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

@@ -8,10 +8,8 @@
     background-color: @colortheme_info-background;
 
     a {
-        color: @colortheme_link-color;
+        color: @cryptpad_color_blue;
-        &:visited { color: @colortheme_link-color-visited; }
+        &:visited { color: darken(@cryptpad_color_blue, 10%); }
-        //opacity: 0.8;
-        //transition: opacity 0.2s;
     }
     a:hover {
         opacity: 1;
@@ -21,8 +19,8 @@
     padding: 0;
     margin: 0;
 
-    font-size: 16pxt:;
+    font-size: 16px;
-    font-family: 'Open Sans', 'Helvetica Neue', sans-serif;
+    font-family: @colortheme_font;
 
     .cp-container {
         font-size: 16px;
@@ -76,25 +74,26 @@
     }
 
     footer {
-        background-color: white;
+        background-color: @cryptpad_color_grey;
-
         .container {
             .col {
                 margin-top: 1em;
             }
-
+        a {
-            width: 100%;
+            color: #fff;
-            text-align: center;
+            &:visited {
-            margin-bottom: 1em;
+                color: darken(#fff, 20%);
-
+            };
-            ul.list-unstyled {
+        }
+        margin-bottom: 1em;
+        ul.list-unstyled {
                 margin: 0;
             }
         }
 
         .cp-version-footer {
-            background-color: @colortheme_info-background;
+            background-color: #6C6C6C;
-            color: black;
+            color: #fff;
             text-align: center;
             padding: 0.5em;
         }
@@ -151,10 +150,71 @@
         }
 
         .cp-logo {
-            img {
-                height: @infopages_infobar-height / 2;
-            }
             margin-right: 0.5em;
         }
     }
 }
+
+// navigation top bar 
+.navbar  {
+    background: #fff;
+    .navbar-brand {
+        display: block;
+        background-image: url(/customize/CryptPad_logo_color.svg);
+        background-repeat: no-repeat;
+        background-size: contain;
+        height: 50px;
+        width: 250px;
+    }
+    a {
+        border: 2px solid transparent;
+    }
+    .nav-link {
+        padding: 0.5em 0.7em;
+        &:hover {
+            transform: scale(1.05);
+        };
+    }
+    .cp-register-btn {
+            border: 2px solid #4591C4;
+    }
+    button:focus {
+        outline: none;
+    }
+    .navbar-toggler {
+        margin-top: 10px;
+        color: #4591C4;
+    }
+}
+@media (max-width: 991px) {
+    #menuCollapse {
+        text-align: right;
+    }
+    .navbar-nav a {
+        text-align: right !important;
+    }
+    .cp-register-btn {
+        margin-right: 13px;
+        margin-left: 83vw;
+        text-align: center;
+     }
+}
+@media (max-width: 687px) {
+    .cp-register-btn {
+         margin-left: 75vw;
+    }
+}
+@media (max-width: 467px) {
+    .cp-register-btn {
+         margin-left: 63vw;
+    }
+}
+
+
+//footer general styles
+
+.footer-title {
+    font-weight: bold;
+    font-size: 1.2em;
+    color: #1E1F1F;
+}

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

@@ -9,4 +9,4 @@
     margin: 1em 0;
     max-width: 300px;
     max-height: 300px;
-}
+}

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

@@ -13,6 +13,7 @@
     color: #FFF;
     background: linear-gradient( @background_darker, @background_lighter ), url('/customize/bg14.jpg');
     background-size: cover;
+    background-position: center;
     min-height: 100vh;
     display: flex;
     flex-direction: column;
@@ -63,24 +64,21 @@
     }
 }
 .navbar {
+    background: transparent;
     width: 100%;
     @media only screen and (max-device-width: 991px) {
         margin-top: 0;
     }
     .navbar-brand {
-        background: url(/customize/CryptPad-white-logo.svg) no-repeat;
+        background-image: url(/customize/CryptPad-white-logo.svg);
-        width: 250px;
-        height: 50px;
     }
     a {
         color: #fff;
-        border: 2px solid transparent;
         &:visited {
             color: rgba(255,255,255,.8);
         };
     }
     .nav-link {
-        padding: 0.5em 0.7em;
         &:hover {
             transform: scale(1.05);
         };
@@ -88,9 +86,6 @@
     .cp-register-btn {
             border: 2px solid #fff;
     }
-    button:focus {
-        outline: none;
-    }
     .navbar-toggler {
         margin-top: 10px;
         color: #fff;
@@ -196,27 +191,4 @@ h4 {
         left: 5px;
     }
 }
-@media (max-width: 991px) {
-    #menuCollapse {
-        text-align: right;
-    }
-    .navbar-nav a {
-        text-align: right !important;
-    }
-    .cp-register-btn {
-        margin-right: 13px;
-        margin-left: 83vw;
-        text-align: center;
-     }
-}
-@media (max-width: 687px) {
-    .cp-register-btn {
-         margin-left: 75vw;
-    }
-}
-@media (max-width: 467px) {
-    .cp-register-btn {
-         margin-left: 63vw;
-    }
-}
 

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

@@ -23,3 +23,10 @@
         }
     }
 }
+
+.alertify {
+    // workaround for alertify making empty p
+    p:empty {
+        display: none;
+    }
+}

www/common/cryptpad-common.js

@@ -1397,23 +1397,42 @@ define([
         }
     };
 
+    // This is duplicated in drive/main.js, it should be unified
+    var getFileIcon = function (data) {
+        var $icon = common.getIcon();
+
+        if (!data) { return $icon; }
+
+        var href = data.href;
+        if (!href) { return $icon; }
+
+        if (href.indexOf('/pad/') !== -1) { $icon = common.getIcon('pad'); }
+        else if (href.indexOf('/code/') !== -1) { $icon = common.getIcon('code'); }
+        else if (href.indexOf('/slide/') !== -1) { $icon = common.getIcon('slide'); }
+        else if (href.indexOf('/poll/') !== -1) { $icon = common.getIcon('poll'); }
+        else if (href.indexOf('/whiteboard/') !== -1) { $icon = common.getIcon('whiteboard'); }
+        else if (href.indexOf('/file/') !== -1) { $icon = common.getIcon('file'); }
+
+        return $icon;
+    };
 
     common.createFileDialog = function (cfg) {
         var $body = cfg.$body || $('body');
-        var $block = $body.find('#fileDialog');
+        var $blockContainer = $body.find('#fileDialog');
-        if (!$block.length) {
+        if (!$blockContainer.length) {
-            $block = $('<div>', {id: "fileDialog"}).appendTo($body);
+            $blockContainer = $('<div>', {id: "fileDialog"}).appendTo($body);
         }
-        $block.html('');
+        $blockContainer.html('');
+        var $block = $('<div>', {'class': 'cp-modal'}).appendTo($blockContainer);
         $('<span>', {
             'class': 'close fa fa-times',
             'title': Messages.filePicker_close
         }).click(function () {
-            $block.hide();
+            $blockContainer.hide();
         }).appendTo($block);
         var $description = $('<p>').text(Messages.filePicker_description);
         $block.append($description);
-        var $filter = $('<p>').appendTo($block);
+        var $filter = $('<p>', {'class': 'cp-form'}).appendTo($block);
         var $container = $('<span>', {'class': 'fileContainer'}).appendTo($block);
         var updateContainer = function () {
             $container.html('');
@@ -1426,11 +1445,15 @@ define([
                 if (filter && name.toLowerCase().indexOf(filter.toLowerCase()) === -1) {
                     return;
                 }
-                var $span = $('<span>', {'class': 'element'}).appendTo($container);
+                var $span = $('<span>', {
-                var $inner = $('<span>').text(name);
+                    'class': 'element',
-                $span.append($inner).click(function () {
+                    'title': name,
+                }).appendTo($container);
+                $span.append(getFileIcon(data));
+                $span.append(name);
+                $span.click(function () {
                     if (typeof cfg.onSelect === "function") { cfg.onSelect(data.href); }
-                    $block.hide();
+                    $blockContainer.hide();
                 });
             });
         };
@@ -1446,13 +1469,13 @@ define([
         //$filter.append(' '+Messages.or+' ');
         var data = {FM: cfg.data.FM};
         $filter.append(common.createButton('upload', false, data, function () {
-            $block.hide();
+            $blockContainer.hide();
         }));
         updateContainer();
         $body.keydown(function (e) {
-            if (e.which === 27) { $block.hide(); }
+            if (e.which === 27) { $blockContainer.hide(); }
         });
-        $block.show();
+        $blockContainer.show();
     };
 
 

www/common/file-dialog.less

@@ -1,39 +1,101 @@
+@import (once) '../customize/src/less2/include/colortheme.less';
+
 #fileDialog {
-    position: absolute;
-    background-color: rgba(200, 200, 200, 0.8);
-    top: 15vh; bottom: 15vh;
-    left: 10vw; right: 10vw;
-    border: 1px solid black;
-    z-index: 100000;
-    overflow: auto;
     display: none;
-    font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
+
-    font-size: 16px;
+    z-index: 100000;
-    text-align: center;
+    position: absolute;
-    .close {
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: @colortheme_modal-dim;
+
+    .cp-modal {
+        background-color: @colortheme_modal-bg;
+        color: @colortheme_modal-fg;
+        box-shadow: @colortheme_modal-shadow;
+
+        padding: @colortheme_modal-padding;
+
         position: absolute;
-        top: 0;
+        top: 15vh; bottom: 15vh;
-        right: 0;
+        left: 10vw; right: 10vw;
-        padding: 5px;
+
-        cursor: pointer;
+        overflow: auto;
-    }
+
-    .element {
+        font-family: @colortheme_font;
-        cursor: pointer;
+        text-align: center;
-        display: inline-flex;
+
-        width: 100px;
+        & > p {
-        height: 100px;
+            margin-bottom: 1em;
-        border: 1px solid #ccc;
+        }
-        margin: 5px;
+
-        overflow: hidden;
+        .cp-form {
-        word-wrap: break-word;
+            display: flex;
-        background-color: white;
+            flex-wrap: wrap;
-        padding: 5px;
+            align-items: center;
-        align-items: center;
+            justify-content: center;
-        span {
-            width: 100px;
-            text-align: center;
         }
-    }
-}
 
+        input {
+            background-color: @colortheme_modal-input;
+            color: @colortheme_modal-fg;
+            border: 0;
+            padding: 8px 12px;
+            margin: 1em;
+        }
+
+        .close {
+            text-shadow: none;
+            color: inherit;
+
+            position: absolute;
+            top: 0;
+            right: 0;
+            margin: @colortheme_modal-padding;
+            cursor: pointer;
+        }
+
+        .fileContainer {
+            display: flex;
+            flex-wrap: wrap;
+            overflow-y: auto;
+        }
+
+        .element {
+            @darker: darken(@colortheme_modal-fg, 30%);
+
+            width: 200px;
+            min-width: 200px;
+            height: 1em;
+            padding: 0.5em;
+            margin: 5px;
+            box-sizing: content-box;
+
+            text-align: left;
+            line-height: 1em;
+            cursor: pointer;
 
+            background-color: #111;
+            color: @darker;
+
+            transition: all 0.1s;
+
+            &:hover {
+                color: @colortheme_modal-fg;
+            }
+
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+
+            align-items: center;
+
+            .fa {
+                cursor: pointer;
+                margin-right: 0.5em;
+            }
+        }
+    }
+}

www/drive/main.js

@@ -1146,6 +1146,7 @@ define([
             $span.append($name).append($subfolders).append($files);
         };
 
+        // This is duplicated in cryptpad-common, it should be unified
         var getFileIcon = function (id) {
             var $icon = Cryptpad.getIcon();
 

www/file/main.js

@@ -126,9 +126,14 @@ define([
                         }));
 
                         // make pdfs big
+                        var toolbarHeight = $iframe.find('#toolbar').height();
                         $iframe.find('media-tag iframe').css({
-                            'height': 'calc(100vh - 64px)',
+                            'height': 'calc(100vh - ' + toolbarHeight + 'px)',
-                            width: 'calc(100vw - 15px)',
+                            'width': '100vw',
+                            'position': 'absolute',
+                            'bottom': 0,
+                            'left': 0,
+                            'border': 0
                         });
                     })
                     .on('decryptionError', function (e) {

www/poll/main.js

@@ -621,6 +621,12 @@ var ready = function (info, userid, readOnly) {
         .on('change', ['table'], change)
         .on('remove', [], change);
 
+    var userInput = $('.uncommitted > input');
+    if (userInput.val() === '')
+    {
+        userInput.val(Cryptpad.getProxy()[Cryptpad.displayNameKey]);
+    }
+
     UserList.addToUserData(APP.proxy.info.userData);
 
     APP.ready = true;

www/poll/poll.less

@@ -29,6 +29,7 @@ body {
     flex: 1;
     #poll {
         flex: 1;
+        overflow-y: auto;
     }
 }