From e9e6e7f60d04f04036f12c9742734c5390ebe25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Fri, 26 Oct 2018 13:10:12 +0200 Subject: [PATCH] Added send button to chat and changed some styles --- app/lib/components/Chat/Chat.jsx | 5 +++++ app/stylus/components/Chat.styl | 22 +++++++++++++++++----- app/stylus/components/FileSharing.styl | 2 +- app/stylus/components/Room.styl | 1 + 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/app/lib/components/Chat/Chat.jsx b/app/lib/components/Chat/Chat.jsx index 898bf75..33d3d53 100644 --- a/app/lib/components/Chat/Chat.jsx +++ b/app/lib/components/Chat/Chat.jsx @@ -34,6 +34,11 @@ class Chat extends Component autoFocus={autofocus} autoComplete='off' /> + ); diff --git a/app/stylus/components/Chat.styl b/app/stylus/components/Chat.styl index ee5b01e..d94fe68 100644 --- a/app/stylus/components/Chat.styl +++ b/app/stylus/components/Chat.styl @@ -54,21 +54,33 @@ [data-component='Sender'] { display: flex; background-color: #fff; - padding: 1rem; + color: #000; flex-shrink: 0; - border-radius: 5px; margin-top: 0.5rem; height: 3rem; - box-shadow: 0vmin 0.3vmin 1vmin 0.2vmin rgba(17,17,17,0.5); > .new-message { - width: 100%; + width: 80%; + box-shadow: 0vmin 0vmin 1vmin 0vmin rgba(17,17,17,0.5); border: 0; - color: #000; font-size: 1rem; + margin-right: 1vmin; + border-radius: 0.5vmin; + padding-left: 1vmin; + color: #000; &.focus { outline: none; } } + + > .send { + width: 20%; + box-shadow: 0vmin 0vmin 1vmin 0vmin rgba(17,17,17,0.5); + border: 0; + background-color: #aef; + color: #000; + font-size: 1rem; + border-radius: 0.5vmin; + } } diff --git a/app/stylus/components/FileSharing.styl b/app/stylus/components/FileSharing.styl index e99d5f7..9687c00 100644 --- a/app/stylus/components/FileSharing.styl +++ b/app/stylus/components/FileSharing.styl @@ -10,7 +10,7 @@ background: #aef; padding: 1rem; border-radius: 1vmin; - box-shadow: 0vmin 0.3vmin 1vmin 0.2vmin rgba(17,17,17,0.5); + box-shadow: 0vmin 0vmin 1vmin 0vmin rgba(17,17,17,0.5); &.disabled { cursor: not-allowed; diff --git a/app/stylus/components/Room.styl b/app/stylus/components/Room.styl index 46e9fd7..72cabaa 100644 --- a/app/stylus/components/Room.styl +++ b/app/stylus/components/Room.styl @@ -195,6 +195,7 @@ outline: none; padding: 8px 52px 8px 10px; transition: all 200ms ease; + box-shadow: 0vmin 0vmin 0.2vmin 0vmin rgba(17,17,17,0.5); } .Dropdown-control:hover {