From e45de4fc643981342ee5594a502f9973919412f2 Mon Sep 17 00:00:00 2001
From: Laura Fuentes Grau <laurafuentesgrau@gmail.com>
Date: Sun, 3 Jan 2021 18:54:28 +0100
Subject: [PATCH] Change link and button color scheme #276

---
 src/file/edit-files.js                           |  1 +
 src/ic/ic-action.js                              | 13 ++++++++-----
 src/signal/edit-signal-mapping.js                |  4 +++-
 src/user/login-form.js                           |  2 +-
 .../edit-widget-color-zones-control.js           | 16 ++++++++++++++--
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/file/edit-files.js b/src/file/edit-files.js
index 8cc3421..585db3e 100644
--- a/src/file/edit-files.js
+++ b/src/file/edit-files.js
@@ -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
diff --git a/src/ic/ic-action.js b/src/ic/ic-action.js
index 3647662..e18ba54 100644
--- a/src/ic/ic-action.js
+++ b/src/ic/ic-action.js
@@ -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;
\ No newline at end of file
diff --git a/src/signal/edit-signal-mapping.js b/src/signal/edit-signal-mapping.js
index 82a8442..10980ae 100644
--- a/src/signal/edit-signal-mapping.js
+++ b/src/signal/edit-signal-mapping.js
@@ -176,7 +176,9 @@ class EditSignalMapping extends React.Component {
   render() {
 
       const buttonStyle = {
-        marginLeft: '10px'
+        marginLeft: '10px',
+        backgroundColor: '#527984', 
+        borderColor: '#527984'
       };
 
       return(
diff --git a/src/user/login-form.js b/src/user/login-form.js
index a270977..e828de3 100644
--- a/src/user/login-form.js
+++ b/src/user/login-form.js
@@ -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>
         
diff --git a/src/widget/edit-widget/edit-widget-color-zones-control.js b/src/widget/edit-widget/edit-widget-color-zones-control.js
index 4ade39f..1fca8d3 100644
--- a/src/widget/edit-widget/edit-widget-color-zones-control.js
+++ b/src/widget/edit-widget/edit-widget-color-zones-control.js
@@ -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'} />