Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

grey out disabled badges in admin overview (#5416) 

* gray out disabled badges in admin overview

* fix style
This commit is contained in:
Maja Komel 2017-12-27 06:57:21 +01:00 committed by Sam
parent cc46ab5bb1
commit 2a32536645
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/badge-button.js.es6
View File

@ -1,6 +1,6 @@
export default Ember.Component.extend({ export default Ember.Component.extend({
tagName: 'span', tagName: 'span',
classNameBindings: [':user-badge', 'badge.badgeTypeClassName'], classNameBindings: [':user-badge', 'badge.badgeTypeClassName', 'badge.enabled::disabled'],
title: function(){ title: function(){
return $("<div>"+this.get('badge.description')+"</div>").text(); return $("<div>"+this.get('badge.description')+"</div>").text();
}.property('badge.description'), }.property('badge.description'),

8
app/assets/stylesheets/common/base/user-badges.scss
View File

@ -30,6 +30,14 @@
&.badge-type-bronze .fa { &.badge-type-bronze .fa {
color: #cd7f32 !important; color: #cd7f32 !important;
} }
&.disabled {
color: $primary-medium;
background-color: $primary-very-low;
.fa {
opacity: 0.4;
}
}
} }
@media all and (max-width: 750px) { @media all and (max-width: 750px) {