Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Fix headings margin on security user settings tab #8826

Merged
merged 4 commits into from
Jul 6, 2022
Merged

Fix headings margin on security user settings tab #8826

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
164c3a2
Apply kind=link to 'Learn more' link on security user settings tab
luixxiul Jun 12, 2022
52480e5
Remove specific margin setting from heading on security user settings…
luixxiul Jun 12, 2022
45fc790
Merge branch 'develop' into SecurityUserSettingsTab
luixxiul Jul 1, 2022
219fe3c
Merge branch 'develop' into SecurityUserSettingsTab
luixxiul Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions res/css/views/settings/tabs/_SettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@ limitations under the License.
}
}

.mx_SettingsTab_linkBtn {
cursor: pointer;
color: $accent;
word-break: break-all;
}

.mx_SettingsTab_toggleWithDescription {
margin-top: $spacing-24;
}
3 changes: 0 additions & 3 deletions res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ limitations under the License.
}

.mx_SecurityUserSettingsTab {
.mx_SettingsTab_heading {
margin-bottom: 22px;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed to fix the inconsistency.

}
.mx_SettingsTab_section {
.mx_AccessibleButton_kind_link {
padding: 0;
Expand Down
11 changes: 6 additions & 5 deletions src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,11 +306,12 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
{ _t("Share anonymous data to help us identify issues. Nothing personal. " +
"No third parties.") }
</p>
<p>
<AccessibleButton className="mx_SettingsTab_linkBtn" onClick={onClickAnalyticsLearnMore}>
{ _t("Learn more") }
</AccessibleButton>
</p>
<AccessibleButton
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AccessibleButton is an div element, so wrapping it with p is not required.

kind="link"
onClick={onClickAnalyticsLearnMore}
>
{ _t("Learn more") }
</AccessibleButton>
</div>
{ PosthogAnalytics.instance.isEnabled() && (
<SettingsFlag
Expand Down