From 4adc277eb319e52cae790628462cb2cd800560b1 Mon Sep 17 00:00:00 2001 From: Laura Fuentes Grau Date: Mon, 28 Dec 2020 14:27:34 +0100 Subject: [PATCH 1/5] WIP: change button color scheme #276 --- src/common/dialogs/dialog.js | 10 ++++-- src/dashboard/dashboard-button-group.js | 6 ++-- src/dashboard/dashboard.js | 2 +- src/ic/ic-action.js | 2 +- src/ic/ics.js | 4 ++- src/scenario/scenario.js | 15 +++++++-- src/scenario/scenarios.js | 4 ++- src/user/login-form.js | 2 +- src/user/user.js | 45 +++++++++++++------------ src/user/users.js | 2 +- src/widget/toolbox-item.js | 2 +- src/widget/widget-toolbox.js | 32 +++++++++++++----- 12 files changed, 82 insertions(+), 44 deletions(-) diff --git a/src/common/dialogs/dialog.js b/src/common/dialogs/dialog.js index 4cc15af..741ecaf 100644 --- a/src/common/dialogs/dialog.js +++ b/src/common/dialogs/dialog.js @@ -45,6 +45,12 @@ class Dialog extends React.Component { } render() { + const buttonStyle = { + backgroundColor: '#527984', + borderColor: '#527984' + }; + + return ( @@ -56,8 +62,8 @@ class Dialog extends React.Component { - {this.props.blendOutCancel?
: } - + {this.props.blendOutCancel?
: } + ); diff --git a/src/dashboard/dashboard-button-group.js b/src/dashboard/dashboard-button-group.js index 7f49292..9f3e1a0 100644 --- a/src/dashboard/dashboard-button-group.js +++ b/src/dashboard/dashboard-button-group.js @@ -25,11 +25,13 @@ class DashboardButtonGroup extends React.Component { const buttonStyle = { marginLeft: '12px', height: '44px', - width : '35px' + width : '35px', + borderColor: '#ffffff', + backgroundColor: '#ffffff' }; const iconStyle = { - color: '#007bff', + color: '#527984', height: '25px', width : '25px' } diff --git a/src/dashboard/dashboard.js b/src/dashboard/dashboard.js index 19bfd36..9f94192 100644 --- a/src/dashboard/dashboard.js +++ b/src/dashboard/dashboard.js @@ -478,7 +478,7 @@ class Dashboard extends Component { return
- {this.state.dashboard.name} +

{this.state.dashboard.name}

- +
; diff --git a/src/ic/ics.js b/src/ic/ics.js index 0d43077..2bf666f 100644 --- a/src/ic/ics.js +++ b/src/ic/ics.js @@ -328,7 +328,9 @@ class InfrastructureComponents extends Component { render() { const buttonStyle = { - marginLeft: '10px' + marginLeft: '10px', + backgroundColor: '#527984', + borderColor: '#527984' }; return ( diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js index c19cfaa..3e6bf83 100644 --- a/src/scenario/scenario.js +++ b/src/scenario/scenario.js @@ -596,15 +596,23 @@ class Scenario extends React.Component { } const buttonStyle = { - marginLeft: '10px' + marginLeft: '10px', + backgroundColor: '#527984', + borderColor: '#527984' }; + const altButtonStyle = { + marginLeft: '10px', + backgroundColor: '#ffffff', + borderColor: 'ffffff' + } + const tableHeadingStyle = { paddingTop: '30px' } const iconStyle = { - color: '#007bff', + color: '#527984', height: '25px', width: '25px' } @@ -616,7 +624,7 @@ class Scenario extends React.Component { return
Add, edit or delete files of scenario } > - @@ -785,6 +793,7 @@ class Scenario extends React.Component { diff --git a/src/scenario/scenarios.js b/src/scenario/scenarios.js index d176d0f..64ad762 100644 --- a/src/scenario/scenarios.js +++ b/src/scenario/scenarios.js @@ -236,7 +236,9 @@ class Scenarios extends 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 1c2fc5e..a270977 100644 --- a/src/user/login-form.js +++ b/src/user/login-form.js @@ -91,7 +91,7 @@ class LoginForm extends Component { - + diff --git a/src/user/user.js b/src/user/user.js index 850b663..974f7f2 100644 --- a/src/user/user.js +++ b/src/user/user.js @@ -17,7 +17,7 @@ import React, { Component } from 'react'; import { Container } from 'flux/utils'; -import {Button, Col, Row} from 'react-bootstrap'; +import {Button, Col, Row, FormGroup, FormLabel} from 'react-bootstrap'; import AppDispatcher from '../common/app-dispatcher'; import UsersStore from './users-store'; @@ -121,6 +121,16 @@ class User extends Component { render() { + const iconStyle = { + color: '#527984', + } + + const buttonStyle = { + margin: '10px', + borderColor: '#ffffff', + backgroundColor: '#ffffff' + } + return (

Your User Account

@@ -128,27 +138,23 @@ class User extends Component { {this.state.currentUser !== undefined && this.state.currentUser !== null ?
+ - Username: - {this.state.currentUser.username} + +
Username:
+
E-mail:
+
Role:
+ + +
{this.state.currentUser.username}
+
{this.state.currentUser.mail}
+
{this.state.currentUser.role}
+ + - - - E-mail: - {this.state.currentUser.mail} - - - - Role: - {this.state.currentUser.role} - - - - - this.closeEditModal(data)} - user={this.state.currentUser}/> + user={this.state.currentUser} /> : "Loading user data..." } @@ -157,8 +163,5 @@ class User extends Component { } } - - - let fluxContainerConverter = require('../common/FluxContainerConverter'); export default Container.create(fluxContainerConverter.convert(User)); diff --git a/src/user/users.js b/src/user/users.js index f6f03df..acde3bf 100644 --- a/src/user/users.js +++ b/src/user/users.js @@ -146,7 +146,7 @@ class Users extends Component { this.setState({ editModal: true, modalData: this.state.users[index] })} onDelete={index => this.setState({ deleteModal: true, modalData: this.state.users[index] })} /> - + this.closeNewModal(data)} /> this.closeEditModal(data)} user={this.state.modalData} /> diff --git a/src/widget/toolbox-item.js b/src/widget/toolbox-item.js index f1ebb93..e2aa402 100644 --- a/src/widget/toolbox-item.js +++ b/src/widget/toolbox-item.js @@ -51,7 +51,7 @@ class ToolboxItem extends React.Component { if (this.props.disabled === false) { return this.props.connectDragSource(
- + {this.props.icon && } {this.props.name} diff --git a/src/widget/widget-toolbox.js b/src/widget/widget-toolbox.js index 9b057ec..a2d231a 100644 --- a/src/widget/widget-toolbox.js +++ b/src/widget/widget-toolbox.js @@ -96,11 +96,25 @@ class WidgetToolbox extends React.Component { const disableDecrease = this.disableDecrease(); // Only one topology widget at the time is supported const iconStyle = { - color: '#007bff', + color: '#527984', height: '25px', width : '25px' } + const buttonStyle = { + marginRight: '3px', + height: '40px', + borderColor: '#527984', + backgroundColor: '#527984' + } + + const altButtonStyle = { + marginRight: '3px', + height: '40px', + borderColor: '#ffffff', + backgroundColor: '#ffffff' + } + const thereIsTopologyWidget = this.props.widgets != null && Object.values(this.props.widgets).filter(w => w.type === 'Topology').length > 0; const topologyItemMsg = thereIsTopologyWidget? 'Currently only one is supported' : ''; @@ -110,16 +124,16 @@ class WidgetToolbox extends React.Component {
Show/ hide available Cosmetic Widgets } > - + Show/ hide available Displaying Widgets } > - + Show/ hide available Manipulation Widgets } > - +
@@ -128,12 +142,12 @@ class WidgetToolbox extends React.Component { Grid: { this.props.grid > 1 ? this.props.grid : 'Disabled' } Increase dashboard height } > - Decrease dashboard height } > - From a6d9edde593a24d722d7dfd92f6e91879ff1b19a Mon Sep 17 00:00:00 2001 From: Laura Fuentes Grau Date: Mon, 28 Dec 2020 14:48:33 +0100 Subject: [PATCH 2/5] WIP: change DropdownButton color --- src/ic/ic-action.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ic/ic-action.js b/src/ic/ic-action.js index 82dea64..3647662 100644 --- a/src/ic/ic-action.js +++ b/src/ic/ic-action.js @@ -76,7 +76,7 @@ class ICAction extends React.Component { onChange={this.setDelayForAction} /> - + {actionList} From aef3694d1d1e8ee096fc3c3d9ca8c7f7e081f81c Mon Sep 17 00:00:00 2001 From: Laura Fuentes Grau Date: Wed, 30 Dec 2020 17:30:50 +0100 Subject: [PATCH 3/5] change link color scheme, resolve warnings, change account site layout #276 --- src/common/dialogs/delete-dialog.js | 2 +- src/dashboard/edit-dashboard.js | 2 +- src/dashboard/new-dashboard.js | 2 +- src/ic/ics.js | 2 +- src/ic/import-ic.js | 4 ++-- src/scenario/scenario.js | 2 +- src/styles/app.css | 4 ++++ src/user/user.js | 4 ++-- 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/common/dialogs/delete-dialog.js b/src/common/dialogs/delete-dialog.js index 8d114f4..179b3cd 100644 --- a/src/common/dialogs/delete-dialog.js +++ b/src/common/dialogs/delete-dialog.js @@ -42,7 +42,7 @@ class DeleteDialog extends React.Component { - + ; diff --git a/src/dashboard/edit-dashboard.js b/src/dashboard/edit-dashboard.js index cb062ce..2df61bf 100644 --- a/src/dashboard/edit-dashboard.js +++ b/src/dashboard/edit-dashboard.js @@ -73,7 +73,7 @@ class EditDashboardDialog extends React.Component { return ( this.onClose(c)} onReset={() => this.resetState()} valid={this.valid}>
- + Name this.handleChange(e)} /> diff --git a/src/dashboard/new-dashboard.js b/src/dashboard/new-dashboard.js index 6f4b9da..a023ba4 100644 --- a/src/dashboard/new-dashboard.js +++ b/src/dashboard/new-dashboard.js @@ -69,7 +69,7 @@ class NewDashboardDialog extends React.Component { return ( this.onClose(c)} onReset={() => this.resetState()} valid={this.valid}> - + Name this.handleChange(e)} /> diff --git a/src/ic/ics.js b/src/ic/ics.js index 2bf666f..2074f5d 100644 --- a/src/ic/ics.js +++ b/src/ic/ics.js @@ -320,7 +320,7 @@ class InfrastructureComponents extends Component { let ic = this.state.ics.find(ic => ic.name === name); let index = this.state.ics.indexOf(ic); if(ic.type === "villas-node" || ic.type === "villas-relay"){ - return } + return } else{ return {name} } diff --git a/src/ic/import-ic.js b/src/ic/import-ic.js index bde1d9a..a165af6 100644 --- a/src/ic/import-ic.js +++ b/src/ic/import-ic.js @@ -118,7 +118,7 @@ class ImportICDialog extends React.Component { this.loadFile(e.target.files)} /> - + Name this.handleChange(e)} /> @@ -128,7 +128,7 @@ class ImportICDialog extends React.Component { this.handleChange(e)} /> - + UUID this.handleChange(e)} /> diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js index 3e6bf83..185590a 100644 --- a/src/scenario/scenario.js +++ b/src/scenario/scenario.js @@ -604,7 +604,7 @@ class Scenario extends React.Component { const altButtonStyle = { marginLeft: '10px', backgroundColor: '#ffffff', - borderColor: 'ffffff' + borderColor: '#ffffff' } const tableHeadingStyle = { diff --git a/src/styles/app.css b/src/styles/app.css index a2d887d..c607fb0 100644 --- a/src/styles/app.css +++ b/src/styles/app.css @@ -388,3 +388,7 @@ body { .badge-outdated { opacity: 0.4; } + +a:link, a:active, a:visited , a:hover { + color: #047cab ; +} diff --git a/src/user/user.js b/src/user/user.js index 974f7f2..72428ba 100644 --- a/src/user/user.js +++ b/src/user/user.js @@ -140,12 +140,12 @@ class User extends Component { - +
Username:
E-mail:
Role:
 - +
{this.state.currentUser.username}
{this.state.currentUser.mail}
{this.state.currentUser.role}
From e45de4fc643981342ee5594a502f9973919412f2 Mon Sep 17 00:00:00 2001 From: Laura Fuentes Grau Date: Sun, 3 Jan 2021 18:54:28 +0100 Subject: [PATCH 4/5] 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 { @@ -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 { - + 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 Color zones - +
{ @@ -245,7 +257,7 @@ class EditWidgetColorZonesControl extends React.Component { - + this.closeEditModal(data)} widget={this.state.widget} zoneIndex={this.state.selectedIndex} controlId={'strokeStyle'} /> From 1804648d6abd35920a7c50bd0c47260bd5256ae9 Mon Sep 17 00:00:00 2001 From: Laura Fuentes Grau Date: Mon, 22 Feb 2021 03:13:50 +0100 Subject: [PATCH 5/5] implement new button colors with css #276 --- src/common/dialogs/delete-dialog.js | 4 +- src/common/dialogs/dialog.js | 11 ++-- src/common/icon.js | 2 +- src/dashboard/dashboard-button-group.js | 27 ++++---- src/file/edit-files.js | 4 +- src/ic/ic-action.js | 8 +-- src/ic/ic-dialog.js | 6 +- src/ic/ics.js | 11 ++-- src/scenario/scenario.js | 34 +++++----- src/scenario/scenarios.js | 9 ++- src/signal/edit-signal-mapping.js | 10 ++- src/styles/app.css | 66 +++++++++++++++++-- src/user/login-form.js | 6 +- src/user/user.js | 13 +--- src/user/users.js | 7 +- .../edit-widget-color-zones-control.js | 12 ++-- src/widget/toolbox-item.js | 2 +- src/widget/widget-toolbox.js | 26 +++----- 18 files changed, 146 insertions(+), 112 deletions(-) diff --git a/src/common/dialogs/delete-dialog.js b/src/common/dialogs/delete-dialog.js index 179b3cd..b99f2af 100644 --- a/src/common/dialogs/delete-dialog.js +++ b/src/common/dialogs/delete-dialog.js @@ -42,7 +42,9 @@ class DeleteDialog extends React.Component { - + + + ; diff --git a/src/common/dialogs/dialog.js b/src/common/dialogs/dialog.js index 741ecaf..071a58e 100644 --- a/src/common/dialogs/dialog.js +++ b/src/common/dialogs/dialog.js @@ -45,11 +45,6 @@ class Dialog extends React.Component { } render() { - const buttonStyle = { - backgroundColor: '#527984', - borderColor: '#527984' - }; - return ( @@ -62,8 +57,10 @@ class Dialog extends React.Component { - {this.props.blendOutCancel?
: } - + + {this.props.blendOutCancel?
: } + + ); diff --git a/src/common/icon.js b/src/common/icon.js index 1ad1701..25155b4 100644 --- a/src/common/icon.js +++ b/src/common/icon.js @@ -28,7 +28,7 @@ library.add(fas); class Icon extends React.Component { render() { - return + return } } diff --git a/src/dashboard/dashboard-button-group.js b/src/dashboard/dashboard-button-group.js index 9d171c6..20a8994 100644 --- a/src/dashboard/dashboard-button-group.js +++ b/src/dashboard/dashboard-button-group.js @@ -26,12 +26,9 @@ class DashboardButtonGroup extends React.Component { marginLeft: '12px', height: '44px', width : '35px', - borderColor: '#ffffff', - backgroundColor: '#ffffff' }; const iconStyle = { - color: '#527984', height: '25px', width : '25px' } @@ -47,21 +44,22 @@ class DashboardButtonGroup extends React.Component { buttons.push( Save changes } > , Discard changes } > ); } else { if (this.props.fullscreen !== true) { buttons.push( + Change to fullscreen view } > ); @@ -69,7 +67,7 @@ class DashboardButtonGroup extends React.Component { buttons.push( Back to normal view } > ); @@ -79,7 +77,7 @@ class DashboardButtonGroup extends React.Component { buttons.push( Continue simulation } > ); @@ -87,7 +85,7 @@ class DashboardButtonGroup extends React.Component { buttons.push( Pause simulation } > ); @@ -98,16 +96,15 @@ class DashboardButtonGroup extends React.Component { Add, edit or delete files of scenario }> ); buttons.push( - Add, edit or delete input signals }> + Add, edit or delete input signals }> ); @@ -116,7 +113,7 @@ class DashboardButtonGroup extends React.Component { Add, edit or delete output signals }> ); @@ -125,7 +122,7 @@ class DashboardButtonGroup extends React.Component { Add widgets and edit layout }> ); diff --git a/src/file/edit-files.js b/src/file/edit-files.js index 97ae6e3..d15102b 100644 --- a/src/file/edit-files.js +++ b/src/file/edit-files.js @@ -149,12 +149,14 @@ class EditFilesDialog extends React.Component { + + diff --git a/src/ic/ic-action.js b/src/ic/ic-action.js index e18ba54..e968c17 100644 --- a/src/ic/ic-action.js +++ b/src/ic/ic-action.js @@ -75,17 +75,17 @@ class ICAction extends React.Component { step={1} onChange={this.setDelayForAction} /> +
- {this.state.selectedAction != null ? this.state.selectedAction.title : ''} + {this.state.selectedAction != null ? this.state.selectedAction.title : ''} {actionList} - - - + +
; } } diff --git a/src/ic/ic-dialog.js b/src/ic/ic-dialog.js index 6e79fac..a919f3f 100644 --- a/src/ic/ic-dialog.js +++ b/src/ic/ic-dialog.js @@ -95,10 +95,10 @@ class ICDialog extends React.Component { {this.props.userRole === "Admin" ? (
Controls:
-
- - diff --git a/src/ic/ics.js b/src/ic/ics.js index dc013c6..e3405f2 100644 --- a/src/ic/ics.js +++ b/src/ic/ics.js @@ -334,7 +334,7 @@ class InfrastructureComponents extends Component { let ic = this.state.ics.find(ic => ic.name === name); let index = this.state.ics.indexOf(ic); if(ic.type === "villas-node" || ic.type === "villas-relay"){ - return } + return } else{ return {name} } @@ -369,12 +369,9 @@ class InfrastructureComponents extends Component { const buttonStyle = { marginLeft: '10px', - backgroundColor: '#ffffff', - borderColor: '#ffffff' } const iconStyle = { - color: '#527984', height: '30px', width: '30px' } @@ -384,9 +381,9 @@ class InfrastructureComponents extends Component {

Infrastructure Components {this.state.currentUser.role === "Admin" ? - - - + + + : diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js index 6802d15..7353ce2 100644 --- a/src/scenario/scenario.js +++ b/src/scenario/scenario.js @@ -697,16 +697,8 @@ class Scenario extends React.Component { return (); } - const buttonStyle = { - marginLeft: '10px', - backgroundColor: '#527984', - borderColor: '#527984' - }; - const altButtonStyle = { marginLeft: '10px', - backgroundColor: '#ffffff', - borderColor: '#ffffff' } const tableHeadingStyle = { @@ -714,7 +706,6 @@ class Scenario extends React.Component { } const iconStyle = { - color: '#527984', height: '30px', width: '30px' } @@ -764,8 +755,8 @@ class Scenario extends React.Component { return
Add, edit or delete files of scenario } > -
@@ -784,8 +775,10 @@ class Scenario extends React.Component { {/*Component Configurations table*/}

Component Configurations - - + + + +

this.onConfigChecked(index, event)} width='30' /> @@ -876,8 +869,10 @@ class Scenario extends React.Component { {/*Dashboard table*/}

Dashboards - - + + + +

@@ -904,7 +899,9 @@ class Scenario extends React.Component { {/*Result table*/}

Results - + + +

{resulttable} this.closeNewResultModal(data)} /> @@ -931,12 +928,15 @@ class Scenario extends React.Component { type="text" /> + +

diff --git a/src/scenario/scenarios.js b/src/scenario/scenarios.js index 00477d3..5c8ca13 100644 --- a/src/scenario/scenarios.js +++ b/src/scenario/scenarios.js @@ -237,12 +237,9 @@ class Scenarios extends Component { render() { const buttonStyle = { marginLeft: '10px', - backgroundColor: '#ffffff', - borderColor: '#ffffff' }; const iconStyle = { - color: '#527984', height: '30px', width: '30px' } @@ -250,8 +247,10 @@ class Scenarios extends Component { return (

Scenarios - - + + + +

diff --git a/src/signal/edit-signal-mapping.js b/src/signal/edit-signal-mapping.js index 10980ae..e882cb2 100644 --- a/src/signal/edit-signal-mapping.js +++ b/src/signal/edit-signal-mapping.js @@ -177,8 +177,6 @@ class EditSignalMapping extends React.Component { const buttonStyle = { marginLeft: '10px', - backgroundColor: '#527984', - borderColor: '#527984' }; return( @@ -204,16 +202,16 @@ class EditSignalMapping extends React.Component { this.handleDelete(index)} />
-
- +
+
Choose a Component Configuration to add the signal to:
-
+
{typeof this.props.configs !== "undefined" && this.props.configs.map(config => ( - + ))}
diff --git a/src/styles/app.css b/src/styles/app.css index cc09d33..7640536 100644 --- a/src/styles/app.css +++ b/src/styles/app.css @@ -369,6 +369,18 @@ body { height: auto !important; padding: 5px; float: right; + border-color: #ffffff; + background-color: #ffffff; +} + +.section-buttons-group-right .btn{ + border-color: #ffffff; + background-color: #ffffff; +} + +.section-buttons-group-right .btn:hover{ + border-color: #e3e3e3; + background-color: #e3e3e3; } .section-buttons-group-left { @@ -377,10 +389,60 @@ body { float: left; } +.section-buttons-group-left .btn{ + background-color: #527984; + border-color: #527984; +} + +.section-buttons-group-left .btn:hover{ + background-color: #31484f; + border-color: #31484f; +} + +.drag-and-drop .btn{ + color: #527984; + border-color: #527984; +} + +.drag-and-drop .btn:hover{ + color: #527984; + border-color: #527984; +} + + .section-buttons-group-right .rc-slider { margin-left: 12px; } +.solid-button .btn{ + background-color: #527984; + border-color: #527984; +} + +.solid-button .btn:hover{ + background-color: #31484f; + border-color: #31484f; +} + +.solid-button .btn:disabled{ + background-color: #527984; + border-color: #527984; +} + +.icon-button .btn{ + border-color: #ffffff; + background-color: #ffffff; +} + +.icon-button .btn:hover{ + border-color: #e3e3e3; + background-color: #e3e3e3; +} + +.icon-color { + color: #527984; +} + .form-horizontal .form-group { margin-left: 0 !important; margin-right: 0 !important; @@ -389,7 +451,3 @@ body { .badge-outdated { opacity: 0.4; } - -a:link, a:active, a:visited , a:hover { - color: #047cab ; -} diff --git a/src/user/login-form.js b/src/user/login-form.js index e828de3..08c09df 100644 --- a/src/user/login-form.js +++ b/src/user/login-form.js @@ -91,8 +91,10 @@ class LoginForm extends Component { - - + + + + diff --git a/src/user/user.js b/src/user/user.js index fc82d49..007602c 100644 --- a/src/user/user.js +++ b/src/user/user.js @@ -112,15 +112,6 @@ class User extends Component { render() { - const iconStyle = { - color: '#527984', - } - - const buttonStyle = { - margin: '10px', - borderColor: '#ffffff', - backgroundColor: '#ffffff' - } return (
@@ -140,7 +131,9 @@ class User extends Component {
{this.state.currentUser.username}
{this.state.currentUser.mail}
{this.state.currentUser.role}
- + + + diff --git a/src/user/users.js b/src/user/users.js index 807bed4..a9b84dc 100644 --- a/src/user/users.js +++ b/src/user/users.js @@ -132,12 +132,9 @@ class Users extends Component { const buttonStyle = { marginLeft: '10px', - backgroundColor: '#ffffff', - borderColor: '#ffffff' } const iconStyle = { - color: '#527984', height: '30px', width: '30px' } @@ -145,7 +142,9 @@ class Users extends Component { return (

Users - + + +

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 93653fb..6ef3fcd 100644 --- a/src/widget/edit-widget/edit-widget-color-zones-control.js +++ b/src/widget/edit-widget/edit-widget-color-zones-control.js @@ -178,12 +178,9 @@ class EditWidgetColorZonesControl extends React.Component { const buttonStyle = { marginBottom: '10px', marginLeft: '120px', - borderColor: '#ffffff', - backgroundColor: '#ffffff' }; const iconStyle = { - color: '#527984', height: '25px', width : '25px' } @@ -204,8 +201,9 @@ class EditWidgetColorZonesControl extends React.Component { return Color zones - - + + +
{ this.state.widget.customProperties.zones.map((zone, idx) => { @@ -255,7 +253,9 @@ class EditWidgetColorZonesControl extends React.Component {
- + + + this.closeEditModal(data)} widget={this.state.widget} zoneIndex={this.state.selectedIndex} controlId={'strokeStyle'} /> diff --git a/src/widget/toolbox-item.js b/src/widget/toolbox-item.js index e2aa402..4c268c5 100644 --- a/src/widget/toolbox-item.js +++ b/src/widget/toolbox-item.js @@ -51,7 +51,7 @@ class ToolboxItem extends React.Component { if (this.props.disabled === false) { return this.props.connectDragSource(
- + {this.props.icon && } {this.props.name} diff --git a/src/widget/widget-toolbox.js b/src/widget/widget-toolbox.js index 4483f1b..ee48d37 100644 --- a/src/widget/widget-toolbox.js +++ b/src/widget/widget-toolbox.js @@ -96,7 +96,6 @@ class WidgetToolbox extends React.Component { const disableDecrease = this.disableDecrease(); // Only one topology widget at the time is supported const iconStyle = { - color: '#527984', height: '25px', width : '25px' } @@ -104,15 +103,6 @@ class WidgetToolbox extends React.Component { const buttonStyle = { marginRight: '3px', height: '40px', - borderColor: '#527984', - backgroundColor: '#527984' - } - - const altButtonStyle = { - marginRight: '3px', - height: '40px', - borderColor: '#ffffff', - backgroundColor: '#ffffff' } const thereIsTopologyWidget = this.props.widgets != null && Object.values(this.props.widgets).filter(w => w.type === 'Topology').length > 0; @@ -124,15 +114,15 @@ class WidgetToolbox extends React.Component {
Show/ hide available Cosmetic Widgets } > - Show/ hide available Displaying Widgets } > - Show/ hide available Manipulation Widgets } > -
@@ -142,13 +132,13 @@ class WidgetToolbox extends React.Component { Grid: { this.props.grid > 1 ? this.props.grid : 'Disabled' } Increase dashboard height } > - Decrease dashboard height } > - @@ -157,7 +147,7 @@ class WidgetToolbox extends React.Component {





-
+