From 2e87ebe800588fbd9b3aa22f556794faf9d519ab Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 30 Sep 2016 10:46:13 +0100 Subject: [PATCH] Fix editableList sizing on safari --- editor/js/ui/common/editableList.js | 9 ++++----- editor/js/ui/palette-editor.js | 2 +- editor/sass/mixins.scss | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/editor/js/ui/common/editableList.js b/editor/js/ui/common/editableList.js index 54a2ac3fa..230c3d542 100644 --- a/editor/js/ui/common/editableList.js +++ b/editor/js/ui/common/editableList.js @@ -66,12 +66,7 @@ that.addItem({}); }); } - if (this.element.css("position") === "absolute") { - this.element.css("position","static"); - this.topContainer.css("position","absolute"); - this.uiContainer.css("position","absolute"); - ["top","left","bottom","right"].forEach(function(s) { var v = that.element.css(s); if (s!=="auto" && s!=="") { @@ -80,6 +75,10 @@ that.element.css(s,'auto'); } }) + this.element.css("position","static"); + this.topContainer.css("position","absolute"); + this.uiContainer.css("position","absolute"); + } this.uiContainer.addClass("red-ui-editableList-container"); diff --git a/editor/js/ui/palette-editor.js b/editor/js/ui/palette-editor.js index 08320190c..f54ac0eae 100644 --- a/editor/js/ui/palette-editor.js +++ b/editor/js/ui/palette-editor.js @@ -601,7 +601,7 @@ RED.palette.editor = (function() { initInstallTab(); }) - packageList = $('
    ',{id:"palette-module-list", style:"position: absolute;top: 78px;bottom: 0;left: 0;right: 0px;"}).appendTo(installTab).editableList({ + packageList = $('
      ',{style:"position: absolute;top: 78px;bottom: 0;left: 0;right: 0px;"}).appendTo(installTab).editableList({ addButton: false, addItem: function(container,i,object) { if (object.more) { diff --git a/editor/sass/mixins.scss b/editor/sass/mixins.scss index 29a7997a0..4042b111e 100644 --- a/editor/sass/mixins.scss +++ b/editor/sass/mixins.scss @@ -90,7 +90,6 @@ @include workspace-button; color: $workspace-button-toggle-color !important; background:$workspace-button-background-active; - transition: all 0.1s ease-in-out; margin-bottom: 1px; &.selected:not(.disabled) { color: $workspace-button-toggle-color-selected !important;