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

Manually apply #140 (HD-29 #done)

This commit is contained in:
Marquis Kurt 2019-12-18 11:08:51 -05:00
parent b18ab2be25
commit 8a39f36039
No known key found for this signature in database
GPG Key ID: 725636D259F5402D
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/AppLayout/AppLayout.tsx
View File

@ -675,7 +675,7 @@ export class AppLayout extends Component<any, IAppLayoutState> {
variant="temporary"
anchor={"left"}
open={this.state.drawerOpenOnMobile}
onClose={this.toggleDrawerOnMobile}
onClick={this.toggleDrawerOnMobile}
classes={{ paper: classes.drawerPaper }}
>
{this.appDrawer()}

60
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
@ -560,37 +560,35 @@ class SettingsPage extends Component<any, ISettingsState> {
</div>
</div>
) : (
<div className={classes.pageHeroBackground}>
<div className={classes.pageHeroBackgroundImage} />
<div className={classes.profileContent}>
<br />
<Avatar
className={classes.settingsAvatar}
/>
<div
className={classes.profileUserBox}
style={{ margin: "auto" }}
<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"
>
<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 />
{"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}>
@ -713,8 +711,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>