PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #6962 from CicadaCinema/patch-3

Browse source
This commit is contained in:
Michael Telatynski 2021-10-18 09:17:40 +01:00 committed by GitHub
commit 4d63e1239b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/css/views/settings/_Notifications.scss
View file

@ -90,3 +90,7 @@ limitations under the License.
margin-top: 35px; // lots of distance from the last line of the table margin-top: 35px; // lots of distance from the last line of the table
} }
} }
.mx_AccessibleButton.mx_NotificationSound_browse {
margin-right: 10px;
}

6
src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
View file

@ -158,18 +158,22 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
<div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'> <div className='mx_SettingsTab_section mx_SettingsTab_subsectionText'>
<span className='mx_SettingsTab_subheading'>{ _t("Sounds") }</span> <span className='mx_SettingsTab_subheading'>{ _t("Sounds") }</span>
<div> <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"> <AccessibleButton className="mx_NotificationSound_resetSound" disabled={this.state.currentSound == "default"} onClick={this.clearSound} kind="primary">
{ _t("Reset") } { _t("Reset") }
</AccessibleButton> </AccessibleButton>
</div> </div>
<div> <div>
<h3>{ _t("Set a new custom sound") }</h3> <h3>{ _t("Set a new custom sound") }</h3>
<div className="mx_SettingsFlag">
<form autoComplete="off" noValidate={true}> <form autoComplete="off" noValidate={true}>
<input ref={this.soundUpload} className="mx_NotificationSound_soundUpload" type="file" onChange={this.onSoundUploadChanged} accept="audio/*" /> <input ref={this.soundUpload} className="mx_NotificationSound_soundUpload" type="file" onChange={this.onSoundUploadChanged} accept="audio/*" />
</form> </form>
{ currentUploadedFile } { currentUploadedFile }
</div>
<AccessibleButton className="mx_NotificationSound_browse" onClick={this.triggerUploader} kind="primary"> <AccessibleButton className="mx_NotificationSound_browse" onClick={this.triggerUploader} kind="primary">
{ _t("Browse") } { _t("Browse") }