From c539a5be27f82dc4cc1e92ce0201cb8c539f30e1 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Sun, 3 Jul 2022 18:45:17 +0900
Subject: [PATCH 1/4] Fix toggle of expanded generic event list summary on
 bubble layout

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
---
 res/css/views/elements/_GenericEventListSummary.scss      | 1 +
 src/components/views/elements/GenericEventListSummary.tsx | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/css/views/elements/_GenericEventListSummary.scss b/res/css/views/elements/_GenericEventListSummary.scss
index 2924af12cfc..15ebaa7a25c 100644
--- a/res/css/views/elements/_GenericEventListSummary.scss
+++ b/res/css/views/elements/_GenericEventListSummary.scss
@@ -75,6 +75,7 @@ limitations under the License.
 
             &[aria-expanded=true] {
                 text-align: right;
+                margin-inline-start: auto; // reduce clickable area
             }
         }
 
diff --git a/src/components/views/elements/GenericEventListSummary.tsx b/src/components/views/elements/GenericEventListSummary.tsx
index 5a61cb04009..ddd6bdb9ec5 100644
--- a/src/components/views/elements/GenericEventListSummary.tsx
+++ b/src/components/views/elements/GenericEventListSummary.tsx
@@ -119,7 +119,12 @@ const GenericEventListSummary: React.FC<IProps> = ({
             data-layout={layout}
             data-testid={testId}
         >
-            <AccessibleButton className="mx_GenericEventListSummary_toggle" onClick={toggleExpanded} aria-expanded={expanded}>
+            <AccessibleButton
+                kind="link_inline"
+                className="mx_GenericEventListSummary_toggle"
+                onClick={toggleExpanded}
+                aria-expanded={expanded}
+            >
                 { expanded ? _t('collapse') : _t('expand') }
             </AccessibleButton>
             { body }

From 11407e6cbc45211485295e20afb6b95277eeb2a8 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Sun, 3 Jul 2022 18:50:09 +0900
Subject: [PATCH 2/4] Margin settings

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
---
 res/css/views/elements/_GenericEventListSummary.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/css/views/elements/_GenericEventListSummary.scss b/res/css/views/elements/_GenericEventListSummary.scss
index 15ebaa7a25c..131222f020f 100644
--- a/res/css/views/elements/_GenericEventListSummary.scss
+++ b/res/css/views/elements/_GenericEventListSummary.scss
@@ -67,10 +67,12 @@ limitations under the License.
         }
 
         .mx_GenericEventListSummary_toggle {
-            margin: 0 55px 0 5px;
+            margin-block: 0;
+            margin-inline-end: 55px;
 
             &[aria-expanded=false] {
                 order: 9;
+                margin-inline-start: 5px;
             }
 
             &[aria-expanded=true] {

From 9b489f7bcb55e4b894f4f8a72b1c928193d3a244 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Sun, 3 Jul 2022 21:34:00 +0900
Subject: [PATCH 3/4] Remove redundant declarations

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
---
 res/css/views/elements/_GenericEventListSummary.scss | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/res/css/views/elements/_GenericEventListSummary.scss b/res/css/views/elements/_GenericEventListSummary.scss
index 131222f020f..0d2b504de66 100644
--- a/res/css/views/elements/_GenericEventListSummary.scss
+++ b/res/css/views/elements/_GenericEventListSummary.scss
@@ -112,11 +112,6 @@ limitations under the License.
     cursor: pointer;
 }
 
-.mx_GenericEventListSummary_toggle {
-    color: $accent;
-    cursor: pointer;
-}
-
 .mx_GenericEventListSummary_line {
     border-bottom: 1px solid $primary-hairline-color;
     margin-left: 63px;

From f2684e40a80b7a724c765a780c1bbf5ba79cf2a5 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Sun, 3 Jul 2022 21:34:55 +0900
Subject: [PATCH 4/4] Remove redundant declaration

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
---
 res/css/views/elements/_GenericEventListSummary.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/res/css/views/elements/_GenericEventListSummary.scss b/res/css/views/elements/_GenericEventListSummary.scss
index 0d2b504de66..243506a447b 100644
--- a/res/css/views/elements/_GenericEventListSummary.scss
+++ b/res/css/views/elements/_GenericEventListSummary.scss
@@ -76,7 +76,6 @@ limitations under the License.
             }
 
             &[aria-expanded=true] {
-                text-align: right;
                 margin-inline-start: auto; // reduce clickable area
             }
         }