From aa70dd7b6706dca695242cd22197d68925862456 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 17 Jul 2015 19:09:17 +0100 Subject: [PATCH] alt tags for avatars; improve header spacing; improve roomview margin --- skins/base/css/molecules/RoomHeader.css | 6 ++++-- skins/base/css/organisms/RoomView.css | 5 ++--- skins/base/css/pages/MatrixChat.css | 4 +++- skins/base/views/molecules/MRoomMemberTile.js | 2 +- skins/base/views/molecules/MemberTile.js | 2 +- skins/base/views/molecules/MessageComposer.js | 2 +- skins/base/views/molecules/MessageTile.js | 2 +- skins/base/views/molecules/RoomHeader.js | 2 +- skins/base/views/molecules/RoomTile.js | 2 +- skins/base/views/molecules/voip/MCallAnswerTile.js | 2 +- skins/base/views/molecules/voip/MCallHangupTile.js | 2 +- skins/base/views/molecules/voip/MCallInviteTile.js | 2 +- skins/base/views/pages/MatrixChat.js | 2 +- 13 files changed, 19 insertions(+), 16 deletions(-) diff --git a/skins/base/css/molecules/RoomHeader.css b/skins/base/css/molecules/RoomHeader.css index 4bfa7180f..687844f10 100644 --- a/skins/base/css/molecules/RoomHeader.css +++ b/skins/base/css/molecules/RoomHeader.css @@ -20,8 +20,8 @@ limitations under the License. .mx_RoomHeader_wrapper { max-width: 720px; margin: auto; - height: 86px; - margin-top: 18px; + height: 88px; + border-bottom: 1px solid #a8dbf3; display: -webkit-box; display: -moz-box; @@ -32,6 +32,7 @@ limitations under the License. .mx_RoomHeader_leftRow { height: 48px; + margin-top: 18px; -webkit-box-ordinal-group: 1; -moz-box-ordinal-group: 1; @@ -44,6 +45,7 @@ limitations under the License. .mx_RoomHeader_rightRow { height: 48px; + margin-top: 18px; background-color: #fff; border-radius: 48px; border: 1px solid #e1e1e1; diff --git a/skins/base/css/organisms/RoomView.css b/skins/base/css/organisms/RoomView.css index e1f3ea6bd..150aed006 100644 --- a/skins/base/css/organisms/RoomView.css +++ b/skins/base/css/organisms/RoomView.css @@ -36,8 +36,8 @@ limitations under the License. -webkit-order: 1; order: 1; - -webkit-flex: 0 0 86px; - flex: 0 0 86px; + -webkit-flex: 0 0 88px; + flex: 0 0 88px; } .mx_RoomView_auxPanel { @@ -50,7 +50,6 @@ limitations under the License. max-width: 720px; width: 100%; margin: auto; - border-top: 1px solid #a8dbf3; height: 0%; } diff --git a/skins/base/css/pages/MatrixChat.css b/skins/base/css/pages/MatrixChat.css index 544204116..1cf2dcd35 100644 --- a/skins/base/css/pages/MatrixChat.css +++ b/skins/base/css/pages/MatrixChat.css @@ -38,13 +38,15 @@ limitations under the License. height: 100%; } -.mx_MatrixChat .mx_MatrixChat_MiddleView { +.mx_MatrixChat .mx_MatrixChat_middlePanel { -webkit-box-ordinal-group: 2; -moz-box-ordinal-group: 2; -ms-flex-order: 2; -webkit-order: 2; order: 2; + padding-left: 12px; + padding-right: 12px; background-color: #f3f8fa; width: 100%; height: 100%; diff --git a/skins/base/views/molecules/MRoomMemberTile.js b/skins/base/views/molecules/MRoomMemberTile.js index e5a7f7153..7a19347da 100644 --- a/skins/base/views/molecules/MRoomMemberTile.js +++ b/skins/base/views/molecules/MRoomMemberTile.js @@ -40,7 +40,7 @@ module.exports = React.createClass({ return (
- +
{ timestamp } diff --git a/skins/base/views/molecules/MemberTile.js b/skins/base/views/molecules/MemberTile.js index d1d731092..58bc735df 100644 --- a/skins/base/views/molecules/MemberTile.js +++ b/skins/base/views/molecules/MemberTile.js @@ -27,7 +27,7 @@ module.exports = React.createClass({ render: function() { return (
-
+
{this.props.member.name}
); diff --git a/skins/base/views/molecules/MessageComposer.js b/skins/base/views/molecules/MessageComposer.js index 4f033e99e..3279fe7a1 100644 --- a/skins/base/views/molecules/MessageComposer.js +++ b/skins/base/views/molecules/MessageComposer.js @@ -32,7 +32,7 @@ module.exports = React.createClass({
- +