various cosmetic fixes based on design feedback
This commit is contained in:
parent
9a8a9a4ce4
commit
ba0ae5ba59
|
@ -34,6 +34,12 @@ h2 {
|
|||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
a:hover,
|
||||
a:link,
|
||||
a:visited {
|
||||
color: #80CEF4;
|
||||
}
|
||||
|
||||
.mx_ContextualMenu_background {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
|
|
|
@ -72,7 +72,7 @@ limitations under the License.
|
|||
}
|
||||
|
||||
.mx_MessageTile_highlight {
|
||||
color: #00f;
|
||||
color: #FF0064;
|
||||
}
|
||||
|
||||
.mx_MessageTile_msgOption {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -106,8 +106,6 @@ limitations under the License.
|
|||
flex: 1 1 0;
|
||||
|
||||
width: 100%;
|
||||
margin-top: 18px;
|
||||
margin-bottom: 18px;
|
||||
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
);
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue