monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #398 from ashkitten/compressed-notifs 

make expanded notifications show like default
This commit is contained in:
David Yip 2018-03-23 11:57:12 -05:00 committed by GitHub
parent 03b2f701e7 58eeb92755
commit 1772034ef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -403,7 +403,7 @@ export default class Status extends ImmutablePureComponent {
notificationId={this.props.notificationId} notificationId={this.props.notificationId}
/> />
) : null} ) : null}
{!muted ? ( {!muted || isExpanded !== false ? (
<StatusHeader <StatusHeader
status={status} status={status}
friend={account} friend={account}
@ -429,7 +429,7 @@ export default class Status extends ImmutablePureComponent {
parseClick={parseClick} parseClick={parseClick}
disabled={!router} disabled={!router}
/> />
{isExpanded !== false && !muted ? ( {isExpanded !== false || !muted ? (
<StatusActionBar <StatusActionBar
{...other} {...other}
status={status} status={status}

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

@ -154,7 +154,6 @@
padding: 8px 10px; padding: 8px 10px;
position: relative; position: relative;
height: auto; height: auto;
min-height: 48px;
border-bottom: 1px solid lighten($ui-base-color, 8%); border-bottom: 1px solid lighten($ui-base-color, 8%);
cursor: default; cursor: default;
@ -245,11 +244,21 @@
height: 20px; height: 20px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
margin: 0;
padding-top: 0;
a:hover { a:hover {
text-decoration: none; text-decoration: none;
} }
} }
.notification__message {
margin-bottom: 0;
}
.status__info .notification__message > span {
white-space: nowrap;
}
} }
.notification__message { .notification__message {
@ -293,19 +302,23 @@
.status__info { .status__info {
display: flex; display: flex;
padding: 2px 0 5px;
font-size: 15px; font-size: 15px;
line-height: 24px;
> span { > span {
text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
} }
.notification__message > span {
word-wrap: break-word;
}
} }
.status__info__icons { .status__info__icons {
margin-left: auto; margin-left: auto;
display: flex; display: flex;
align-items: baseline; align-items: center;
height: 1em;
color: lighten($ui-base-color, 26%); color: lighten($ui-base-color, 26%);
.status__visibility-icon { .status__visibility-icon {
@ -542,12 +555,6 @@
text-decoration: none; text-decoration: none;
} }
} }
.status__content {
margin-top: -15px;
margin-bottom: 0;
padding-top: 0;
}
} }
.status__relative-time, .status__relative-time,