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

added new glyphs and removed regular glyph from list

This commit is contained in:
Catrin 2014-05-07 11:49:59 +02:00 committed by Neil Lalonde
parent d1cc91520f
commit 71a7ce1fee
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/views/buttons/category_notifications_button.js
View File

@ -12,10 +12,10 @@ Discourse.CategoryNotificationsButton = Discourse.View.extend({
hidden: Em.computed.alias('category.deleted'), hidden: Em.computed.alias('category.deleted'),
templateName: 'category_notification_dropdown', templateName: 'category_notification_dropdown',
watchingClasses: 'fa fa-circle heatmap-high', watchingClasses: 'fa fa-exclamation-circle watching',
trackingClasses: 'fa fa-circle heatmap-low', trackingClasses: 'fa fa-circle tracking',
mutedClasses: 'fa fa-times-circle', mutedClasses: 'fa fa-times-circle muted',
regularClasses: 'fa fa-circle-o', regularClasses: 'fa fa-circle-o regular',
@ -30,7 +30,7 @@ Discourse.CategoryNotificationsButton = Discourse.View.extend({
_.each([ _.each([
['WATCHING', 'watching', this.watchingClasses], ['WATCHING', 'watching', this.watchingClasses],
['TRACKING', 'tracking', this.trackingClasses], ['TRACKING', 'tracking', this.trackingClasses],
['REGULAR', 'regular', this.regularClasses], ['REGULAR', 'regular', ''],
['MUTED', 'muted', this.mutedClasses] ['MUTED', 'muted', this.mutedClasses]
], function(pair) { ], function(pair) {

12
app/assets/stylesheets/desktop/category-notification.scss
View File

@ -10,9 +10,9 @@
padding: 4px 0; padding: 4px 0;
margin: 32px 560px; margin: 32px 560px;
list-style: none; list-style: none;
background-color: $primary_background_color; background-color: $secondary;
border: 1px solid $primary_border_color; border: 1px solid $primary;
box-shadow: 0 1px 5px rgba($primary_shadow_color, .4); box-shadow: 0 1px 5px rgba($primary, .4);
background-clip: padding-box; background-clip: padding-box;
span {font-size: 12px;} span {font-size: 12px;}
.title {font-weight: bold; display: block; font-size: 14px;} .title {font-weight: bold; display: block; font-size: 14px;}
@ -23,15 +23,15 @@
clear: both; clear: both;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
color: $primary_text_color; color: $primary;
} }
} }
.notification-dropdown-menu li > a:hover, .notification-dropdown-menu li > a:hover,
.notification-dropdown-menu .active > a, .notification-dropdown-menu .active > a,
.notification-dropdown-menu .active > a:hover { .notification-dropdown-menu .active > a:hover {
color: $tertiary_text_color; color: $secondary;
text-decoration: none; text-decoration: none;
background-color: $emphasis_text_color; background-color: scale-color($tertiary, $lightness: 50%);
} }
.open > .notification-dropdown-menu { .open > .notification-dropdown-menu {
display: block; display: block;