hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DM being highlighted when it's inside a favourite notification (#3267)

signup-info-prompt
Eugen Rochko 2017-05-24 04:22:46 +02:00 committed by GitHub
parent 1fd18a61bd
commit be83d450eb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/javascript/styles/components.scss
View File

@ -557,10 +557,6 @@
&.status-direct { &.status-direct {
background: lighten($ui-base-color, 8%); background: lighten($ui-base-color, 8%);
.status__display-name strong {
color: $primary-text-color;
}
.icon-button.disabled { .icon-button.disabled {
color: lighten($ui-base-color, 16%); color: lighten($ui-base-color, 16%);
} }
@ -604,6 +600,16 @@
} }
} }
.notification-favourite {
.status.status-direct {
background: transparent;
.icon-button.disabled {
color: lighten($ui-base-color, 13%);
}
}
}
.status__relative-time { .status__relative-time {
color: lighten($ui-base-color, 26%); color: lighten($ui-base-color, 26%);
float: right; float: right;