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

Commit

Permalink
Merge pull request #6962 from CicadaCinema/patch-3
Browse files Browse the repository at this point in the history
  • Loading branch information
t3chguy authored Oct 18, 2021
2 parents d93c220 + a9c9e5b commit 4d63e12
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
4 changes: 4 additions & 0 deletions res/css/views/settings/_Notifications.scss
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;
}
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

0 comments on commit 4d63e12

Please sign in to comment.