From 1850e4ea2907131919beb558506488c9cb70394c Mon Sep 17 00:00:00 2001 From: repjarms Date: Mon, 20 May 2019 13:20:56 -0400 Subject: [PATCH 1/2] feat(Terms of Use): add terms of use to the application --- public/index.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index d65a1530..a60ab38c 100644 --- a/public/index.html +++ b/public/index.html @@ -32,6 +32,12 @@ Data Protection Regulation (EU) 2016/679. +
+ By using this application, you agree to the  + + Terms of Use + +
@@ -50,4 +56,4 @@ - \ No newline at end of file + From 66ed091a0c11801f9e2208d74dceba9428cb477e Mon Sep 17 00:00:00 2001 From: repjarms Date: Mon, 20 May 2019 13:21:23 -0400 Subject: [PATCH 2/2] fix(Layout): use flex layout for chat list instead of fixed calc --- public/css/app.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/css/app.css b/public/css/app.css index f837fe2c..a3775df5 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -73,6 +73,8 @@ div { } .chat-column { + display: flex; + flex-direction: column; height: 90%; padding: 0.9375rem 0 0.625rem 0; margin: auto; @@ -82,6 +84,7 @@ div { } .user-typing { + flex: 0; border: none; color: #8d25e8; margin: 0.75rem; @@ -93,7 +96,7 @@ div { margin: 0.75rem; overflow-y: auto; overflow-x: hidden; - height: calc(100% - 4rem); + flex: 1; } .message-inner {