diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css index 8afba88e..efe57cd3 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 50a12c3a..c50f4abc 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 c0c8567d..4f09275d 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 babc5fe9..df1b46b8 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 ef866afa..e9b7bd13 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 ( - {date.toLocaleTimeString()} + { this.formatDate(date) } ); },