From 419226d1f6ceb59958b15a56c1109750b1cb9860 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sat, 20 May 2017 07:48:49 -0700
Subject: [PATCH] Remove unnecessary status__info-time div (#3172)

---
 app/javascript/mastodon/components/status.js | 4 +---
 app/javascript/styles/components.scss        | 7 ++-----
 app/javascript/styles/rtl.scss               | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index bd62a1e28..9ce43833f 100644
--- 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 71453fe0e..863f7958c 100644
--- 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 870376f91..43463bc7d 100644
--- 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;
   }