From cc75eb8b0ed14b5989c303e9d2b7bc6caa95046b Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 1 Sep 2016 00:14:51 +0100
Subject: [PATCH] fix statusbar height and behaviour during voip calls

---
 .../css/matrix-react-sdk/structures/RoomStatusBar.css     | 8 +++++++-
 .../vector/css/matrix-react-sdk/structures/RoomView.css   | 3 ++-
 .../vector/css/matrix-react-sdk/structures/UploadBar.css  | 8 ++++++++
 .../css/matrix-react-sdk/views/rooms/TabCompleteBar.css   | 2 ++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
index 4d91755c..1d5e7dd6 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomStatusBar.css
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 .mx_RoomStatusBar {
-    margin-top: 15px;
+    margin-top: 10px;
     margin-left: 65px;
     min-height: 34px;
 }
@@ -25,11 +25,17 @@ limitations under the License.
     padding-left: 18px;
     padding-right: 12px;
     margin-left: -73px;
+    margin-top: 13px;
     float: left;
     width: 24px;
     text-align: center;
 }
 
+.mx_RoomStatusBar_callBar {
+    height: 50px;
+    line-height: 50px;
+}
+
 .mx_RoomStatusBar_placeholderIndicator span {
     color: #4a4a4a;
     opacity: 0.5;
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
index c8772b49..d24a6922 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
@@ -207,7 +207,7 @@ hr.mx_RoomView_myReadMarker {
 .mx_RoomView_statusAreaBox {
     max-width: 960px;
     margin: auto;
-    min-height: 60px;
+    min-height: 50px;
 }
 
 .mx_RoomView_statusAreaBox_line {
@@ -239,6 +239,7 @@ hr.mx_RoomView_myReadMarker {
 .mx_RoomView_voipButton {
     float: right;
     margin-right: 13px;
+    margin-top: 10px;
     cursor: pointer;
 }
 
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css b/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css
index b489e132..a8ec47ac 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css
+++ b/src/skins/vector/css/matrix-react-sdk/structures/UploadBar.css
@@ -30,6 +30,10 @@ limitations under the License.
     height: 5px;
 }
 
+.mx_UploadBar_uploadProgressInner .mx_RoomView_callStatusBar {
+    background-color: #fff ! important;
+}
+
 .mx_UploadBar_uploadFilename {
     margin-top: 5px;
     margin-left: 65px;
@@ -37,6 +41,10 @@ limitations under the License.
     color: #4a4a4a;
 }
 
+.mx_UploadBar_uploadFilename .mx_RoomView_callStatusBar {
+    color: #fff;
+}
+
 .mx_UploadBar_uploadIcon {
     float: left;
     margin-top: 5px;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css
index f7f4a0bd..1f8a3450 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css
@@ -34,6 +34,8 @@ limitations under the License.
     padding-bottom: 2px;
     margin-bottom: 6px;
     border-radius: 30px;
+    position: relative;
+    top: 1px;
 }
 
 .mx_TabCompleteBar_command .mx_TabCompleteBar_text {