From 0f562bd39c29d4894cbe93f67e42ddc335b5cd47 Mon Sep 17 00:00:00 2001 From: Lars van Hijfte Date: Wed, 11 Jan 2017 15:29:47 +0100 Subject: [PATCH] Fixed chat size. It is all fixed, litteraly. --- .idea/WebDB.iml | 10 ++++++++++ website/styles/chat.css | 17 +++++++++++------ website/views/chat-view.php | 29 ++++++++++++++++++----------- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/.idea/WebDB.iml b/.idea/WebDB.iml index b313593..0d7f9d7 100644 --- a/.idea/WebDB.iml +++ b/.idea/WebDB.iml @@ -14,5 +14,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/website/styles/chat.css b/website/styles/chat.css index 82e3e6d..f7476bb 100644 --- a/website/styles/chat.css +++ b/website/styles/chat.css @@ -1,16 +1,21 @@ /* Overall chat-screen */ .chat { + position: fixed; + top: 80px; + left: 256px; text-align: center; padding: 15px 0; - width: 100% + width: calc(100% - 256px); + height: calc(100% - 120px); + display: inline-flex; } .chat-left { - float: left; - width: 20%; + width: 256px; height: 100%; margin-left: 10px; margin-right: 10px; + display: inline-flex; } .chat-list, .chat-history { @@ -32,16 +37,16 @@ } .chat-right { - width: 75%; + width: calc(100% - 256px - 40px); + height: calc(100% - 80px); vertical-align: bottom; - float: right; margin-right: 10px; } /* Chat history. */ .chat-history { - height: 600px; overflow-y: auto; + height: 100%; padding-bottom: 10px; } diff --git a/website/views/chat-view.php b/website/views/chat-view.php index 00f39fb..2f5d7a0 100644 --- a/website/views/chat-view.php +++ b/website/views/chat-view.php @@ -30,18 +30,25 @@
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+
+
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+ +
+
+ + +
- -
- - -
\ No newline at end of file