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

Round 1 of misc fixes for settings #2526

Merged
merged 4 commits into from
Jan 30, 2019
Merged

Round 1 of misc fixes for settings #2526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0591c3a
Change Riot Bot button text and make it a block element
turt2live Jan 30, 2019
2aee2df
Fix usage of semibold fonts
turt2live Jan 30, 2019
f050323
Inherit font size from other elements for push notifications table
turt2live Jan 30, 2019
4d0a246
Put a little padding between section headings
turt2live Jan 30, 2019
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
1 change: 1 addition & 0 deletions res/css/_components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
@import "./views/settings/tabs/_GeneralRoomSettingsTab.scss";
@import "./views/settings/tabs/_GeneralUserSettingsTab.scss";
@import "./views/settings/tabs/_HelpSettingsTab.scss";
@import "./views/settings/tabs/_NotificationSettingsTab.scss";
@import "./views/settings/tabs/_PreferencesSettingsTab.scss";
@import "./views/settings/tabs/_SecuritySettingsTab.scss";
@import "./views/settings/tabs/_SettingsTab.scss";
Expand Down
2 changes: 0 additions & 2 deletions res/css/views/settings/_Notifications.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,10 @@ limitations under the License.

.mx_UserNotifSettings_pushRulesTable thead {
font-weight: bold;
font-size: 15px;
}

.mx_UserNotifSettings_pushRulesTable tbody th {
font-weight: 400;
font-size: 15px;
}

.mx_UserNotifSettings_pushRulesTable tbody th:first-child {
Expand Down
19 changes: 19 additions & 0 deletions res/css/views/settings/tabs/_NotificationSettingsTab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
Copyright 2019 New Vector Ltd

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_NotificationSettingsTab .mx_SettingsTab_heading {
margin-bottom: 10px; // Give some spacing between the title and the first elements
Copy link
Collaborator

Choose a reason for hiding this comment

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

Style nit: Use 4 space indentation.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm going to fix all of the CSS I've added for settings in one go because they're all at 2 spaces.

}
11 changes: 9 additions & 2 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 @@ -23,7 +23,8 @@ limitations under the License.
.mx_SettingsTab_subheading {
font-size: 14px;
display: block;
font-family: $font-family-semibold;
font-family: $font-family;
font-weight: 600;
color: $primary-fg-color;
margin-bottom: 10px;
margin-top: 12px;
Expand Down Expand Up @@ -59,4 +60,10 @@ limitations under the License.
cursor: pointer;
color: $accent-color;
word-break: break-all;
}
}

.mx_SettingsTab .mx_SettingsTab_subheading:nth-child(n + 2) {
// These views have a lot of the same repetitive information on it, so
// give them more visual distinction between the sections.
margin-top: 30px;
}
1 change: 0 additions & 1 deletion res/themes/dharma/css/_dharma.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
horizontal mess. Arial empirically gets it right, hence prioritising
Arial here. */
$font-family: 'Nunito', Arial, Helvetica, Sans-Serif;
$font-family-semibold: 'Nunito SemiBold', Arial, Helvetica, Sans-Serif;

// typical text (dark-on-white in light skin)
$primary-fg-color: #454545;
Expand Down
1 change: 0 additions & 1 deletion res/themes/light/css/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
horizontal mess. Arial empirically gets it right, hence prioritising
Arial here. */
$font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
$font-family-semibold: 'Open Sans', Arial, Helvetica, Sans-Serif;

// typical text (dark-on-white in light skin)
$primary-fg-color: #454545;
Expand Down
8 changes: 5 additions & 3 deletions src/components/views/settings/tabs/HelpSettingsTab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,11 @@ export default class HelpSettingsTab extends React.Component {
target='_blank'>{sub}</a>,
})
}
<AccessibleButton onClick={this._onStartBotChat} kind='primary'>
{_t("Start a chat with Riot Bot")}
</AccessibleButton>
<div>
<AccessibleButton onClick={this._onStartBotChat} kind='primary'>
{_t("Chat with Riot Bot")}
</AccessibleButton>
</div>
</div>
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/views/settings/tabs/NotificationSettingsTab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export default class NotificationSettingsTab extends React.Component {
render() {
const Notifications = sdk.getComponent("views.settings.Notifications");
return (
<div className="mx_SettingsTab">
<div className="mx_SettingsTab mx_NotificationSettingsTab">
<div className="mx_SettingsTab_heading">{_t("Notifications")}</div>
<div className="mx_SettingsTab_section">
<div className="mx_SettingsTab_section mx_SettingsTab_subsectionText">
<Notifications />
</div>
</div>
Expand Down