Minor UI improvements
This commit is contained in:
		
							parent
							
								
									c1d9d149ba
								
							
						
					
					
						commit
						79ff1e8ff9
					
				@ -17,11 +17,11 @@ function NavContainer() {
 | 
				
			|||||||
        <Container className="app">
 | 
					        <Container className="app">
 | 
				
			||||||
            <NavBar/>
 | 
					            <NavBar/>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            <Route path={rp.device(":deviceId")} component={p.DevicePage}/>
 | 
					            <Switch>
 | 
				
			||||||
            <Route path={rp.messagesTest} component={p.MessagesTestPage}/>
 | 
					                <Route path={rp.device(":deviceId")} component={p.DevicePage}/>
 | 
				
			||||||
            {/*<Switch>*/}
 | 
					                <Route path={rp.messagesTest} component={p.MessagesTestPage}/>
 | 
				
			||||||
                {/*<Redirect to="/"/>*/}
 | 
					                <Redirect to="/"/>
 | 
				
			||||||
            {/*</Switch>*/}
 | 
					            </Switch>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            <MessagesView/>
 | 
					            <MessagesView/>
 | 
				
			||||||
        </Container>
 | 
					        </Container>
 | 
				
			||||||
 | 
				
			|||||||
@ -6,13 +6,7 @@
 | 
				
			|||||||
      flex-direction: row;
 | 
					      flex-direction: row;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  .ui.stackable.grid.in-container > .row > .column {
 | 
					  .ui.grid {
 | 
				
			||||||
    @media only screen and (max-width: 991px) {
 | 
					 | 
				
			||||||
      padding-left: 0 !important;
 | 
					 | 
				
			||||||
      padding-right: 0 !important;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
  .ui.stackable.grid.in-container {
 | 
					 | 
				
			||||||
    margin-top: 0;
 | 
					    margin-top: 0;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  .connectionState {
 | 
					  .connectionState {
 | 
				
			||||||
@ -46,22 +40,32 @@
 | 
				
			|||||||
  width: 20em;
 | 
					  width: 20em;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.sectionChooser {
 | 
				
			||||||
 | 
					  .ui.selection.dropdown {
 | 
				
			||||||
 | 
					    min-width: 12em;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.durationInputs {
 | 
					.durationInputs {
 | 
				
			||||||
  display: flex;
 | 
					  display: flex;
 | 
				
			||||||
 | 
					  flex-wrap: wrap;
 | 
				
			||||||
 | 
					  margin: -0.5em;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
$durationInput-labelWidth: 2.5em;
 | 
					$durationInput-labelWidth: 2.5em;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.ui.form .field .ui.input.durationInput {
 | 
					.ui.form .field .ui.input.durationInput {
 | 
				
			||||||
 | 
					  margin: 0.5em;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  &.minutes {
 | 
					  &.minutes {
 | 
				
			||||||
    margin-right: 1em;
 | 
					    //margin-right: 1em;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  &.seconds {
 | 
					  &.seconds {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  > input {
 | 
					  > input {
 | 
				
			||||||
    flex: 1 1 6em;
 | 
					    flex: 1 0 6em;
 | 
				
			||||||
    width: 100%;
 | 
					    width: 100%;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -54,12 +54,14 @@ class DeviceView extends React.Component<DeviceViewProps & RouteComponentProps<a
 | 
				
			|||||||
        const { id, connectionState, sections, sectionRunner } = device;
 | 
					        const { id, connectionState, sections, sectionRunner } = device;
 | 
				
			||||||
        const deviceBody = connectionState.isAvailable && (
 | 
					        const deviceBody = connectionState.isAvailable && (
 | 
				
			||||||
            <React.Fragment>
 | 
					            <React.Fragment>
 | 
				
			||||||
                <SectionRunnerView sectionRunner={sectionRunner} sections={sections}/>
 | 
					 | 
				
			||||||
                <Grid>
 | 
					                <Grid>
 | 
				
			||||||
                    <Grid.Column mobile="16" tablet="16" computer="8">
 | 
					                    <Grid.Column mobile="16" tablet="16" computer="16" largeScreen="6">
 | 
				
			||||||
 | 
					                        <SectionRunnerView sectionRunner={sectionRunner} sections={sections}/>
 | 
				
			||||||
 | 
					                    </Grid.Column>
 | 
				
			||||||
 | 
					                    <Grid.Column mobile="16" tablet="9" computer="9" largeScreen="6">
 | 
				
			||||||
                        <SectionTable sections={sections}/>
 | 
					                        <SectionTable sections={sections}/>
 | 
				
			||||||
                    </Grid.Column>
 | 
					                    </Grid.Column>
 | 
				
			||||||
                    <Grid.Column mobile="16" tablet="16" computer="8">
 | 
					                    <Grid.Column mobile="16" tablet="7" computer="7" largeScreen="4">
 | 
				
			||||||
                        <RunSectionForm device={device} uiStore={uiStore}/>
 | 
					                        <RunSectionForm device={device} uiStore={uiStore}/>
 | 
				
			||||||
                    </Grid.Column>
 | 
					                    </Grid.Column>
 | 
				
			||||||
                </Grid>
 | 
					                </Grid>
 | 
				
			||||||
 | 
				
			|||||||
@ -33,7 +33,7 @@ class ProgramRows extends React.Component<{
 | 
				
			|||||||
                </Table.Cell>
 | 
					                </Table.Cell>
 | 
				
			||||||
                <Table.Cell>
 | 
					                <Table.Cell>
 | 
				
			||||||
                    <Button onClick={this.cancelOrRun} {...buttonStyle} positive={!running} negative={running}>
 | 
					                    <Button onClick={this.cancelOrRun} {...buttonStyle} positive={!running} negative={running}>
 | 
				
			||||||
                        {running ? "Cancel" : "Run"}
 | 
					                        {running ? "Stop" : "Run"}
 | 
				
			||||||
                    </Button>
 | 
					                    </Button>
 | 
				
			||||||
                    <Button as={Link} to={detailUrl} {...buttonStyle} primary>
 | 
					                    <Button as={Link} to={detailUrl} {...buttonStyle} primary>
 | 
				
			||||||
                        Open
 | 
					                        Open
 | 
				
			||||||
 | 
				
			|||||||
@ -23,6 +23,7 @@ export default class SectionChooser extends React.Component<{
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
        return (
 | 
					        return (
 | 
				
			||||||
            <Form.Select
 | 
					            <Form.Select
 | 
				
			||||||
 | 
					                className="sectionChooser"
 | 
				
			||||||
                label={label}
 | 
					                label={label}
 | 
				
			||||||
                inline={inline}
 | 
					                inline={inline}
 | 
				
			||||||
                placeholder="Section"
 | 
					                placeholder="Section"
 | 
				
			||||||
 | 
				
			|||||||
@ -109,7 +109,7 @@ class SectionRunView extends React.Component<{
 | 
				
			|||||||
            <Segment className="sectionRun">
 | 
					            <Segment className="sectionRun">
 | 
				
			||||||
                <div className="flex-horizontal-space-between">
 | 
					                <div className="flex-horizontal-space-between">
 | 
				
			||||||
                    {description}
 | 
					                    {description}
 | 
				
			||||||
                    <Button onClick={cancel} icon size="mini"><Icon name="remove"/></Button>
 | 
					                    <Button negative onClick={cancel} icon size="mini"><Icon name="remove"/></Button>
 | 
				
			||||||
                </div>
 | 
					                </div>
 | 
				
			||||||
                {progressBar}
 | 
					                {progressBar}
 | 
				
			||||||
            </Segment>
 | 
					            </Segment>
 | 
				
			||||||
 | 
				
			|||||||
@ -81,7 +81,7 @@ class ProgramPage extends React.Component<{
 | 
				
			|||||||
        return (
 | 
					        return (
 | 
				
			||||||
            <Modal.Actions>
 | 
					            <Modal.Actions>
 | 
				
			||||||
                <Button positive={!running} negative={running} onClick={this.cancelOrRun}>
 | 
					                <Button positive={!running} negative={running} onClick={this.cancelOrRun}>
 | 
				
			||||||
                    {running ? "Cancel" : "Run"}
 | 
					                    {running ? "Stop" : "Run"}
 | 
				
			||||||
                </Button>
 | 
					                </Button>
 | 
				
			||||||
                {editButtons}
 | 
					                {editButtons}
 | 
				
			||||||
                <Button onClick={this.close}>
 | 
					                <Button onClick={this.close}>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user