fix merge; disable sticky headers; tweak chevrons

res/css/structures/_RoomSubList.scss

@@ -19,6 +19,11 @@ limitations under the License.
     table-layout: fixed;
     width: 100%;
 
+}
+
+.mx_RoomSubList_resizer {
+    width: 100%;
+    height: 3px;
     background-color: $roomsublist-background;
 }
 
@@ -36,6 +41,7 @@ limitations under the License.
     font-size: 12px;
     width: 203px; /* padding + width = LHS Panel width */
     height: 19px; /* height + padding = 31px = mx_RoomSubList_label height */
+    margin-left: 16px;
     padding-left: 16px; /* gutter */
     padding-right: 16px; /* gutter */
     padding-top: 6px;
@@ -123,34 +129,28 @@ limitations under the License.
 }
 
 .mx_RoomSubList_chevron {
+    left: 0px;
     pointer-events: none;
     position: absolute;
-    right: 41px;
     top: 11px;
+    width: 9px;
+    height: 4px;
+    background-image: url('../../img/topleft-chevron.svg');
+    background-size: cover;
+    // the transition doesn't work as the chevron gets remounted
+    transition: rotateZ 0.2s ease-in;
 }
 
 .mx_RoomSubList_chevronDown {
-    width: 0;
-    height: 0;
-    border-left: 5px solid transparent;
-    border-right: 5px solid transparent;
-    border-top: 6px solid $roomsublist-chevron-color;
+    transform: rotateZ(0deg);
 }
 
 .mx_RoomSubList_chevronUp {
-    width: 0;
-    height: 0;
-    border-left: 5px solid transparent;
-    border-right: 5px solid transparent;
-    border-bottom: 6px solid $roomsublist-chevron-color;
+    transform: rotateZ(180deg);
 }
 
 .mx_RoomSubList_chevronRight {
-    width: 0;
-    height: 0;
-    border-top: 5px solid transparent;
-    border-left: 6px solid $roomsublist-chevron-color;
-    border-bottom: 5px solid transparent;
+    transform: rotateZ(-90deg);
 }
 
 /* The overflow section */

res/css/structures/_TagPanel.scss

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 .mx_TagPanel {
-    flex: 0 0 60px;
-    background-color: $tertiary-accent-color;
+    flex: 0 0 70px;
+    background-color: $tagpanel-bg-color;
     cursor: pointer;
 
     display: flex;

res/themes/dharma/css/_dharma.scss

@@ -102,6 +102,7 @@ $voip-accept-color: #80f480;
 $rte-bg-color: #e9e9e9;
 $rte-code-bg-color: rgba(0, 0, 0, 0.04);
 $rte-room-pill-color: #aaa;
+$rte-group-pill-color: #aaa;
 
 $topleftmenu-color: #212121;
 $roomheader-color: #45474a;

src/components/structures/RoomSubList.js

@@ -68,7 +68,7 @@ const RoomSubList = React.createClass({
     getInitialState: function() {
         return {
             hidden: this.props.startAsHidden || false,
-            truncateAt: TRUNCATE_AT,
+            truncateAt: -1, // TRUNCATE_AT,
             sortedList: [],
         };
     },
@@ -346,8 +346,8 @@ const RoomSubList = React.createClass({
         return (
             <div className="mx_RoomSubList_labelContainer" title={ title } ref="header">
                 <AccessibleButton onClick={ this.onClick } className="mx_RoomSubList_label" tabIndex={tabindex}>
-                    { this.props.collapsed ? '' : this.props.label }
                     <div className={chevronClasses}></div>
+                    { this.props.collapsed ? '' : this.props.label }
                     { badge }
                     { incomingCall }
                 </AccessibleButton>
@@ -460,6 +460,7 @@ const RoomSubList = React.createClass({
                 <div className="mx_RoomSubList">
                     {this.props.alwaysShowHeader ? this._getHeaderJsx() : undefined}
                     { this.state.hidden ? undefined : content }
+                    <div className="mx_RoomSubList_resizer"></div>
                 </div>
             );
         }

src/components/views/rooms/RoomList.js

@@ -489,6 +489,8 @@ module.exports = React.createClass({
     },
 
     _updateStickyHeaders: function(initialise, scrollToPosition) {
+        return;
+
         const self = this;
 
         if (initialise) {