From d147aaa98467c5207a8456d0c01d803890f90581 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 21 Jul 2021 11:27:36 +0100 Subject: [PATCH] delint and fix min-height issue --- res/css/views/dialogs/_CreateRoomDialog.scss | 1 + .../views/dialogs/ManageRestrictedJoinRuleDialog.tsx | 4 ++-- src/components/views/elements/Dropdown.tsx | 2 +- .../views/settings/tabs/room/SecurityRoomSettingsTab.tsx | 2 +- src/stores/SpaceStore.tsx | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/res/css/views/dialogs/_CreateRoomDialog.scss b/res/css/views/dialogs/_CreateRoomDialog.scss index 173256f8af..5321d8ff69 100644 --- a/res/css/views/dialogs/_CreateRoomDialog.scss +++ b/res/css/views/dialogs/_CreateRoomDialog.scss @@ -125,6 +125,7 @@ limitations under the License. font-size: $font-14px; line-height: $font-32px; height: 32px; + min-height: 32px; > div { padding-left: 30px; diff --git a/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx b/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx index 9d571a8ed6..c63fdc4c84 100644 --- a/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx +++ b/src/components/views/dialogs/ManageRestrictedJoinRuleDialog.tsx @@ -119,12 +119,12 @@ const ManageRestrictedJoinRuleDialog: React.FC = ({ room, selected = [], { _t("Decide which spaces can access this room. " + "If a space is selected, its members can find and join .", {}, { RoomName: () => { room.name }, - })} + }) }

{ } // TODO: [REACT-WARNING] Replace with appropriate lifecycle event - UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line camelcase + UNSAFE_componentWillReceiveProps(nextProps) { // eslint-disable-line if (!nextProps.children || nextProps.children.length === 0) { return; } diff --git a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx index 0b29e18103..320bc52ccd 100644 --- a/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx +++ b/src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx @@ -392,7 +392,7 @@ export default class SecurityRoomSettingsTab extends React.Component { room.name } ; - })} + }) } { moreText && { moreText } } ; diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx index a1ee9df4e5..d907a7a21d 100644 --- a/src/stores/SpaceStore.tsx +++ b/src/stores/SpaceStore.tsx @@ -234,7 +234,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient {

{ _t("This makes it easy for rooms to stay private to a space, " + "while letting people in the space find and join them. " + - "All new rooms in a space will have this option available.")}

+ "All new rooms in a space will have this option available.") }

, button: _t("OK"), hasCloseButton: false,