Merge branch 'develop' into foldleft/better-errors

res/css/views/rooms/_BasicMessageComposer.scss

@@ -44,27 +44,29 @@ limitations under the License.
         outline: none;
         overflow-x: hidden;
 
-        span.mx_UserPill, span.mx_RoomPill {
-            padding-left: 21px;
-            position: relative;
+        &.mx_BasicMessageComposer_input_shouldShowPillAvatar {
+            span.mx_UserPill, span.mx_RoomPill {
+                padding-left: 21px;
+                position: relative;
 
-            // avatar psuedo element
-            &::before {
-                position: absolute;
-                left: 2px;
-                top: 2px;
-                content: var(--avatar-letter);
-                width: 16px;
-                height: 16px;
-                background: var(--avatar-background), $avatar-bg-color;
-                color: $avatar-initial-color;
-                background-repeat: no-repeat;
-                background-size: 16px;
-                border-radius: 8px;
-                text-align: center;
-                font-weight: normal;
-                line-height: $font-16px;
-                font-size: $font-10-4px;
+                // avatar psuedo element
+                &::before {
+                    position: absolute;
+                    left: 2px;
+                    top: 2px;
+                    content: var(--avatar-letter);
+                    width: 16px;
+                    height: 16px;
+                    background: var(--avatar-background), $avatar-bg-color;
+                    color: $avatar-initial-color;
+                    background-repeat: no-repeat;
+                    background-size: 16px;
+                    border-radius: 8px;
+                    text-align: center;
+                    font-weight: normal;
+                    line-height: $font-16px;
+                    font-size: $font-10-4px;
+                }
             }
         }
     }

res/css/views/rooms/_EventTile.scss

@@ -111,6 +111,7 @@ limitations under the License.
 }
 
 .mx_EventTile_line, .mx_EventTile_reply {
+    clear: both;
     position: relative;
     padding-left: 65px; /* left gutter */
     padding-top: 4px;

res/css/views/rooms/_RoomTile.scss

@@ -24,6 +24,20 @@ limitations under the License.
     margin: 0;
     padding: 0 8px 0 10px;
     position: relative;
+
+    .mx_RoomTile_menuButton {
+        display: none;
+        flex: 0 0 16px;
+        height: 16px;
+        background-image: url('$(res)/img/icon_context.svg');
+        background-repeat: no-repeat;
+        background-position: center;
+    }
+
+    .mx_UserOnlineDot {
+        display: block;
+        margin-right: 5px;
+    }
 }
 
 .mx_RoomTile:focus {
@@ -31,15 +45,6 @@ limitations under the License.
     background-color: $roomtile-focused-bg-color;
 }
 
-.mx_RoomTile_menuButton {
-    display: none;
-    flex: 0 0 16px;
-    height: 16px;
-    background-image: url('$(res)/img/icon_context.svg');
-    background-repeat: no-repeat;
-    background-position: center;
-}
-
 .mx_RoomTile_tooltip {
     display: inline-block;
     position: relative;
@@ -151,7 +156,10 @@ limitations under the License.
     }
 
     .mx_RoomTile_menuButton {
-        display: none;  //no design for this for now
+        display: none; // no design for this for now
+    }
+    .mx_UserOnlineDot {
+        display: none; // no design for this for now
     }
 }
 
@@ -164,6 +172,9 @@ limitations under the License.
     .mx_RoomTile_menuButton {
         display: block;
     }
+    .mx_UserOnlineDot {
+        display: none;
+    }
 }
 
 .mx_RoomTile_unreadNotify .mx_RoomTile_badge,

res/css/views/rooms/_UserOnlineDot.scss

@@ -17,7 +17,7 @@ limitations under the License.
 .mx_UserOnlineDot {
     border-radius: 50%;
     background-color: $accent-color;
-    height: 5px;
-    width: 5px;
+    height: 6px;
+    width: 6px;
     display: inline-block;
 }