From 06e83f471636396d2787b9fc397d25bb1f1167b8 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Wed, 15 Jun 2022 00:51:19 +0900
Subject: [PATCH 1/4] Fix position of 'Show Advanced' on security room settings
 tab

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
---
 .../settings/tabs/room/_SecurityRoomSettingsTab.scss      | 3 +--
 .../views/settings/tabs/room/SecurityRoomSettingsTab.tsx  | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
index a3b3b17899f..e17ce05d393 100644
--- a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
+++ b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
@@ -16,8 +16,7 @@ limitations under the License.
 
 .mx_SecurityRoomSettingsTab {
     .mx_SettingsTab_showAdvanced {
-        padding: 0;
-        margin-bottom: 16px;
+        margin-bottom: $spacing-16;
     }
 }
 
diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
index 6a72ec54412..1d016f2bbc1 100644
--- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
@@ -357,7 +357,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         const state = client.getRoom(this.props.roomId).currentState;
         const canSetGuestAccess = state.mayClientSendStateEvent(EventType.RoomGuestAccess, client);
 
-        return <div className="mx_SettingsTab_section">
+        return <>
             <LabelledToggleSwitch
                 value={guestAccess === GuestAccess.CanJoin}
                 onChange={this.onGuestAccessChange}
@@ -368,7 +368,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
                 { _t("People with supported clients will be able to join " +
                     "the room without having a registered account.") }
             </p>
-        </div>;
+        </>;
     }
 
     render() {
@@ -393,7 +393,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
         let advanced;
         if (room.getJoinRule() === JoinRule.Public) {
             advanced = (
-                <>
+                <div className="mx_SettingsTab_section">
                     <AccessibleButton
                         onClick={this.toggleAdvancedSection}
                         kind="link"
@@ -402,7 +402,7 @@ export default class SecurityRoomSettingsTab extends React.Component<IProps, ISt
                         { this.state.showAdvancedSection ? _t("Hide advanced") : _t("Show advanced") }
                     </AccessibleButton>
                     { this.state.showAdvancedSection && this.renderAdvanced() }
-                </>
+                </div>
             );
         }
 

From 12091b139b57a52165f2edb1910b51e04aa560bf Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Wed, 15 Jun 2022 00:58:18 +0900
Subject: [PATCH 2/4] Use flex to ensure alignment of the warning icon and
 message

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
---
 .../tabs/room/_SecurityRoomSettingsTab.scss         | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
index e17ce05d393..91e95f237f6 100644
--- a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
+++ b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
@@ -18,16 +18,11 @@ limitations under the License.
     .mx_SettingsTab_showAdvanced {
         margin-bottom: $spacing-16;
     }
-}
-
-.mx_SecurityRoomSettingsTab_warning {
-    display: block;
 
-    img {
-        vertical-align: middle;
-        margin-right: 5px;
-        margin-left: 3px;
-        margin-bottom: 5px;
+    .mx_SecurityRoomSettingsTab_warning {
+        display: flex;
+        align-items: center;
+        column-gap: $spacing-4;
     }
 }
 

From 39e322013f11042f14a70fabbd1cb33248e4f2f7 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Wed, 15 Jun 2022 01:11:53 +0900
Subject: [PATCH 3/4] Remove an obsolete style block

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
---
 .../views/settings/tabs/room/_SecurityRoomSettingsTab.scss  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
index 91e95f237f6..cf3e16bc044 100644
--- a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
+++ b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
@@ -25,9 +25,3 @@ limitations under the License.
         column-gap: $spacing-4;
     }
 }
-
-.mx_SecurityRoomSettingsTab_encryptionSection {
-    padding-bottom: 24px;
-    border-bottom: 1px solid $menu-border-color;
-    margin-bottom: 32px;
-}

From cd24c3a3ee2f60e0fda366d513247dcc18d7022c Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Wed, 15 Jun 2022 16:47:06 +0900
Subject: [PATCH 4/4] yarn run lint:style --fix

Signed-off-by: Suguru Hirahara <luixxiul@users.noreply.github.com>
---
 res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
index e430675ee16..cf3e16bc044 100644
--- a/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
+++ b/res/css/views/settings/tabs/room/_SecurityRoomSettingsTab.scss
@@ -24,4 +24,4 @@ limitations under the License.
         align-items: center;
         column-gap: $spacing-4;
     }
-}
\ No newline at end of file
+}