mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-13 06:35:08 +01:00
Code Issues Projects Releases Wiki Activity

Clean up leftover from DM conversation view redesign

Browse Source
This commit is contained in:
Thibaut Girka 2020-09-15 17:58:05 +02:00 committed by ThibG
parent afa753a890
commit ae698469d0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/components/status.js
View File

@ -694,7 +694,7 @@ class Status extends ImmutablePureComponent {
collapsed: isCollapsed, collapsed: isCollapsed,
'has-background': isCollapsed && background, 'has-background': isCollapsed && background,
'status__wrapper-reply': !!status.get('in_reply_to_id'), 'status__wrapper-reply': !!status.get('in_reply_to_id'),
read: unread === false, unread,
muted, muted,
}, 'focusable'); }, 'focusable');

6
app/javascript/flavours/glitch/styles/components/status.scss
View File

@ -275,7 +275,7 @@
outline: 0; outline: 0;
background: lighten($ui-base-color, 4%); background: lighten($ui-base-color, 4%);
&.status.status-direct:not(.read) { &.status.status-direct {
background: lighten($ui-base-color, 12%); background: lighten($ui-base-color, 12%);
&.muted { &.muted {
@ -316,7 +316,7 @@
margin-top: 8px; margin-top: 8px;
} }
&.status-direct:not(.read) { &.status-direct {
background: lighten($ui-base-color, 8%); background: lighten($ui-base-color, 8%);
border-bottom-color: lighten($ui-base-color, 12%); border-bottom-color: lighten($ui-base-color, 12%);
} }
@ -399,7 +399,7 @@
&:focus > .status__content:after { &:focus > .status__content:after {
background: linear-gradient(rgba(lighten($ui-base-color, 4%), 0), rgba(lighten($ui-base-color, 4%), 1)); background: linear-gradient(rgba(lighten($ui-base-color, 4%), 0), rgba(lighten($ui-base-color, 4%), 1));
} }
&.status-direct:not(.read)> .status__content:after { &.status-direct > .status__content:after {
background: linear-gradient(rgba(lighten($ui-base-color, 8%), 0), rgba(lighten($ui-base-color, 8%), 1)); background: linear-gradient(rgba(lighten($ui-base-color, 8%), 0), rgba(lighten($ui-base-color, 8%), 1));
} }

4
app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
View File

@ -27,7 +27,7 @@
} }
} }
.status.status-direct:not(.read) { .status.status-direct {
background: darken($ui-base-color, 8%); background: darken($ui-base-color, 8%);
border-bottom-color: darken($ui-base-color, 12%); border-bottom-color: darken($ui-base-color, 12%);
@ -36,7 +36,7 @@
} }
} }
.focusable:focus.status.status-direct:not(.read) { .focusable:focus.status.status-direct {
background: darken($ui-base-color, 4%); background: darken($ui-base-color, 4%);
&.collapsed> .status__content:after { &.collapsed> .status__content:after {