From 419226d1f6ceb59958b15a56c1109750b1cb9860 Mon Sep 17 00:00:00 2001 From: Nolan Lawson 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 bd62a1e289..9ce43833fd 100644 --- a/app/javascript/mastodon/components/status.js +++ b/app/javascript/mastodon/components/status.js @@ -100,9 +100,7 @@ class Status extends ImmutablePureComponent { return (
-
- -
+
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss index 71453fe0eb..863f7958cc 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 870376f910..43463bc7df 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; }