From 6542201ac6b0e06a947c7ccff3a9a74bd276533b Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 17 Jun 2015 15:46:04 +0100 Subject: [PATCH] CSS tweakage --- css/molecules/MessageComposer.css | 10 ++++------ css/molecules/RoomHeader.css | 2 +- css/organisms/RoomList.css | 10 ++++------ css/organisms/RoomView.css | 27 +++++++++++++++++++++------ css/pages/MatrixChat.css | 26 +++++++++++++++++++++++--- 5 files changed, 53 insertions(+), 22 deletions(-) diff --git a/css/molecules/MessageComposer.css b/css/molecules/MessageComposer.css index bc090b9b7b..b2a8b57c4a 100644 --- a/css/molecules/MessageComposer.css +++ b/css/molecules/MessageComposer.css @@ -1,12 +1,10 @@ .mx_MessageComposer { - position: absolute; - bottom: 5px; - right: 0px; - left: 0px; - width: 100%; - height: 36px; } .mx_MessageComposer textarea { + position: absolute; width: 100%; + margin-left: auto; + margin-right: auto; + padding: 0px; } diff --git a/css/molecules/RoomHeader.css b/css/molecules/RoomHeader.css index a395337d05..856bc1d41c 100644 --- a/css/molecules/RoomHeader.css +++ b/css/molecules/RoomHeader.css @@ -2,5 +2,5 @@ background-color: #eee; font-weight: bold; height: 1em; - padding: 5px; + padding: 0px; } diff --git a/css/organisms/RoomList.css b/css/organisms/RoomList.css index f64a9d4c8f..636c510939 100644 --- a/css/organisms/RoomList.css +++ b/css/organisms/RoomList.css @@ -1,13 +1,11 @@ .mx_RoomList { - position: relative; - top: -30px; - padding-top: 30px; - padding-bottom: 10px; - height: 100%; - overflow-y: scroll; } .mx_RoomList ul { padding: 0px; margin: 0px; } + +.mx_RoomList ul li { + list-style-type: none; +} diff --git a/css/organisms/RoomView.css b/css/organisms/RoomView.css index a7704b959c..2499e3b9af 100644 --- a/css/organisms/RoomView.css +++ b/css/organisms/RoomView.css @@ -1,18 +1,33 @@ .mx_RoomView { - display: table-cell; - padding-left: 5px; word-wrap: break-word; - position: relative; - padding-bottom: 70px +} + +.mx_RoomView .mx_RoomHeader { + position: absolute; + top: 0px; + width: 100%; + height: 30px; } .mx_RoomView ul { padding: 0px; margin: 0px; - height: 100%; + position: absolute; + top: 35px; + bottom: 40px; + left: 0px; + right: 0px; overflow-y: scroll; } -.mx_RoomView li { +.mx_RoomView ul li { list-style-type: none; } + +.mx_RoomView .mx_MessageComposer { + position: absolute; + bottom: 5px; + right: 0px; + left: 0px; + height: 36px; +} diff --git a/css/pages/MatrixChat.css b/css/pages/MatrixChat.css index 8a4744d423..c2e089a920 100644 --- a/css/pages/MatrixChat.css +++ b/css/pages/MatrixChat.css @@ -1,12 +1,32 @@ .mx_MatrixChat { - display: table; - table-layout: fixed; + position: relative; width: 100%; height: 100%; } .mx_MatrixChat_leftPanel { - display: table-cell; + position: absolute; + left: 0px; width: 250px; height: 100%; } + +.mx_MatrixChat_leftPanel .mx_MatrixToolbar { + position: absolute; + height: 20px; +} + +.mx_MatrixChat_leftPanel .mx_RoomList { + position: absolute; + top: 20px; + bottom: 0px; + width: 250px; + overflow-y: scroll; +} + +.mx_MatrixChat .mx_RoomView { + position: absolute; + left: 255px; + right: 0px; + height: 100%; +}