From e7fbad22364c72e28506ff5da3bbfcf142dfc934 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 8 Nov 2017 16:44:45 +0000
Subject: [PATCH 1/4] Increase height to avoid content from overflowing
 (mx_RoomHeader_name.height + mx_RoomHeader_topic.max-height)

---
 .../vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
index 6916298bf5..1f42f1afc4 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
@@ -22,7 +22,7 @@ limitations under the License.
 .mx_RoomHeader_wrapper {
     max-width: 960px;
     margin: auto;
-    height: 70px;
+    height: 73px;
     align-items: center;
     display: flex;
 }

From 76570a0f14ddde4c0d444c9b3477033e9cc906d0 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 8 Nov 2017 17:02:17 +0000
Subject: [PATCH 2/4] Make long topics overflow in to a second, hidden column.

---
 .../vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
index 1f42f1afc4..7e0211b997 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
@@ -185,6 +185,7 @@ limitations under the License.
     overflow: hidden;
     text-overflow: ellipsis;
     border-bottom: 1px solid transparent;
+    column-width: 960px;
 }
 
 .mx_RoomHeader_avatar {

From 106430f7b691ee6de0caa4ca05d94aac3c44243c Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 8 Nov 2017 19:48:53 +0000
Subject: [PATCH 3/4] Move margin to AppTile elements so that it is only
 present with app tiles. Comment unused classes.

---
 .../matrix-react-sdk/views/rooms/_AppsDrawer.scss   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
index f9c092873e..ddb9aa4a07 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
@@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_AppsDrawer {
-    margin-bottom: 3px;
-}
+// .mx_AppsDrawer {
+// }
 
 .mx_AppsContainer {
     display: flex;
@@ -69,6 +68,10 @@ limitations under the License.
     // display: inline-block;
 }
 
+.mx_AppTile, .mx_AppTileFullWidth {
+    margin-bottom: 3px;
+}
+
 .mx_AppTileMenuBar {
     // height: 15px;
     margin: 0;
@@ -116,8 +119,8 @@ limitations under the License.
     display: block;
 }
 
-.mx_CloseAppWidget {
-}
+// .mx_CloseAppWidget {
+// }
 
 .mx_AppTileMenuBarWidgetPadding {
     margin-right: 5px;

From 092ec1cc6cbd86082ca30dc96a0d6092b82a25fe Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 8 Nov 2017 20:03:35 +0000
Subject: [PATCH 4/4] Prevent long topics from overflowing fixed height header.

---
 .../vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
index 7e0211b997..79ada70b23 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
@@ -22,7 +22,7 @@ limitations under the License.
 .mx_RoomHeader_wrapper {
     max-width: 960px;
     margin: auto;
-    height: 73px;
+    height: 70px;
     align-items: center;
     display: flex;
 }
@@ -176,7 +176,7 @@ limitations under the License.
 .mx_RoomHeader_topic {
     vertical-align: bottom;
     float: left;
-    max-height: 42px;
+    max-height: 38px;
     color: $settings-grey-fg-color;
     font-weight: 300;
     font-size: 13px;