From 285c4f91d38f72c7283549b7d2821cfcb50632a9 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 13 Feb 2018 15:17:51 +0000
Subject: [PATCH] Fix TagPanel from collapsing to < 60px when LP collapsed

Fixes https://github.com/vector-im/riot-web/issues/6133
---
 src/components/structures/LeftPanel.js                     | 7 ++++++-
 .../vector/css/matrix-react-sdk/structures/_TagPanel.scss  | 2 +-
 src/skins/vector/css/vector-web/structures/_LeftPanel.scss | 7 +++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 3260c97559..0d9ab641c7 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -238,9 +238,14 @@ var LeftPanel = React.createClass({
             }
         );
 
+        const containerClasses = classNames(
+            "mx_LeftPanel_container",
+            { "mx_LeftPanel_container_collapsed": this.props.collapsed },
+        );
+
         return (
             <DragDropContext onDragEnd={this.onDragEnd}>
-                <div className="mx_LeftPanel_container">
+                <div className={containerClasses}>
                     { SettingsStore.isFeatureEnabled("feature_tag_panel") ? <TagPanel /> : <div /> }
                     <aside className={classes} onKeyDown={ this._onKeyDown } onFocus={ this._onFocus } onBlur={ this._onBlur }>
                         { topBox }
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss b/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
index 91199a11e7..7a81d6c5a2 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_TagPanel.scss
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 .mx_TagPanel {
-    width: 60px;
+    flex: 0 0 60px;
     background-color: $tertiary-accent-color;
     cursor: pointer;
 
diff --git a/src/skins/vector/css/vector-web/structures/_LeftPanel.scss b/src/skins/vector/css/vector-web/structures/_LeftPanel.scss
index a2147a025d..b805e7bd89 100644
--- a/src/skins/vector/css/vector-web/structures/_LeftPanel.scss
+++ b/src/skins/vector/css/vector-web/structures/_LeftPanel.scss
@@ -23,6 +23,13 @@ limitations under the License.
 
 .mx_LeftPanel_container {
     display: flex;
+
+    flex: 0 0 295px;
+}
+
+.mx_LeftPanel_container_collapsed {
+    /* TagPanel 60px + Collapsed LeftPanel 60px */
+    flex: 0 0 120px;
 }
 
 .mx_LeftPanel_hideButton {