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

Add spacing to Room settings - Notifications subsection #6962

Merged
merged 2 commits into from
Oct 18, 2021
Merged

Add spacing to Room settings - Notifications subsection #6962

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
7b89336
Add spacing to Room settings - Notifications subsection
CicadaCinema Oct 16, 2021
a9c9e5b
appease the linter
CicadaCinema Oct 16, 2021
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
4 changes: 4 additions & 0 deletions res/css/views/settings/_Notifications.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,7 @@ limitations under the License.
margin-top: 35px; // lots of distance from the last line of the table
}
}

.mx_AccessibleButton.mx_NotificationSound_browse {
margin-right: 10px;
}
14 changes: 9 additions & 5 deletions src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,18 +158,22 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
<div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
<span className='mx_SettingsTab_subheading'>{ _t("Sounds") }</span>
<div>
<span>{ _t("Notification sound") }: <code>{ this.state.currentSound }</code></span><br />
<div className="mx_SettingsTab_subsectionText">
<span>{ _t("Notification sound") }: <code>{ this.state.currentSound }</code></span>
</div>
<AccessibleButton className="mx_NotificationSound_resetSound" disabled={this.state.currentSound == "default"} onClick={this.clearSound} kind="primary">
{ _t("Reset") }
</AccessibleButton>
</div>
<div>
<h3>{ _t("Set a new custom sound") }</h3>
<form autoComplete="off" noValidate={true}>
<input ref={this.soundUpload} className="mx_NotificationSound_soundUpload" type="file" onChange={this.onSoundUploadChanged} accept="audio/*" />
</form>
<div className="mx_SettingsFlag">
<form autoComplete="off" noValidate={true}>
<input ref={this.soundUpload} className="mx_NotificationSound_soundUpload" type="file" onChange={this.onSoundUploadChanged} accept="audio/*" />
</form>

{ currentUploadedFile }
{ currentUploadedFile }
</div>

<AccessibleButton className="mx_NotificationSound_browse" onClick={this.triggerUploader} kind="primary">
{ _t("Browse") }
Expand Down