more progress

This commit is contained in:
Feross Aboukhadijeh
2016-08-23 04:21:58 -07:00
parent 157226f75b
commit 82853aa017
4 changed files with 32 additions and 34 deletions

View File

@@ -39,7 +39,9 @@ class ShowMore extends React.Component {
? this.props.hideLabel ? this.props.hideLabel
: this.props.showLabel : this.props.showLabel
return ( return (
<div> <div
style={this.props.style}
>
{this.state.expanded ? this.props.children : null} {this.state.expanded ? this.props.children : null}
<FlatButton <FlatButton
onClick={this.handleClick} onClick={this.handleClick}

View File

@@ -1,3 +1,4 @@
const colors = require('material-ui/styles/colors')
const React = require('react') const React = require('react')
const darkBaseTheme = require('material-ui/styles/baseThemes/darkBaseTheme').default const darkBaseTheme = require('material-ui/styles/baseThemes/darkBaseTheme').default
@@ -20,11 +21,15 @@ const Modals = {
'unsupported-media-modal': require('../components/unsupported-media-modal') 'unsupported-media-modal': require('../components/unsupported-media-modal')
} }
const MUI_THEME = getMuiTheme(Object.assign(darkBaseTheme, { darkBaseTheme.fontFamily = process.platform === 'win32'
fontFamily: process.platform === 'win32' ? '"Segoe UI", sans-serif'
? '\'Segoe UI\', sans-serif' : 'BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif'
: 'BlinkMacSystemFont, \'Helvetica Neue\', Helvetica, sans-serif' darkBaseTheme.palette.primary1Color = colors.cyan500
})) darkBaseTheme.palette.primary2Color = colors.cyan500
darkBaseTheme.palette.primary3Color = colors.grey600
darkBaseTheme.palette.accent1Color = colors.redA200
darkBaseTheme.palette.accent2Color = colors.redA400
darkBaseTheme.palette.accent3Color = colors.redA100
class App extends React.Component { class App extends React.Component {
render () { render () {
@@ -51,7 +56,7 @@ class App extends React.Component {
if (hideControls) cls.push('hide-video-controls') if (hideControls) cls.push('hide-video-controls')
var vdom = ( var vdom = (
<MuiThemeProvider muiTheme={MUI_THEME}> <MuiThemeProvider muiTheme={getMuiTheme(darkBaseTheme)}>
<div className={'app ' + cls.join(' ')}> <div className={'app ' + cls.join(' ')}>
<Header state={state} /> <Header state={state} />
{this.getErrorPopover()} {this.getErrorPopover()}

View File

@@ -5,6 +5,8 @@ const React = require('react')
const {dispatch, dispatcher} = require('../lib/dispatcher') const {dispatch, dispatcher} = require('../lib/dispatcher')
const FlatButton = require('material-ui/FlatButton').default
const RaisedButton = require('material-ui/RaisedButton').default
const TextField = require('material-ui/TextField').default const TextField = require('material-ui/TextField').default
const CreateTorrentErrorPage = require('../components/create-torrent-error-page') const CreateTorrentErrorPage = require('../components/create-torrent-error-page')
@@ -107,6 +109,9 @@ class CreateTorrentPage extends React.Component {
<div className='torrent-attribute'>{this.state.pathPrefix}</div> <div className='torrent-attribute'>{this.state.pathPrefix}</div>
</div> </div>
<ShowMore <ShowMore
style={{
marginBottom: 10
}}
hideLabel='Hide advanced settings...' hideLabel='Hide advanced settings...'
showLabel='Show advanced settings...' showLabel='Show advanced settings...'
> >
@@ -134,9 +139,19 @@ class CreateTorrentPage extends React.Component {
</div> </div>
</div> </div>
</ShowMore> </ShowMore>
<div key='buttons' className='float-right'> <div className='float-right'>
<button key='cancel' className='button-flat light' onClick={dispatcher('cancel')}>Cancel</button> <FlatButton
<button key='create' className='button-raised' onClick={this.handleSubmit}>Create Torrent</button> label='Cancel'
style={{
marginRight: 10
}}
onClick={dispatcher('cancel')}
/>
<RaisedButton
label='Create Torrent'
primary
onClick={this.handleSubmit}
/>
</div> </div>
</div> </div>
) )

View File

@@ -124,10 +124,6 @@ table {
* UTILITY CLASSES * UTILITY CLASSES
*/ */
.clickable {
cursor: pointer;
}
.ellipsis { .ellipsis {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
@@ -142,26 +138,6 @@ table {
float: right; float: right;
} }
.expand-collapse.expanded::before {
content: '▲'
}
.expand-collapse.collapsed::before {
content: '▼'
}
.expand-collapse::before {
margin-right: 5px;
}
.expand-collapse.collapsed {
display: block;
}
.collapsed {
display: none;
}
/* /*
* HEADER * HEADER
*/ */