From f759b2e468db7bce913318b341b3a8ab40d923ea Mon Sep 17 00:00:00 2001
From: casperlamboo <casperlamboo@gmail.com>
Date: Wed, 6 Dec 2017 13:57:28 +0100
Subject: [PATCH] place union and intersect in context menu

---
 src/constants/contextTools.js | 11 ++---------
 src/constants/menu.js         |  9 +++------
 styles/styles.css             |  8 --------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/constants/contextTools.js b/src/constants/contextTools.js
index b15ab59..3484266 100644
--- a/src/constants/contextTools.js
+++ b/src/constants/contextTools.js
@@ -6,7 +6,8 @@ export const BRUSH_SIZE = 'brush-size-tool';
 export const FILL_TOGGLE = 'fill-toggle-tool';
 export const HOLE_TOGGLE = 'hole-toggle-tool';
 export const ALIGN = 'align-tool';
-export const ADVANCED = 'advanced-tool';
+export const UNION = 'union-tool';
+export const INTERSECT = 'intersect-tool';
 
 export const LIGHT_BLUE = 'color-light-blue';
 export const LIGHT_GREEN = 'color-light-green';
@@ -81,11 +82,3 @@ export const ALIGN_TOOLS = [
   ALIGN_VERTICAL,
   ALIGN_BOTTOM
 ];
-
-export const UNION = 'union-tool';
-export const INTERSECT = 'intersect-tool';
-
-export const ADVANCED_TOOLS = [
-  UNION,
-  INTERSECT
-];
diff --git a/src/constants/menu.js b/src/constants/menu.js
index 0c8ddc1..e9559ab 100644
--- a/src/constants/menu.js
+++ b/src/constants/menu.js
@@ -97,12 +97,9 @@ const context = {
       selected: contextTools.ALIGN_HORIZONTAL,
       children: contextTools.ALIGN_TOOLS.map(value => ({ value })),
       ...selectorBehavior
-    }, {
-      value: contextTools.ADVANCED,
-      selected: contextTools.UNION,
-      children: contextTools.ADVANCED_TOOLS.map(value => ({ value })),
-      ...selectorBehavior
-    }
+    },
+    { value: contextTools.UNION },
+    { value: contextTools.INTERSECT }
   ]
 };
 
diff --git a/styles/styles.css b/styles/styles.css
index d233a7a..9428957 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -131,19 +131,11 @@
 	background-image: url('../img/contextmenu/btnGroup.png');
 	background-size: 33px auto;
 	height: 41px;
-	width: 30px;
 }
 #context #intersect-tool {
 	background-image: url('../img/contextmenu/btnCutOut.png');
 	background-size: 33px auto;
 	height: 41px;
-	width: 30px;
-}
-#union-tool-menu, #intersect-tool-menu {
-	background-image: url('../img/contextmenu/btnMore.png');
-	background-size: 33px auto;
-	height: 41px;
-	width: 30px;
 }
 #brush-size-small, #brush-size-small-menu,
 #eraser-size-small, #eraser-size-small-menu {