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

Use common subheading on sidebar user settings tab #8823

Merged
merged 2 commits into from
Jun 12, 2022
Merged

Use common subheading on sidebar user settings tab #8823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
565df33
Replace mx_SidebarUserSettingsTab_subheading with mx_SettingsTab_subh…
luixxiul Jun 12, 2022
94075fa
Remove a specific margin declaration in favor of the default setting …
luixxiul Jun 12, 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
11 changes: 0 additions & 11 deletions res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,6 @@ limitations under the License.
*/

.mx_SidebarUserSettingsTab {
.mx_SettingsTab_section {
margin-top: 12px;
}

.mx_SidebarUserSettingsTab_subheading {
font-size: $font-15px;
line-height: $font-24px;
color: $primary-content;
margin-bottom: 4px;
}

.mx_Checkbox {
margin-top: 12px;
font-size: $font-15px;
Expand Down
3 changes: 1 addition & 2 deletions src/components/views/settings/tabs/user/SidebarUserSettingsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@ const SidebarUserSettingsTab = () => {
return (
<div className="mx_SettingsTab mx_SidebarUserSettingsTab">
<div className="mx_SettingsTab_heading">{ _t("Sidebar") }</div>

<div className="mx_SettingsTab_section">
<div className="mx_SidebarUserSettingsTab_subheading">{ _t("Spaces to show") }</div>
<div className="mx_SettingsTab_subheading">{ _t("Spaces to show") }</div>
<div className="mx_SettingsTab_subsectionText">
{ _t("Spaces are ways to group rooms and people. " +
"Alongside the spaces you're in, you can use some pre-built ones too.") }
Expand Down