Move mx_EventTile_body out of mx_EventTile:not([data-layout=bubble]) (#…

…8958) * Move mx_EventTile_body out of mx_EventTile:not([data-layout=bubble]) Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com> * Enable overflow scroll on expanded ReplyChain on bubble layout Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
matrix-org · Jul 1, 2022 · bf281c1 · bf281c1
1 parent e72598e
commit bf281c1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/res/css/views/elements/_ReplyChain.scss b/res/css/views/elements/_ReplyChain.scss
@@ -63,14 +63,3 @@ limitations under the License.
         border-left-color: $username-variant8-color;
     }
 }
-
-.mx_ReplyChain--expanded {
-    .mx_EventTile_body {
-        display: block;
-        overflow-y: scroll !important;
-    }
-    .mx_EventTile_collapsedCodeBlock {
-        // !important needed due to .mx_ReplyTile .mx_EventTile_content .mx_EventTile_pre_container > pre
-        display: block !important;
-    }
-}
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
@@ -55,6 +55,10 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
         user-select: none;
     }
 
+    .mx_EventTile_body {
+        overflow-y: hidden;
+    }
+
     .mx_EventTile_receiptSent,
     .mx_EventTile_receiptSending {
         position: relative;
@@ -114,6 +118,17 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
         gap: $spacing-4;
     }
 
+    .mx_ReplyChain--expanded {
+        .mx_EventTile_body {
+            display: block;
+            overflow-y: scroll;
+        }
+
+        .mx_EventTile_collapsedCodeBlock {
+            display: block !important; // !important needed due to .mx_ReplyTile .mx_EventTile_content .mx_EventTile_pre_container > pre
+        }
+    }
+
     &[data-layout=irc],
     &[data-layout=group] {
         &.mx_EventTile_highlight,
@@ -302,11 +317,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
         }
     }
 
-    /* De-zalgoing */
-    .mx_EventTile_body {
-        overflow-y: hidden;
-    }
-
     &:hover.mx_EventTile_verified .mx_EventTile_line {
         box-shadow: inset calc(50px + $selected-message-border-width) 0 0 -50px $e2e-verified-color;
     }