From ba0ae5ba5936dced94741de3966917135e482254 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 11 Oct 2015 17:28:36 +0100
Subject: [PATCH] various cosmetic fixes based on design feedback

---
 src/skins/vector/css/common.css                  |  6 ++++++
 src/skins/vector/css/molecules/MessageTile.css   |  2 +-
 src/skins/vector/css/molecules/RoomHeader.css    |  5 ++++-
 src/skins/vector/css/organisms/RoomView.css      |  2 --
 src/skins/vector/views/atoms/MessageTimestamp.js | 11 ++++++++++-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css
index 8afba88efb..efe57cd3d7 100644
--- a/src/skins/vector/css/common.css
+++ b/src/skins/vector/css/common.css
@@ -34,6 +34,12 @@ h2 {
     margin-bottom: 16px;
 }
 
+a:hover,
+a:link,
+a:visited {
+    color: #80CEF4;
+}
+
 .mx_ContextualMenu_background {
     position: fixed;
     top: 0;
diff --git a/src/skins/vector/css/molecules/MessageTile.css b/src/skins/vector/css/molecules/MessageTile.css
index 50a12c3a59..c50f4abc7d 100644
--- a/src/skins/vector/css/molecules/MessageTile.css
+++ b/src/skins/vector/css/molecules/MessageTile.css
@@ -72,7 +72,7 @@ limitations under the License.
 }
 
 .mx_MessageTile_highlight {
-    color: #00f;
+    color: #FF0064;
 }
 
 .mx_MessageTile_msgOption {
diff --git a/src/skins/vector/css/molecules/RoomHeader.css b/src/skins/vector/css/molecules/RoomHeader.css
index c0c8567dd6..4f09275daa 100644
--- a/src/skins/vector/css/molecules/RoomHeader.css
+++ b/src/skins/vector/css/molecules/RoomHeader.css
@@ -116,13 +116,16 @@ limitations under the License.
     margin-top: -5px;
 }
 
-.mx_RoomHeader_nameInput {
+.mx_RoomHeader_name input, .mx_RoomHeader_nameInput {
     border-radius: 3px;
     width: 260px;
     border: 1px solid #c7c7c7;
     font-weight: 300;
     font-size: 14px;
     padding: 9px;
+}
+
+.mx_RoomHeader_nameInput {
     margin-top: 6px;
 }
 
diff --git a/src/skins/vector/css/organisms/RoomView.css b/src/skins/vector/css/organisms/RoomView.css
index babc5fe9a9..df1b46b827 100644
--- a/src/skins/vector/css/organisms/RoomView.css
+++ b/src/skins/vector/css/organisms/RoomView.css
@@ -106,8 +106,6 @@ limitations under the License.
     flex: 1 1 0;
 
     width: 100%;
-    margin-top: 18px;
-    margin-bottom: 18px;
 
     overflow-y: auto;
 }
diff --git a/src/skins/vector/views/atoms/MessageTimestamp.js b/src/skins/vector/views/atoms/MessageTimestamp.js
index ef866afa5e..e9b7bd1342 100644
--- a/src/skins/vector/views/atoms/MessageTimestamp.js
+++ b/src/skins/vector/views/atoms/MessageTimestamp.js
@@ -24,11 +24,20 @@ module.exports = React.createClass({
     displayName: 'MessageTimestamp',
     mixins: [MessageTimestampController],
 
+    formatDate: function(date) {
+        // date.toLocaleTimeString is completely system dependent.
+        // just go 24h for now
+        function pad(n) {
+            return (n < 10 ? '0' : '') + n;
+        }
+        return pad(date.getHours()) + ':' + pad(date.getMinutes());
+    },
+
     render: function() {
         var date = new Date(this.props.ts);
         return (
             <span className="mx_MessageTimestamp">
-                {date.toLocaleTimeString()}
+                { this.formatDate(date) }
             </span>
         );
     },