Remove unnecessary status__info-time div (#3172)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index bd62a1e2896aacf6d600c7431bc02959d14b65d0..9ce43833fdda82cdef8235d4dcf485f50d1d4cb0 100644 (file)
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -100,9 +100,7 @@ class Status extends ImmutablePureComponent {
     return (
       <div className={`status ${this.props.muted ? 'muted' : ''} status-${status.get('visibility')}`}>
         <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>
-          </div>
+          <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a>
 
           <a onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name'>
             <div className='status__avatar'>

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 71453fe0eb30afcecf474f092859eebcda7f7bfe..863f7958ccc4c182c2722b113fddbf07a94473e6 100644 (file)
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -606,6 +606,8 @@
 
 .status__relative-time {
   color: lighten($ui-base-color, 26%);
+  float: right;
+  font-size: 14px;
 }
 
 .status__display-name {
@@ -622,11 +624,6 @@
   font-size: 15px;
 }
 
-.status__info-time {
-  float: right;
-  font-size: 14px;
-}
-
 .status-check-box {
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   display: flex;

diff --git a/app/javascript/styles/rtl.scss b/app/javascript/styles/rtl.scss
index 870376f9103a63d10461e723f58a777360ba7f44..43463bc7dfa379fe4c46ff231c10c98b32ae55b4 100644 (file)
--- a/app/javascript/styles/rtl.scss
+++ b/app/javascript/styles/rtl.scss
@@ -62,7 +62,7 @@ body.rtl {
     left: 0;
   }
 
-  .status__info-time {
+  .status__relative-time {
     float: left;
   }