Merge branch 'develop' into gsouquet/threads-beta-21351

matrix-org · Apr 5, 2022 · 975b35e · 975b35e
2 parents 7ac3f57 + 27e4806
commit 975b35e
Show file tree

Hide file tree

Showing 24 changed files with 201 additions and 97 deletions.
diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss
@@ -212,14 +212,20 @@ hr.mx_RoomView_myReadMarker {
 }
 
 // Immersive widgets
-.mx_RoomView_body > .mx_AppTile {
-    margin: $container-gap-width;
-    margin-right: calc($container-gap-width / 2);
-    width: auto;
-    height: 100%;
-    padding-top: 33px; // to match the right panel chat heading
+.mx_RoomView_immersive {
+    .mx_RoomHeader_wrapper {
+        border: unset;
+    }
 
-    border-radius: 8px;
+    .mx_AppTile {
+        margin: $container-gap-width;
+        margin-right: calc($container-gap-width / 2);
+        width: auto;
+        height: 100%;
+        padding-top: 33px; // to match the right panel chat heading
+
+        border-radius: 8px;
+    }
 }
 
 .mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner {

diff --git a/res/css/views/elements/_RichText.scss b/res/css/views/elements/_RichText.scss
@@ -76,7 +76,9 @@ a.mx_Pill {
 }
 
 .mx_Emoji {
-    font-size: 1.8rem;
+    // Should be 1.8rem for our default 1.4rem message bodies,
+    // and scale with the size of the surrounding text
+    font-size: calc(18 / 14 * 1em);
     vertical-align: bottom;
 }
 

diff --git a/res/css/views/right_panel/_ThreadPanel.scss b/res/css/views/right_panel/_ThreadPanel.scss
@@ -105,11 +105,10 @@ limitations under the License.
     }
 
     .mx_AutoHideScrollbar {
-        background: #fff;
         background-color: $background;
         border-radius: 8px;
-        width: calc(100% - 16px);
-        padding-right: 16px;
+        width: calc(100% - 24px);
+        padding-right: 18px;
     }
 
     &.mx_ThreadView .mx_ThreadView_timelinePanelWrapper {
@@ -165,6 +164,10 @@ limitations under the License.
         .mx_EventTile_e2eIcon {
             left: 8px;
         }
+
+        &:hover .mx_EventTile_line {
+            box-shadow: unset !important; // don't show the verification left stroke in the thread list
+        }
     }
 
     .mx_MessageComposer {
@@ -198,10 +201,6 @@ limitations under the License.
         float: right;
     }
 
-    .mx_ThreadPanel_dropdown[aria-expanded=true]::before {
-        transform: rotate(180deg);
-    }
-
     .mx_MessageTimestamp {
         font-size: $font-12px;
         color: $secondary-content;
@@ -294,26 +293,39 @@ limitations under the License.
 
     h2 {
         color: $primary-content;
-        font-weight: 600;
+        font-weight: $font-semi-bold;
         font-size: $font-18px;
+        margin-top: 24px;
+        margin-bottom: 10px;
     }
 
     p {
         font-size: $font-15px;
         color: $secondary-content;
+        margin: 10px 0;
     }
 
     button {
         border: none;
         background: none;
         color: $accent;
+        font-size: $font-15px;
 
         &:hover,
         &:active {
             text-decoration: underline;
             cursor: pointer;
         }
     }
+
+    .mx_ThreadPanel_empty_tip {
+        font-size: $font-12px;
+        line-height: $font-15px;
+
+        >b {
+            font-weight: $font-semi-bold;
+        }
+    }
 }
 
 .mx_ThreadPanel_largeIcon {

diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss
@@ -148,8 +148,6 @@ $MinWidth: 240px;
     width: 50%;
     min-width: $MinWidth;
     border: $container-border-width solid $widget-menu-bar-bg-color;
-    border-left-width: 5px;
-    border-right-width: 5px;
     display: flex;
     flex-direction: column;
     box-sizing: border-box;