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

Remove unnecessary status__info-time div (#3172)

pull/3175/head
Nolan Lawson 2017-05-20 07:48:49 -07:00 committed by Eugen Rochko
parent f554807563
commit 419226d1f6
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/components/status.js
View File

@ -100,9 +100,7 @@ class Status extends ImmutablePureComponent {
return ( return (
<div className={`status ${this.props.muted ? 'muted' : ''} status-${status.get('visibility')}`}> <div className={`status ${this.props.muted ? 'muted' : ''} status-${status.get('visibility')}`}>
<div className='status__info'> <div className='status__info'>
<div className='status__info-time'> <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a>
<a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a>
</div>
<a onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name'> <a onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name'>
<div className='status__avatar'> <div className='status__avatar'>

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

@ -606,6 +606,8 @@
.status__relative-time { .status__relative-time {
color: lighten($ui-base-color, 26%); color: lighten($ui-base-color, 26%);
float: right;
font-size: 14px;
} }
.status__display-name { .status__display-name {
@ -622,11 +624,6 @@
font-size: 15px; font-size: 15px;
} }
.status__info-time {
float: right;
font-size: 14px;
}
.status-check-box { .status-check-box {
border-bottom: 1px solid lighten($ui-base-color, 8%); border-bottom: 1px solid lighten($ui-base-color, 8%);
display: flex; display: flex;

2
app/javascript/styles/rtl.scss
View File

@ -62,7 +62,7 @@ body.rtl {
left: 0; left: 0;
} }
.status__info-time { .status__relative-time {
float: left; float: left;
} }