aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2016-07-14 15:10:54 +0200
committerStas Vilchik <vilchiks@gmail.com>2016-07-14 15:10:54 +0200
commit0f784137ae0476d6a948a1de39d459286717f011 (patch)
treeca21b7fa17b2852dcc5d9095147ae0ddb57fab76 /server
parent8752626b0cef622e664028711db6b4021daa6372 (diff)
downloadsonarqube-0f784137ae0476d6a948a1de39d459286717f011.tar.gz
sonarqube-0f784137ae0476d6a948a1de39d459286717f011.zip
SONAR-7795 Clearly display if a rule definition was overridden in a profile
Diffstat (limited to 'server')
-rw-r--r--server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list-item.hbs2
-rw-r--r--server/sonar-web/src/main/less/init/icons.less3
2 files changed, 4 insertions, 1 deletions
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list-item.hbs b/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list-item.hbs
index 2948ec2b374..be7aa781008 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list-item.hbs
+++ b/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list-item.hbs
@@ -4,7 +4,7 @@
<td class="coding-rule-table-meta-cell coding-rule-activation">
{{severityIcon activation.severity}}
{{#eq activation.inherit 'OVERRIDES'}}
- <i class="icon-inheritance"
+ <i class="icon-inheritance icon-inheritance-overridden"
title="{{tp 'coding_rules.overrides' activation.profile.name activation.parentProfile.name}}"></i>
{{/eq}}
{{#eq activation.inherit 'INHERITED'}}
diff --git a/server/sonar-web/src/main/less/init/icons.less b/server/sonar-web/src/main/less/init/icons.less
index 190fcba48c2..86dc018eeda 100644
--- a/server/sonar-web/src/main/less/init/icons.less
+++ b/server/sonar-web/src/main/less/init/icons.less
@@ -411,6 +411,9 @@ a[class^="icon-"], a[class*=" icon-"] {
content: "\f126";
font-size: @iconSmallFontSize;
}
+.icon-inheritance-overridden:before {
+ color: @red !important;
+}
.icon-plus:before {
content: "\f067";
font-size: @iconSmallFontSize;