From 4d14ac1a5f8f6aa213731d34bb8d94b318ae33fb Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Tue, 28 Jun 2016 11:59:06 -0400 Subject: [PATCH] restyle read-only labels, apply read-only label styles when user cannot edit job template --- .../client/src/job-templates/labels/labelsList.block.less | 6 ++++-- .../client/src/job-templates/labels/labelsList.partial.html | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/src/job-templates/labels/labelsList.block.less b/awx/ui/client/src/job-templates/labels/labelsList.block.less index fe9a1b9efb..d851bd545e 100644 --- a/awx/ui/client/src/job-templates/labels/labelsList.block.less +++ b/awx/ui/client/src/job-templates/labels/labelsList.block.less @@ -18,8 +18,8 @@ padding: 2px 10px; margin: 4px 0px; font-size: 12px; - color: @default-bg; - background-color: @default-link; + color: @default-interface-txt; + background-color: @default-list-header-bg; margin-right: 5px; max-width: 100%; white-space: nowrap; @@ -42,6 +42,8 @@ } .LabelList-tag--deletable { + color: @default-bg; + background-color: @default-link; margin-right: 0px; border-top-left-radius: 0px; border-bottom-left-radius: 0px; diff --git a/awx/ui/client/src/job-templates/labels/labelsList.partial.html b/awx/ui/client/src/job-templates/labels/labelsList.partial.html index 325567c656..0bcc5f795a 100644 --- a/awx/ui/client/src/job-templates/labels/labelsList.partial.html +++ b/awx/ui/client/src/job-templates/labels/labelsList.partial.html @@ -1,10 +1,10 @@
+ ng-show="showDelete && job_template.summary_fields.can_edit">
-
+
{{ label.name }}