From 246c70c6a19927dc092c09ec8653162c3ad8ed43 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 28 Apr 2020 17:49:10 +0100 Subject: [PATCH 1/2] Fix internal link styling in Security Settings Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../settings/tabs/user/_SecurityUserSettingsTab.scss | 8 ++++++++ .../views/settings/tabs/user/SecurityUserSettingsTab.js | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss index b5a6693006..849979f444 100644 --- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss +++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss @@ -55,3 +55,11 @@ limitations under the License. .mx_SecurityUserSettingsTab_ignoredUser .mx_AccessibleButton { margin-right: 10px; } + +.mx_SecurityUserSettingsTab { + .mx_SettingsTab_section { + .mx_AccessibleButton_kind_link { + padding: 0; + } + } +} diff --git a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js index 0eec59806a..42fa4a5c6f 100644 --- a/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/SecurityUserSettingsTab.js @@ -90,7 +90,7 @@ export default class SecurityUserSettingsTab extends React.Component { }; _onGoToUserProfileClick = () => { - // close the settings dialog & let the default action run (ie. navigate to the link) + window.location.href = "#/user/" + MatrixClientPeg.get().getUserId(); this.props.closeSettingsFn(); } @@ -299,9 +299,9 @@ export default class SecurityUserSettingsTab extends React.Component { "Manage the names of and sign out of your sessions below or " + "verify them in your User Profile.", {}, { - a: sub => {sub}, + a: sub => + {sub} + , }, )} From dc7b588e02e9fb4a8fcc482522d0bc738c58e839 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 28 Apr 2020 17:57:32 +0100 Subject: [PATCH 2/2] fix font-size Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss index 849979f444..8700f8747d 100644 --- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss +++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss @@ -60,6 +60,7 @@ limitations under the License. .mx_SettingsTab_section { .mx_AccessibleButton_kind_link { padding: 0; + font-size: inherit; } } }