From d5431a942fca425084870b84efd561a057c3009d Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Wed, 12 Oct 2016 10:52:34 +0900
Subject: [PATCH] Simplify and correct message metadata alignment

Match left/right adjustment on Android.
Incoming to the left, outgoing to the right.
---
 stylesheets/_conversation.scss |  6 ++++--
 stylesheets/_ios.scss          |  6 ------
 stylesheets/manifest.css       | 13 ++++++-------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 59c4cf81..4571435e 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -337,7 +337,6 @@ li.entry .error-icon-container {
   .meta {
     font-size: smaller;
     margin-top: 3px;
-    float: right;
     text-align: right;
     line-height: 18px;
 
@@ -356,7 +355,7 @@ li.entry .error-icon-container {
       cursor: pointer;
     }
 
-    .hasRetry, .timestamp, .status {
+    .hasRetry, .timestamp, .status, .timer {
       float: left;
     }
 
@@ -395,6 +394,9 @@ li.entry .error-icon-container {
   }
 
   .outgoing {
+    .meta {
+      float: right;
+    }
     .error-icon-container {
       left: auto;
       right: calc(100% + 5px);
diff --git a/stylesheets/_ios.scss b/stylesheets/_ios.scss
index 1176811c..413d2063 100644
--- a/stylesheets/_ios.scss
+++ b/stylesheets/_ios.scss
@@ -146,12 +146,6 @@ $ios-border-color: rgba(0,0,0,0.1);
       }
       float: right;
     }
-    .timestamp {
-      float: none;
-    }
-    .status {
-      float: right;
-    }
   }
   .attachment {
     a {
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index 45ab77a1..d7af2660 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -1175,7 +1175,6 @@ li.entry .error-icon-container {
   .message-list .meta {
     font-size: smaller;
     margin-top: 3px;
-    float: right;
     text-align: right;
     line-height: 18px; }
     .message-container .meta .hasRetry + .timestamp:before,
@@ -1189,10 +1188,11 @@ li.entry .error-icon-container {
     .message-list .meta .retry {
       text-decoration: underline;
       cursor: pointer; }
-    .message-container .meta .hasRetry, .message-container .meta .timestamp, .message-container .meta .status,
+    .message-container .meta .hasRetry, .message-container .meta .timestamp, .message-container .meta .status, .message-container .meta .timer,
     .message-list .meta .hasRetry,
     .message-list .meta .timestamp,
-    .message-list .meta .status {
+    .message-list .meta .status,
+    .message-list .meta .timer {
       float: left; }
     .message-container .meta .timestamp, .message-container .meta .status,
     .message-list .meta .timestamp,
@@ -1230,6 +1230,9 @@ li.entry .error-icon-container {
   .message-list .incoming .avatar,
   .message-list .incoming .bubble {
     float: left; }
+  .message-container .outgoing .meta,
+  .message-list .outgoing .meta {
+    float: right; }
   .message-container .outgoing .error-icon-container,
   .message-list .outgoing .error-icon-container {
     left: auto;
@@ -1515,10 +1518,6 @@ li.entry .error-icon-container {
     .ios .outgoing .content::selection, .ios .outgoing .content .body::selection, .ios .outgoing .content a::selection {
       background: white;
       color: #454545; }
-.ios .outgoing .timestamp {
-  float: none; }
-.ios .outgoing .status {
-  float: right; }
 .ios .attachment {
   margin-bottom: 1px; }
   .ios .attachment a {