aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #423 from yuya-oc/issue400-part1

Browse source 
Tweak for part 1 of #400
This commit is contained in:
Yuya Ochiai 2017-01-31 22:22:52 +09:00 committed by GitHub
parent 83a9d21d34 396fa378ee
commit b057ba8655
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/browser/components/SettingsPage.jsx
View file

@ -33,6 +33,7 @@ const SettingsPage = React.createClass({
initialState.showAddTeamForm = false; initialState.showAddTeamForm = false;
initialState.trayWasVisible = remote.getCurrentWindow().trayWasVisible; initialState.trayWasVisible = remote.getCurrentWindow().trayWasVisible;
initialState.disableClose = initialState.teams.length === 0;
return initialState; return initialState;
}, },
@ -275,13 +276,13 @@ const SettingsPage = React.createClass({
backgroundColor: '#fff' backgroundColor: '#fff'
}, },
close: { close: {
textDecoration: 'none',
position: 'absolute', position: 'absolute',
right: '0', right: '0',
top: '10px', top: '5px',
fontSize: '35px', fontSize: '35px',
fontWeight: 'normal', fontWeight: 'normal',
color: '#bbb', color: '#bbb'
cursor: 'pointer'
}, },
heading: { heading: {
textAlign: 'center', textAlign: 'center',
@ -325,12 +326,14 @@ const SettingsPage = React.createClass({
> >
<div style={{position: 'relative'}}> <div style={{position: 'relative'}}>
<h1 style={settingsPage.heading}>{'Settings'}</h1> <h1 style={settingsPage.heading}>{'Settings'}</h1>
<div <Button
bsStyle='link'
style={settingsPage.close} style={settingsPage.close}
onClick={this.handleCancel} onClick={this.handleCancel}
disabled={this.state.disableClose}
> >
<span>{'×'}</span> <span>{'×'}</span>
</div> </Button>
</div> </div>
</Navbar> </Navbar>
<Grid <Grid
@ -342,7 +345,7 @@ const SettingsPage = React.createClass({
md={10} md={10}
xs={8} xs={8}
> >
<h2 style={settingsPage.sectionHeading}>{'Team Management'}</h2> <h2 style={settingsPage.sectionHeading}>{'Server Management'}</h2>
</Col> </Col>
<Col <Col
md={2} md={2}
@ -353,7 +356,7 @@ const SettingsPage = React.createClass({
style={settingsPage.sectionHeadingLink} style={settingsPage.sectionHeadingLink}
href='#' href='#'
onClick={this.toggleShowTeamForm} onClick={this.toggleShowTeamForm}
>{'⊞ Add new team'}</a> >{'⊞ Add new server'}</a>
</p> </p>
</Col> </Col>
</Row> </Row>