Merge branch 'master' into upgrade-dependencies

# Conflicts:
#	src/reducers/construction-mode.js

2 files changed, 4 insertions, 3 deletions

diff --git a/src/components/app/sidebars/topology/machine/DeleteMachineComponent.js b/src/components/app/sidebars/topology/machine/DeleteMachineComponent.js
index 8da39b30..d8774bf9 100644
--- a/src/components/app/sidebars/topology/machine/DeleteMachineComponent.js
+++ b/src/components/app/sidebars/topology/machine/DeleteMachineComponent.js
@@ -1,7 +1,7 @@
 import React from "react";
 
 const DeleteMachineComponent = ({ onClick }) => (
-  <div className="btn btn-danger btn-block" onClick={onClick}>
+  <div className="btn btn-outline-danger btn-block" onClick={onClick}>
     <span className="fa fa-trash mr-2" />
     Delete this machine
   </div>
diff --git a/src/components/app/sidebars/topology/machine/UnitAddComponent.js b/src/components/app/sidebars/topology/machine/UnitAddComponent.js
index d0082a72..0c903228 100644
--- a/src/components/app/sidebars/topology/machine/UnitAddComponent.js
+++ b/src/components/app/sidebars/topology/machine/UnitAddComponent.js
@@ -29,9 +29,10 @@ class UnitAddComponent extends React.Component {
           </select>
           <button
             type="submit"
-            className="btn btn-primary"
+            className="btn btn-outline-primary"
             onClick={() =>
-              this.props.onAdd(parseInt(this.unitSelect.value, 10))}
+              this.props.onAdd(parseInt(this.unitSelect.value, 10))
+            }
           >
             <span className="fa fa-plus mr-2" />
             Add