Mastodon
/
hyperspace-desktop-client-windows-linux-macos
mirror of https://github.com/hyperspacedev/hyperspace
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #143 from travisk-codes/master 

HD-30 #done
This commit is contained in:
Marquis Kurt 2019-12-18 11:05:00 -05:00 committed by GitHub
parent 927c9c06a1 240c1e98d8
commit b18ab2be25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/pages/Settings.tsx
View File

@ -371,7 +371,7 @@ class SettingsPage extends Component<any, ISettingsState> {
this.state.federated
? ""
: "(disabled by provider)"
}`}
}`}
disabled={!this.state.federated}
/>
<FormControlLabel
@ -559,7 +559,38 @@ class SettingsPage extends Component<any, ISettingsState> {
</Toolbar>
</div>
</div>
) : null}
) : (
<div className={classes.pageHeroBackground}>
<div className={classes.pageHeroBackgroundImage} />
<div className={classes.profileContent}>
<br />
<Avatar
className={classes.settingsAvatar}
/>
<div
className={classes.profileUserBox}
style={{ margin: "auto" }}
>
<Typography
className={classes.settingsHeaderText}
color="inherit"
component="h1"
>
{'Loading...'}
</Typography>
<Typography
color="inherit"
className={classes.settingsDetailText}
component="p"
>
@{'...'}
</Typography>
</div>
<div className={classes.pageGrow} />
<Toolbar />
</div>
</div>
)}
<div className={classes.pageContentLayoutConstraints}>
<ListSubheader>Appearance</ListSubheader>
<Paper className={classes.pageListConstraints}>
@ -682,8 +713,8 @@ class SettingsPage extends Component<any, ISettingsState> {
)
? "Check your browser's notification permissions."
: browserSupportsNotificationRequests()
? "Sends a push notification when not focused."
: "Notifications aren't supported."
? "Sends a push notification when not focused."
: "Notifications aren't supported."
}
/>
<ListItemSecondaryAction>