From ad79c86c1f759d30466c0ba25d86eb6068a50c9d Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <blakcap@users.noreply.github.com>
Date: Tue, 14 Mar 2017 13:54:27 +0100
Subject: [PATCH] fixed drag, nicer-sized rm exp from group btn
---
beat/web/reports/static/reports/app/directives/edit/layout.js | 2 +-
.../reports/static/reports/app/directives/edit/panelContent.js | 2 +-
.../static/reports/app/directives/edit/panelExperiments.js | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/beat/web/reports/static/reports/app/directives/edit/layout.js b/beat/web/reports/static/reports/app/directives/edit/layout.js
index 015cd3261..ad31140e5 100644
--- a/beat/web/reports/static/reports/app/directives/edit/layout.js
+++ b/beat/web/reports/static/reports/app/directives/edit/layout.js
@@ -35,7 +35,7 @@ angular.module('reportApp').directive("groupsLayout", ['GroupsService', function
scope.groups = GroupsService.groups;
scope.GroupsService = GroupsService;
scope.sortableOptions = {
- handle: '> .panel-heading > .panel-title > .drag-handle'
+ handle: '.panel-heading > .panel-title > .action-buttons > .drag-handle'
};
},
template: `
diff --git a/beat/web/reports/static/reports/app/directives/edit/panelContent.js b/beat/web/reports/static/reports/app/directives/edit/panelContent.js
index 589c2c6fd..023b6f778 100644
--- a/beat/web/reports/static/reports/app/directives/edit/panelContent.js
+++ b/beat/web/reports/static/reports/app/directives/edit/panelContent.js
@@ -76,7 +76,7 @@ angular.module('reportApp').directive("groupPanelContent", ['GroupsService', fun
</span>
<span
class='btn btn-default drag-handle'
- data-toggle='tooltip' data-placement='top' title='Drag to re-order groups'>
+ data-toggle='tooltip' data-placement='top' title='Drag to re-order group'>
<i class='fa fa-arrows fa-lg'></i>
</span>
</div>
diff --git a/beat/web/reports/static/reports/app/directives/edit/panelExperiments.js b/beat/web/reports/static/reports/app/directives/edit/panelExperiments.js
index 7bd0d7702..a91c9e050 100644
--- a/beat/web/reports/static/reports/app/directives/edit/panelExperiments.js
+++ b/beat/web/reports/static/reports/app/directives/edit/panelExperiments.js
@@ -103,8 +103,9 @@ angular.module('reportApp').directive("groupPanelExperiments", ['GroupsService',
<td>
<div class='btn-group action-buttons'>
<span
+ style='cursor: pointer;'
ng-click='group.removeExperiment(expName)'
- class="btn btn-default btn-delete"
+ class="btn-delete"
data-toggle="tooltip" data-placement="top" title="Remove Experiment from Group">
<i class="fa fa-times fa-lg"></i>
</span>
--
GitLab