From f4efdf931b09155c1d4fd4f635f8e6fd8b3df9ec Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 26 Nov 2015 10:37:49 +0100 Subject: [PATCH] chat client: clean up css --- public/assets/chat/chat.css | 13 +++++-------- public/assets/chat/chat.scss | 9 +++------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/public/assets/chat/chat.css b/public/assets/chat/chat.css index 164360705..e1f41f2e2 100644 --- a/public/assets/chat/chat.css +++ b/public/assets/chat/chat.css @@ -105,7 +105,7 @@ margin: 0 1em; display: inline-block; line-height: 2em; - padding: 0 .7em; + padding: 0 0.7em; border-radius: 1em; background: rgba(0, 0, 0, 0.1); box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.04) inset; } @@ -304,10 +304,11 @@ .zammad-chat-input { margin: 0; - padding: 0; + padding: 1em 2em; float: left; width: auto; height: auto; + max-height: 6em; font-family: inherit; line-height: inherit; font-size: inherit; @@ -316,16 +317,12 @@ appearance: none; border: none !important; background: none; - box-shadow: none; - padding: 1em 2em; + box-shadow: none !important; outline: none; - box-shadow: none; resize: none; -webkit-flex: 1; -ms-flex: 1; - flex: 1; - max-height: 6em; - box-shadow: none !important; } + flex: 1; } .zammad-chat-input::-webkit-input-placeholder { color: #d9d9d9; } diff --git a/public/assets/chat/chat.scss b/public/assets/chat/chat.scss index deb5063f3..7687b1931 100644 --- a/public/assets/chat/chat.scss +++ b/public/assets/chat/chat.scss @@ -305,24 +305,21 @@ .zammad-chat-input { margin: 0; - padding: 0; + padding: 1em 2em; float: left; width: auto; height: auto; + max-height: 6em; font-family: inherit; line-height: inherit; font-size: inherit; appearance: none; border: none !important; background: none; - box-shadow: none; - padding: 1em 2em; + box-shadow: none !important; outline: none; - box-shadow: none; resize: none; flex: 1; - max-height: 6em; - box-shadow: none !important; } .zammad-chat-input::-webkit-input-placeholder {