wait #5886 @0.75

diff --git a/resources/linkeditor/js/linkeditor.panels.js b/resources/linkeditor/js/linkeditor.panels.js
index ec8aaabb856cb8e592ccf3085617f3b9890e0350..db324a7ddfe3dad1e60379b8c98a7e92c398f401 100644 (file)
--- a/resources/linkeditor/js/linkeditor.panels.js
+++ b/resources/linkeditor/js/linkeditor.panels.js
@@ -16,6 +16,7 @@ LinkeditorPanels.prototype = {
             var panelsContainer = $("#linkeditor-" + side + '-panel');
             panelsContainer.data('width', $this.normalizeWidth($this.linkeditor.settings.get(side + '_width', $this.defaultWidth)));
 
+
             $.each(panels, function (k, panel) {
                 $("#linkeditor-" + side + " nav").append($("#linkeditor-icon-" + panel));
                 if ($('#linkeditor-panel-' + panel).length > 0) {
@@ -24,8 +25,11 @@ LinkeditorPanels.prototype = {
                     panelsContainer.append('<div id="linkeditor-panel-' + panel + '"></div>');
                 }
                 $('#linkeditor-panel-' + panel).attr('data-panel', panel).addClass('linkeditor-panel');
+
             });
 
+            $('#linkeditor-' + side + ' nav a').attr('draggable', false);
+
             var tool = $this.linkeditor.settings.get(side + '_tool', panels[0]);
             var open = $this.linkeditor.settings.get(side + '_open', side === 'right');
 
@@ -43,6 +47,7 @@ LinkeditorPanels.prototype = {
             return false;
         });
 
+
     },
 
     moveHandle: function () {

diff --git a/resources/linkeditor/js/linkeditor.toolbar.js b/resources/linkeditor/js/linkeditor.toolbar.js
index c4e2b9bba315418e7570c84146d8f12873517762..1b95af6754b765fefce32bce00334e2de0a5aeaa 100644 (file)
--- a/resources/linkeditor/js/linkeditor.toolbar.js
+++ b/resources/linkeditor/js/linkeditor.toolbar.js
@@ -54,6 +54,8 @@ LinkeditorToolbar.prototype = {
         })
 
         this.linkeditor.initTooltips();
+
+        $('#linkeditor-toolbar a').attr('draggable', false);
     },
 
     submitFormAndReload: function (form) {

diff --git a/resources/linkeditor/js/linkeditor.versions.js b/resources/linkeditor/js/linkeditor.versions.js
index d0b0696ebcf0ba156f1adeaa4063add58ac81ac4..762d12350faef427eb90f0948e6f9c19094f7703 100644 (file)
--- a/resources/linkeditor/js/linkeditor.versions.js
+++ b/resources/linkeditor/js/linkeditor.versions.js
@@ -34,8 +34,8 @@ LinkeditorVersions.prototype = {
             item += '<div class="rulers"><b>' + version.rulers + '</b> rulers</div>';
             item += '</div>'
             item += '<div class="col3">';
-            item += '<div class="actions"><a nohref data-action="versions.restoreVersion" data-action-args="' + actionArgs + '" data-icon="wayback-machine" data-tooltip="'+TRANSLATIONS.restore_version_tooltip+'"></a>' +
-                '<a download="links_' + FLUIDBOOK_DATA.id + '_' + version.timestamp + '.xlsx" href="/fluidbook-publication/' + FLUIDBOOK_DATA.id + '/edit/links/versions/export/' + version.timestamp + '" data-icon="export-links" data-tooltip="'+TRANSLATIONS.export_version_tooltip+'"></a></div>';
+            item += '<div class="actions"><a nohref data-action="versions.restoreVersion" data-action-args="' + actionArgs + '" data-icon="wayback-machine" data-tooltip="' + TRANSLATIONS.restore_version_tooltip + '" draggable="false"></a>' +
+                '<a download="links_' + FLUIDBOOK_DATA.id + '_' + version.timestamp + '.xlsx" href="/fluidbook-publication/' + FLUIDBOOK_DATA.id + '/edit/links/versions/export/' + version.timestamp + '" data-icon="export-links" data-tooltip="' + TRANSLATIONS.export_version_tooltip + '" draggable="false"></a></div>';
             item += '</div>'
             item += '</div>'
             list.append(item);

diff --git a/resources/linkeditor/style/inc/_toolbar.sass b/resources/linkeditor/style/inc/_toolbar.sass
index 3c7d4f6862f41e9bd0094721258e7439f8f5a154..e017ce1ec831aad021111b49e81686797f04ebb7 100644 (file)
--- a/resources/linkeditor/style/inc/_toolbar.sass
+++ b/resources/linkeditor/style/inc/_toolbar.sass
@@ -62,10 +62,8 @@
         border-radius: 5px
         cursor: text
         font-size: 13px
-        position: relative
-        top: -7px
         user-select: none
-        margin: 0 8px
+        margin: 2px 8px
         font-weight: 600
 
         input