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

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

@@ -175,6 +175,7 @@
             background-color: lighten(@bg-color, 20%);
             display: none;
             button {
+                height: @toolbar_line-height !important;
                 outline: 0;
                 color: @color;
                 .toolbar_button;

www/profile/app-profile.less

@@ -125,7 +125,7 @@
         }
         .cp-app-profile-description-ok, .cp-app-profile-description-spin {
             position: absolute;
-            top: 2px;
+            bottom: 2px;
             right: 2px;
             display: none;
             z-index: 1000;

www/profile/inner.js

@@ -100,7 +100,6 @@ define([
                 'id': name+'Input',
                 placeholder: ph
             }).val(value);
-            var $icon = $('<span>', {'class': 'fa fa-pencil cp-app-profile-input-edit'});
             var editing = false;
             var todo = function () {
                 if (editing) { return; }
@@ -126,12 +125,11 @@ define([
                     $input.val(lastVal);
                 }
             });
-            $icon.click(function () { $input.focus(); });
             $input.focus(function () {
                 $input.width('');
             });
             $input.focusout(todo);
-            $block.append($input).append($icon);
+            $block.append($input);
         });
     };
 
@@ -354,6 +352,7 @@ define([
         var $spinner = $('<span>', {
             'class': 'cp-app-profile-description-spin fa fa-spinner fa-pulse'
         }).appendTo($block);
+
         var $textarea = $('<textarea>').val(APP.lm.proxy.description || '');
         $block.append($textarea);
         var editor = APP.editor = CodeMirror.fromTextArea($textarea[0], {
@@ -363,6 +362,9 @@ define([
             mode: "markdown",
         });
 
+        var markdownTb = common.createMarkdownToolbar(editor);
+        $block.prepend(markdownTb.toolbar);
+
         var onLocal = function () {
             $ok.hide();
             $spinner.show();