diff options
Diffstat (limited to 'frontend/src/components')
4 files changed, 19 insertions, 26 deletions
diff --git a/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js b/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js index e8722506..98238de7 100644 --- a/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js +++ b/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js @@ -17,13 +17,7 @@ class UnitAddComponent extends React.Component { > {this.props.units.map(unit => ( <option value={unit._id} key={unit._id}> - {unit.manufacturer + - ' ' + - unit.family + - ' ' + - unit.model + - ' ' + - unit.generation} + {unit.name} </option> ))} </select> diff --git a/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js b/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js index 647c8e5c..bde6d444 100644 --- a/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js +++ b/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js @@ -39,31 +39,29 @@ class UnitComponent extends React.Component { return ( <li className="d-flex list-group-item justify-content-between align-items-center"> - <span style={{ maxWidth: '60%' }}> - {this.props.unit.name} - </span> + <span style={{ maxWidth: '60%' }}> + {this.props.unit.name} + </span> <span> - <span - tabIndex="0" - className="unit-info-popover btn btn-outline-info mr-1 fa fa-info-circle" - role="button" - data-toggle="popover" - data-trigger="focus" - title="Unit information" - data-content={unitInfo} - data-html="true" - /> + <span + tabIndex="0" + className="unit-info-popover btn btn-outline-info mr-1 fa fa-info-circle" + role="button" + data-toggle="popover" + data-trigger="focus" + title="Unit information" + data-content={unitInfo} + data-html="true" + /> {this.props.inSimulation ? ( undefined ) : ( <span - className="btn btn-outline-danger" + className="btn btn-outline-danger fa fa-trash" onClick={this.props.onDelete} - > - <span className="fa fa-trash"/> - </span> + /> )} - </span> + </span> </li> ) } diff --git a/frontend/src/components/navigation/AppNavbar.js b/frontend/src/components/navigation/AppNavbar.js index da43a330..15f08b5f 100644 --- a/frontend/src/components/navigation/AppNavbar.js +++ b/frontend/src/components/navigation/AppNavbar.js @@ -30,7 +30,7 @@ const AppNavbar = ({ simulationId, inSimulation, fullWidth, onViewTopologies }) title="Topologies" onClick={onViewTopologies} > - <FontAwesome name="home" className="mr-2"/> + <FontAwesome name="server" className="mr-2"/> Topologies </span> </NavItem> diff --git a/frontend/src/components/navigation/Navbar.sass b/frontend/src/components/navigation/Navbar.sass index a270bc6b..c9d2aad2 100644 --- a/frontend/src/components/navigation/Navbar.sass +++ b/frontend/src/components/navigation/Navbar.sass @@ -23,6 +23,7 @@ height: 40px background: $blue border: none + padding-top: 10px +clickable &:hover |