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

customize.dist/pages/what-is-cryptpad.js

@@ -64,19 +64,23 @@ define([
                     h('div.col-md-6.order-md-1.small-logos', [
                         h('img', {
                             src: '/customize/images/logo_ngi.png?' + urlArgs,
-                            alt: 'Logo NGI Trust'
+                            alt: 'NGI Award 2019'
                         }),
                         h('img', {
                             src: '/customize/images/logo_nlnet.svg?' + urlArgs,
-                            alt: 'Logo NLNet Foundation'
+                            alt: 'NLNet Foundation logo'
                         }),
                         h('img', {
                             src: '/customize/images/logo_bpifrance.svg?' + urlArgs,
-                            alt: 'Logo BPI France'
+                            alt: 'BPI France logo'
                         }),
                         h('img', {
                             src: '/customize/images/logo_moss.jpg?' + urlArgs,
-                            alt: 'Logo Mozilla Open Source Support'
+                            alt: 'Mozilla Open Source Support logo'
+                        }),
+                        h('img', {
+                            src: '/customize/images/logo_ngi_trust.png?' + urlArgs,
+                            alt: 'NGI Trust logo'
                         }),
                     ]),
                 ]),

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

@@ -60,7 +60,7 @@
 @colortheme_alertify-cancel: @colortheme_modal-bg;
 @colortheme_alertify-cancel-border: #949494;
 
-@colortheme_notification-log: fade(@colortheme_logo-1, 90%);
+@colortheme_notification-log: fade(@colortheme_logo-2, 90%);
 @colortheme_notification-color: #fff;;
 @colortheme_notification-warn: rgba(205, 37, 50, 0.8);
 

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

@@ -94,6 +94,7 @@
                 flex-flow: column;
                 flex: 1;
                 min-width: 0;
+                color: @colortheme_base;
                 .cp-app-contacts-name {
                     white-space: nowrap;
                 }
@@ -113,7 +114,7 @@
             width: 20px;
             text-align: center;
             &:hover {
-                color: darken(@msg-color, 20%);
+                color: @cryptpad_text_col;
             }
         }