Mirrors/VILLASweb
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00
Code Issues Releases Wiki Activity

Change link and button color scheme #276

Browse source
This commit is contained in:
Laura Fuentes Grau 2021-01-03 18:54:28 +01:00
parent aef3694d1d
commit e45de4fc64
5 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/file/edit-files.js
View file

@ -145,6 +145,7 @@ class EditFilesDialog extends React.Component {
<FormGroup as={Col} >
<Button
style={{ backgroundColor: '#527984', borderColor: '#527984'}}
disabled={this.state.uploadFile === null}
onClick={() => this.startFileUpload()}>
Upload

13
src/ic/ic-action.js
View file

@ -16,7 +16,7 @@
******************************************************************************/
import React from 'react';
import { Button, ButtonToolbar, DropdownButton, Dropdown } from 'react-bootstrap';
import { Button, ButtonToolbar, Dropdown } from 'react-bootstrap';
import TimePicker from 'react-bootstrap-time-picker'
class ICAction extends React.Component {
@ -76,9 +76,12 @@ class ICAction extends React.Component {
onChange={this.setDelayForAction}
/>
<ButtonToolbar>
<DropdownButton variant="secondary" title={this.state.selectedAction != null ? this.state.selectedAction.title : ''} id="action-dropdown" onSelect={this.setAction}>
{actionList}
</DropdownButton>
<Dropdown onSelect={this.setAction}>
<Dropdown.Toggle id={'action-dropdown'} style={{backgroundColor: '#527984', borderColor: '#527984'}}> {this.state.selectedAction != null ? this.state.selectedAction.title : ''}</Dropdown.Toggle>
<Dropdown.Menu>
{actionList}
</Dropdown.Menu>
</Dropdown>
<Button style={{ marginLeft: '5px', backgroundColor: '#527984', borderColor: '#527984' }} disabled={sendCommandDisabled} onClick={() => this.props.runAction(this.state.selectedAction, this.state.selectedDelay)}>Send command</Button>
@ -87,4 +90,4 @@ class ICAction extends React.Component {
}
}
export default ICAction;
export default ICAction;

4
src/signal/edit-signal-mapping.js
View file

@ -176,7 +176,9 @@ class EditSignalMapping extends React.Component {
render() {
const buttonStyle = {
marginLeft: '10px'
marginLeft: '10px',
backgroundColor: '#527984',
borderColor: '#527984'
};
return(

2
src/user/login-form.js
View file

@ -92,7 +92,7 @@ class LoginForm extends Component {
<FormGroup style={{paddingTop: 15, paddingBottom: 5}}>
<Col>
<Button style={{width: 90, backgroundColor: '#527984', borderColor: '#527984'}} type="submit" disabled={this.state.disableLogin} onClick={e => this.login(e)}>Login</Button>
<Button variant="link" size="sm" style={{marginLeft: 85}} onClick={() => this.openRecoverPassword()}>Forgot your password?</Button>
<Button variant="link" size="sm" style={{marginLeft: 85, color: '#047cab'}} onClick={() => this.openRecoverPassword()}>Forgot your password?</Button>
</Col>
</FormGroup>

16
src/widget/edit-widget/edit-widget-color-zones-control.js
View file

@ -175,6 +175,18 @@ class EditWidgetColorZonesControl extends React.Component {
render() {
const buttonStyle = {
marginBottom: '10px',
marginLeft: '120px',
borderColor: '#ffffff',
backgroundColor: '#ffffff'
};
const iconStyle = {
color: '#527984',
height: '25px',
width : '25px'
}
let tempColor = 'FFFFFF';
let collapse = false;
@ -192,7 +204,7 @@ class EditWidgetColorZonesControl extends React.Component {
return <FormGroup>
<FormLabel>Color zones</FormLabel>
<Button onClick={this.addZone} style={{marginBottom: '10px', marginLeft: '120px'}} disabled={!this.props.widget.customProperties.colorZones}><Icon size='xs' icon="plus" /></Button>
<Button onClick={this.addZone} style={buttonStyle} disabled={!this.props.widget.customProperties.colorZones}><Icon icon="plus" style={iconStyle} /></Button>
<div>
{
@ -245,7 +257,7 @@ class EditWidgetColorZonesControl extends React.Component {
</tr>
</tbody>
</Table>
<Button onClick={this.removeZones}><Icon size='xs' icon="trash-alt" /></Button>
<Button onClick={this.removeZones} style={{borderColor: '#ffffff', backgroundColor: '#ffffff'}} ><Icon style={iconStyle} icon="trash-alt" /></Button>
</Collapse>
<ColorPicker show={this.state.showColorPicker} onClose={(data) => this.closeEditModal(data)} widget={this.state.widget} zoneIndex={this.state.selectedIndex} controlId={'strokeStyle'} />