From c8ffa9b1d58daec07264d0b83d3c939929cdec23 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 3 May 2023 16:13:37 +0200 Subject: [PATCH] wait #5886 @0.75 --- resources/linkeditor/js/linkeditor.panels.js | 5 +++++ resources/linkeditor/js/linkeditor.toolbar.js | 2 ++ resources/linkeditor/js/linkeditor.versions.js | 4 ++-- resources/linkeditor/style/inc/_toolbar.sass | 4 +--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/resources/linkeditor/js/linkeditor.panels.js b/resources/linkeditor/js/linkeditor.panels.js index ec8aaabb8..db324a7dd 100644 --- 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('
'); } $('#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 c4e2b9bba..1b95af675 100644 --- 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 d0b0696eb..762d12350 100644 --- a/resources/linkeditor/js/linkeditor.versions.js +++ b/resources/linkeditor/js/linkeditor.versions.js @@ -34,8 +34,8 @@ LinkeditorVersions.prototype = { item += '
' + version.rulers + ' rulers
'; item += '' item += '
'; - item += '
' + - '
'; + item += '
' + + '
'; item += '
' item += '' list.append(item); diff --git a/resources/linkeditor/style/inc/_toolbar.sass b/resources/linkeditor/style/inc/_toolbar.sass index 3c7d4f686..e017ce1ec 100644 --- 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 -- 2.39.5