Merge branch 'staging' into framework

customize.dist/pages.js

@@ -629,6 +629,7 @@ define([
                 }
             }),
             h('div#cp-app-whiteboard-pickers'),
+            h('div#cp-app-whiteboard-media-hidden')
         ];
     };
 

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

@@ -75,6 +75,7 @@
             margin: 10px 0;
             margin-bottom: 20px;
             &>span {
+                height: 48px;
                 padding: 5px;
                 margin: 2px 0;
                 background: rgba(0,0,0,0.1);
@@ -82,6 +83,30 @@
                 .cp-avatar-default, media-tag {
                     margin-right: 5px;
                 }
+                &.cp-userlist-clickable {
+                    cursor: pointer;
+                    &:hover {
+                        background-color: rgba(0,0,0,0.3);
+                    }
+                }
+                .cp-toolbar-userlist-rightcol {
+                    order: 10;
+                    flex: 1;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    display: flex;
+                    flex-flow: column;
+                    .cp-toolbar-userlist-name {
+                        flex: 1;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                    }
+                    .cp-toolbar-userlist-friend {
+                        padding: 0;
+                    }
+                }
             }
         }
         .cp-toolbar-userlist-friend {
@@ -619,30 +644,6 @@
                     }
                     &.cp-avatar {
                         .avatar_main(48px);
-                        &.cp-userlist-clickable {
-                            cursor: pointer;
-                            &:hover {
-                                background-color: rgba(0,0,0,0.3);
-                            }
-                        }
-                        .cp-toolbar-userlist-rightcol {
-                            order: 10;
-                            flex: 1;
-                            overflow: hidden;
-                            text-overflow: ellipsis;
-                            white-space: nowrap;
-                            display: flex;
-                            flex-flow: column;
-                            .cp-toolbar-userlist-name {
-                                flex: 1;
-                                overflow: hidden;
-                                text-overflow: ellipsis;
-                                white-space: nowrap;
-                            }
-                            .cp-toolbar-userlist-friend {
-                                padding: 0;
-                            }
-                        }
                         media-tag {
                             margin: 8px;
                         }

customize.dist/translations/messages.fr.js

@@ -150,7 +150,7 @@ define(function () {
     out.printCSS = "Personnaliser l'apparence (CSS):";
     out.printTransition = "Activer les animations de transition";
 
-    out.filePickerButton = "Intégrer un fichier";
+    out.filePickerButton = "Intégrer un fichier stocké dans CryptDrive";
     out.filePicker_close = "Fermer";
     out.filePicker_description = "Choisissez un fichier de votre CryptDrive pour l'intégrer ou uploadez-en un nouveau";
     out.filePicker_filter = "Filtrez les fichiers par leur nom";
@@ -284,6 +284,7 @@ define(function () {
     out.canvas_saveToDrive = "Sauvegarder cette image en tant que fichier dans CryptDrive";
     out.canvas_currentBrush = "Pinceau actuel";
     out.canvas_chooseColor = "Choisir une couleur";
+    out.canvas_imageEmbed = "Intégrer une image de votre ordinateur";
 
     // Profile
     out.profileButton = "Profil"; // dropdown menu

customize.dist/translations/messages.js

@@ -152,7 +152,7 @@ define(function () {
     out.printCSS = "Custom style rules (CSS):";
     out.printTransition = "Enable transition animations";
 
-    out.filePickerButton = "Embed a file";
+    out.filePickerButton = "Embed a file stored in CryptDrive";
     out.filePicker_close = "Close";
     out.filePicker_description = "Choose a file from your CryptDrive to embed it or upload a new one";
     out.filePicker_filter = "Filter files by name";
@@ -288,6 +288,7 @@ define(function () {
     out.canvas_saveToDrive = "Save this image as a file in your CryptDrive";
     out.canvas_currentBrush = "Current brush";
     out.canvas_chooseColor = "Choose a color";
+    out.canvas_imageEmbed = "Embed an image from your computer";
 
     // Profile
     out.profileButton = "Profile"; // dropdown menu