various cosmetic fixes based on design feedback

This commit is contained in:
Matthew Hodgson 2015-10-11 17:28:36 +01:00
parent 9a8a9a4ce4
commit ba0ae5ba59
5 changed files with 21 additions and 5 deletions

View File

@ -34,6 +34,12 @@ h2 {
margin-bottom: 16px; margin-bottom: 16px;
} }
a:hover,
a:link,
a:visited {
color: #80CEF4;
}
.mx_ContextualMenu_background { .mx_ContextualMenu_background {
position: fixed; position: fixed;
top: 0; top: 0;

View File

@ -72,7 +72,7 @@ limitations under the License.
} }
.mx_MessageTile_highlight { .mx_MessageTile_highlight {
color: #00f; color: #FF0064;
} }
.mx_MessageTile_msgOption { .mx_MessageTile_msgOption {

View File

@ -116,13 +116,16 @@ limitations under the License.
margin-top: -5px; margin-top: -5px;
} }
.mx_RoomHeader_nameInput { .mx_RoomHeader_name input, .mx_RoomHeader_nameInput {
border-radius: 3px; border-radius: 3px;
width: 260px; width: 260px;
border: 1px solid #c7c7c7; border: 1px solid #c7c7c7;
font-weight: 300; font-weight: 300;
font-size: 14px; font-size: 14px;
padding: 9px; padding: 9px;
}
.mx_RoomHeader_nameInput {
margin-top: 6px; margin-top: 6px;
} }

View File

@ -106,8 +106,6 @@ limitations under the License.
flex: 1 1 0; flex: 1 1 0;
width: 100%; width: 100%;
margin-top: 18px;
margin-bottom: 18px;
overflow-y: auto; overflow-y: auto;
} }

View File

@ -24,11 +24,20 @@ module.exports = React.createClass({
displayName: 'MessageTimestamp', displayName: 'MessageTimestamp',
mixins: [MessageTimestampController], 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() { render: function() {
var date = new Date(this.props.ts); var date = new Date(this.props.ts);
return ( return (
<span className="mx_MessageTimestamp"> <span className="mx_MessageTimestamp">
{date.toLocaleTimeString()} { this.formatDate(date) }
</span> </span>
); );
}, },