From 5150025641d5a91d1986d660be3dc67bf1e1a893 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Tue, 10 Jan 2017 22:54:22 +0000 Subject: [PATCH] Updated tag rules UI --- .../tag_rules_controller.js.coffee | 2 +- .../admin/enterprise_index_panels.css.scss | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/tag_rules/controllers/tag_rules_controller.js.coffee b/app/assets/javascripts/admin/tag_rules/controllers/tag_rules_controller.js.coffee index 460d8565eb..6fe83c49e9 100644 --- a/app/assets/javascripts/admin/tag_rules/controllers/tag_rules_controller.js.coffee +++ b/app/assets/javascripts/admin/tag_rules/controllers/tag_rules_controller.js.coffee @@ -38,7 +38,6 @@ angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, $fil newRule.peferred_exchange_tags = [] newRule.preferred_matched_order_cycles_visibility = "visible" tagGroup.rules.push(newRule) - $scope.enterprise_form.$setDirty() $scope.updateRuleCounts() $scope.addNewTag = -> @@ -58,3 +57,4 @@ angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, $fil .success -> tagGroup.rules.splice(index, 1) $scope.updateRuleCounts() + $scope.enterprise_form.$setDirty() \ No newline at end of file diff --git a/app/assets/stylesheets/admin/enterprise_index_panels.css.scss b/app/assets/stylesheets/admin/enterprise_index_panels.css.scss index 2ce2916497..92a1d10048 100644 --- a/app/assets/stylesheets/admin/enterprise_index_panels.css.scss +++ b/app/assets/stylesheets/admin/enterprise_index_panels.css.scss @@ -111,3 +111,27 @@ } } } + +tags-input .tags li.tag-item { + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + -ms-border-radius: 3px; + -o-border-radius: 3px; + border-radius: 3px; + margin: 2px 0 2px 3px; + background-image: none; + background-color: #5fa5e8; + border: none; + box-shadow: none; + color: white !important; + font-size: 85%; + height: 25px; +} + +tags-input .tags .tag-item .remove-button { + color: white; +} + +table th.actions .no-text[class*="icon-"], table td.actions .no-text[class*="icon-"] { + cursor: pointer; +} \ No newline at end of file