Merge remote-tracking branch 'upstream/develop' into task/colors-4

res/css/views/rooms/_EventTile.scss

@@ -676,10 +676,57 @@ $hover-select-border: 4px;
     }
 }
 
-.mx_ThreadInfo:hover {
-    cursor: pointer;
+.mx_ThreadInfo {
+    height: 35px;
+    position: relative;
+    background-color: $system;
+    padding-left: 12px;
+    display: flex;
+    align-items: center;
+    border-radius: 8px;
+    padding-right: 16px;
+    padding-top: 8px;
+    padding-bottom: 8px;
+    font-size: 12px;
+    color: $secondary-content;
+    box-sizing: border-box;
+    justify-content: flex-start;
+
+    &:hover, &-active {
+        cursor: pointer;
+        border: 1px solid $quinary-content;
+        padding-top: 7px;
+        padding-bottom: 7px;
+        padding-left: 11px;
+        padding-right: 15px;
+    }
+
+    .mx_ThreadInfo_content {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        padding-left: 8px;
+    }
+
+    .mx_ThreadInfo_thread-icon {
+        mask-image: url('$(res)/img/element-icons/thread-summary.svg');
+        mask-position: center;
+        height: 16px;
+        min-width: 16px;
+        background-color: $secondary-content;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+    }
+    .mx_ThreadInfo_threads-amount {
+        font-weight: 600;
+        position: relative;
+        padding: 0 8px;
+        white-space: nowrap;
+    }
 }
 
+
+
 .mx_ThreadView {
     display: flex;
     flex-direction: column;

res/img/element-icons/thread-summary.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" fill="none" viewBox="0 0 18 18"><path fill="#17191C" fill-rule="evenodd" d="M3 .25A2.75 2.75 0 0 0 .25 3v14a.75.75 0 0 0 1.2.6L4.916 15c.217-.162.48-.25.75-.25H15A2.75 2.75 0 0 0 17.75 12V3A2.75 2.75 0 0 0 15 .25H3ZM4.25 6A.75.75 0 0 1 5 5.25h8a.75.75 0 0 1 0 1.5H5A.75.75 0 0 1 4.25 6ZM5 8.25a.75.75 0 0 0 0 1.5h4a.75.75 0 1 0 0-1.5H5Z" clip-rule="evenodd"/></svg>