diff --git a/Desktop/html/css/jasp.css b/Desktop/html/css/jasp.css index 0f4c942892..4240ad9a56 100644 --- a/Desktop/html/css/jasp.css +++ b/Desktop/html/css/jasp.css @@ -68,9 +68,31 @@ h6, .h6-toolbar .jasp-menu { } .jasp-display-item-flat { - padding-left: 0; + padding-left: 0.6em; } +.jasp-analysis > .jasp-display-item { + position: relative; +} + +.jasp-analysis > .jasp-display-item:hover::before { + content: ""; + position: absolute; + left: -7px; + top: 50%; + transform: translateY(-50%); + width: 24px; + height: 24px; + background: url("../img/jasp-drag-handle.svg") no-repeat left center; + background-size: contain; + cursor: move; +} + +.jasp-analysis > .jasp-display-item:hover { + box-shadow: -2px 0 0 0 rgba(151, 196, 242, 0.7); +} + + .jasp-table-primitive { padding-left: 0.6em ; } @@ -650,3 +672,12 @@ iframe.ql-video { transform: translateX(0); } } + +#results +.ui-state-highlight, +.ui-widget-content .ui-state-highlight, +.ui-widget-header .ui-state-highlight { + border: 1px solid #97C4F2; + background: #DCF1FB; + color: #97C4F2; +} diff --git a/Desktop/html/img/jasp-drag-handle.svg b/Desktop/html/img/jasp-drag-handle.svg new file mode 100644 index 0000000000..65d13685f5 --- /dev/null +++ b/Desktop/html/img/jasp-drag-handle.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Desktop/html/js/analysis.js b/Desktop/html/js/analysis.js index 7edf5b42ae..3425c3aa30 100644 --- a/Desktop/html/js/analysis.js +++ b/Desktop/html/js/analysis.js @@ -663,6 +663,18 @@ JASPWidgets.AnalysisView = JASPWidgets.View.extend({ if (results.error) this.setHeightErroredAnalysis($innerElement); + this.$el.sortable({ + items: "> .jasp-display-item", + handle: ".jasp-toolbar, .object-body", + cancel: ".ql-container, .ql-editor, .ql-toolbar, .jasp-notes", + revert: true, + tolerance: "pointer", + cursor: "move", + forceHelperSize: true, + forcePlaceholderSize: true, + placeholder: "ui-state-highlight" + }) + return this; },