diff options
Diffstat (limited to 'src/components/sidebars')
12 files changed, 24 insertions, 18 deletions
diff --git a/src/components/sidebars/simulation/TaskComponent.js b/src/components/sidebars/simulation/TaskComponent.js index ec60f210..03b6a279 100644 --- a/src/components/sidebars/simulation/TaskComponent.js +++ b/src/components/sidebars/simulation/TaskComponent.js @@ -7,18 +7,24 @@ const TaskComponent = ({task, flopsLeft}) => { if (flopsLeft === task.totalFlopCount) { stateInfo = ( - <p><span className="fa fa-hourglass-half mr-2"/>Waiting</p> + <div> + <span className="fa fa-hourglass-half mr-2"/> + Waiting + </div> ); } else if (flopsLeft > 0) { stateInfo = ( - <p> + <div> <span className="fa fa-refresh mr-2"/> Running ({approx(task.totalFlopCount - flopsLeft)} / {approx(task.totalFlopCount)} FLOPS) - </p> + </div> ); } else { stateInfo = ( - <p><span className="fa fa-check mr-2"/>Completed</p> + <div> + <span className="fa fa-check mr-2"/> + Completed + </div> ); } diff --git a/src/components/sidebars/topology/building/NewRoomConstructionComponent.js b/src/components/sidebars/topology/building/NewRoomConstructionComponent.js index 991715e9..d89b0ac0 100644 --- a/src/components/sidebars/topology/building/NewRoomConstructionComponent.js +++ b/src/components/sidebars/topology/building/NewRoomConstructionComponent.js @@ -4,7 +4,7 @@ const NewRoomConstructionComponent = ({onStart, onFinish, onCancel, currentRoomI if (currentRoomInConstruction === -1) { return ( <div className="btn btn-primary btn-block" onClick={onStart}> - <span className="fa fa-plus mr-1"/> + <span className="fa fa-plus mr-2"/> Construct a new room </div> ); @@ -12,11 +12,11 @@ const NewRoomConstructionComponent = ({onStart, onFinish, onCancel, currentRoomI return ( <div> <div className="btn btn-primary btn-block" onClick={onFinish}> - <span className="fa fa-check mr-1"/> + <span className="fa fa-check mr-2"/> Finalize new room </div> <div className="btn btn-default btn-block" onClick={onCancel}> - <span className="fa fa-times mr-1"/> + <span className="fa fa-times mr-2"/> Cancel construction </div> </div> diff --git a/src/components/sidebars/topology/machine/BackToRackComponent.js b/src/components/sidebars/topology/machine/BackToRackComponent.js index 3cd17f7a..19e33904 100644 --- a/src/components/sidebars/topology/machine/BackToRackComponent.js +++ b/src/components/sidebars/topology/machine/BackToRackComponent.js @@ -2,7 +2,7 @@ import React from "react"; const BackToRackComponent = ({onClick}) => ( <div className="btn btn-secondary btn-block" onClick={onClick}> - <span className="fa fa-angle-left mr-1"/> + <span className="fa fa-angle-left mr-2"/> Back to rack </div> ); diff --git a/src/components/sidebars/topology/machine/DeleteMachineComponent.js b/src/components/sidebars/topology/machine/DeleteMachineComponent.js index e99d378b..14713158 100644 --- a/src/components/sidebars/topology/machine/DeleteMachineComponent.js +++ b/src/components/sidebars/topology/machine/DeleteMachineComponent.js @@ -3,7 +3,7 @@ import React from "react"; const DeleteMachineComponent = ({onClick}) => { return ( <div className="btn btn-danger btn-block" onClick={onClick}> - <span className="fa fa-trash mr-1"/> + <span className="fa fa-trash mr-2"/> Delete this machine </div> ); diff --git a/src/components/sidebars/topology/machine/UnitAddComponent.js b/src/components/sidebars/topology/machine/UnitAddComponent.js index aa572e97..f16700df 100644 --- a/src/components/sidebars/topology/machine/UnitAddComponent.js +++ b/src/components/sidebars/topology/machine/UnitAddComponent.js @@ -26,7 +26,7 @@ class UnitAddComponent extends React.Component { className="btn btn-primary" onClick={() => this.props.onAdd(parseInt(this.unitSelect.value, 10))} > - <span className="fa fa-plus mr-1"/> + <span className="fa fa-plus mr-2"/> Add </button> </div> diff --git a/src/components/sidebars/topology/machine/UnitComponent.js b/src/components/sidebars/topology/machine/UnitComponent.js index 895626d1..c734f508 100644 --- a/src/components/sidebars/topology/machine/UnitComponent.js +++ b/src/components/sidebars/topology/machine/UnitComponent.js @@ -6,7 +6,7 @@ const UnitComponent = ({unit, onDelete, inSimulation}) => ( {inSimulation ? undefined : <span className="btn btn-outline-danger" onClick={onDelete}> - <span className="fa fa-trash mr-1"/> + <span className="fa fa-trash mr-2"/> Delete </span> } diff --git a/src/components/sidebars/topology/rack/BackToRoomComponent.js b/src/components/sidebars/topology/rack/BackToRoomComponent.js index 56e46345..267001c6 100644 --- a/src/components/sidebars/topology/rack/BackToRoomComponent.js +++ b/src/components/sidebars/topology/rack/BackToRoomComponent.js @@ -2,7 +2,7 @@ import React from "react"; const BackToRoomComponent = ({onClick}) => ( <div className="btn btn-secondary btn-block mb-2" onClick={onClick}> - <span className="fa fa-angle-left mr-1"/> + <span className="fa fa-angle-left mr-2"/> Back to room </div> ); diff --git a/src/components/sidebars/topology/rack/DeleteRackComponent.js b/src/components/sidebars/topology/rack/DeleteRackComponent.js index 2075660b..06c45048 100644 --- a/src/components/sidebars/topology/rack/DeleteRackComponent.js +++ b/src/components/sidebars/topology/rack/DeleteRackComponent.js @@ -3,7 +3,7 @@ import React from "react"; const DeleteRackComponent = ({onClick}) => { return ( <div className="btn btn-danger btn-block" onClick={onClick}> - <span className="fa fa-trash mr-1"/> + <span className="fa fa-trash mr-2"/> Delete this rack </div> ); diff --git a/src/components/sidebars/topology/rack/EmptySlotComponent.js b/src/components/sidebars/topology/rack/EmptySlotComponent.js index c4c453e9..08665072 100644 --- a/src/components/sidebars/topology/rack/EmptySlotComponent.js +++ b/src/components/sidebars/topology/rack/EmptySlotComponent.js @@ -10,7 +10,7 @@ const EmptySlotComponent = ({position, onAdd, inSimulation}) => ( Empty Slot </span> : <button className="btn btn-outline-primary" onClick={onAdd}> - <span className="fa fa-plus mr-1"/> + <span className="fa fa-plus mr-2"/> Add machine </button> } diff --git a/src/components/sidebars/topology/room/BackToBuildingComponent.js b/src/components/sidebars/topology/room/BackToBuildingComponent.js index 20f02b4d..81384ba5 100644 --- a/src/components/sidebars/topology/room/BackToBuildingComponent.js +++ b/src/components/sidebars/topology/room/BackToBuildingComponent.js @@ -2,7 +2,7 @@ import React from "react"; const BackToBuildingComponent = ({onClick}) => ( <div className="btn btn-secondary btn-block mb-2" onClick={onClick}> - <span className="fa fa-angle-left mr-1"/> + <span className="fa fa-angle-left mr-2"/> Back to building </div> ); diff --git a/src/components/sidebars/topology/room/DeleteRoomComponent.js b/src/components/sidebars/topology/room/DeleteRoomComponent.js index c0fd96cc..72bb6a83 100644 --- a/src/components/sidebars/topology/room/DeleteRoomComponent.js +++ b/src/components/sidebars/topology/room/DeleteRoomComponent.js @@ -3,7 +3,7 @@ import React from "react"; const DeleteRoomComponent = ({onClick}) => { return ( <div className="btn btn-danger btn-block" onClick={onClick}> - <span className="fa fa-trash mr-1"/> + <span className="fa fa-trash mr-2"/> Delete this room </div> ); diff --git a/src/components/sidebars/topology/room/RackConstructionComponent.js b/src/components/sidebars/topology/room/RackConstructionComponent.js index 125ccbf9..9bfe28ce 100644 --- a/src/components/sidebars/topology/room/RackConstructionComponent.js +++ b/src/components/sidebars/topology/room/RackConstructionComponent.js @@ -4,7 +4,7 @@ const RackConstructionComponent = ({inRackConstructionMode, onStart, onStop}) => if (inRackConstructionMode) { return ( <div className="btn btn-primary btn-block" onClick={onStop}> - <span className="fa fa-times mr-1"/> + <span className="fa fa-times mr-2"/> Stop rack construction </div> ); @@ -12,7 +12,7 @@ const RackConstructionComponent = ({inRackConstructionMode, onStart, onStop}) => return ( <div className="btn btn-primary btn-block" onClick={onStart}> - <span className="fa fa-plus mr-1"/> + <span className="fa fa-plus mr-2"/> Start rack construction </div> ); |