Revert "Testing out more shapes."

This reverts commit 9a25041.
weaveworks · Feb 15, 2016 · fc7d63f · fc7d63f
1 parent 78f96f4
commit fc7d63f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 35 deletions.
diff --git a/client/app/scripts/charts/node-shape-cog.js b/client/app/scripts/charts/node-shape-cog.js
diff --git a/client/app/scripts/charts/node-shape-rounded-square.js b/client/app/scripts/charts/node-shape-rounded-square.js
@@ -5,6 +5,6 @@ import NodeShapeSquare from './node-shape-square';
 
 export default function NodeShapeRoundedSquare(props) {
   return (
-    <NodeShapeSquare {...props} rx="0.2" ry="0.2" />
+    <NodeShapeSquare {...props} rx="0.4" ry="0.4" />
   );
 }
diff --git a/client/app/scripts/charts/node.js b/client/app/scripts/charts/node.js
@@ -8,8 +8,7 @@ import { getNodeColor } from '../utils/color-utils';
 import NodeShapeCircle from './node-shape-circle';
 import NodeShapeStack from './node-shape-stack';
 import NodeShapeRoundedSquare from './node-shape-rounded-square';
-import NodeShapeCog from './node-shape-cog';
-// import NodeShapeHex from './node-shape-hex';
+import NodeShapeHex from './node-shape-hex';
 import NodeShapeCloud from './node-shape-cloud';
 
 function stackedShape(Shape) {
@@ -22,8 +21,8 @@ function stackedShape(Shape) {
 
 const nodeShapes = {
   'circle': NodeShapeCircle,
-  'hexagon': NodeShapeRoundedSquare,
-  'square': NodeShapeCog,
+  'hexagon': NodeShapeHex,
+  'square': NodeShapeRoundedSquare,
   'cloud': NodeShapeCloud
 };