From 139e4ca6ae0c31f9ffe2e9f6b61d52f0ee78e97d Mon Sep 17 00:00:00 2001
From: peteruithoven <peter@peteruithoven.nl>
Date: Fri, 10 Jan 2014 14:04:17 +0100
Subject: [PATCH] Cleanup

---
 js/Popup.js           | 8 ++++----
 js/buttonbehaviors.js | 2 +-
 less/buttons.less     | 2 +-
 www/index.html        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/Popup.js b/js/Popup.js
index 4bc6187..5d6550a 100644
--- a/js/Popup.js
+++ b/js/Popup.js
@@ -1,11 +1,11 @@
 function showPopup(popup) {
-  $(".popupMask").show();
-  popup.show();
+  $("#popupMask").fadeIn(POPUP_SHOW_DURATION);
+  popup.fadeIn(POPUP_SHOW_DURATION);
   keyboardShortcutsEnabled=false;
 }
 
 function hidePopup(popup) {
-	$(".popupMask").hide();
-  popup.hide();
+	$("#popupMask").fadeOut(POPUP_SHOW_DURATION);
+  popup.fadeOut(POPUP_SHOW_DURATION);
   keyboardShortcutsEnabled=true;	
 }
\ No newline at end of file
diff --git a/js/buttonbehaviors.js b/js/buttonbehaviors.js
index eabc225..8b63f0f 100644
--- a/js/buttonbehaviors.js
+++ b/js/buttonbehaviors.js
@@ -42,7 +42,7 @@ function initButtonBehavior() {
   btnSine = $(".btnSine");
   btnAdd = $(".btnAdd");
   btnToggleVertical = $(".btnToggleVertical");
-  buttonGroupAdd = $(".buttonGroupAdd");
+  buttonGroupAdd = $("#buttonGroupAdd");
   buttonGroupVertical = $(".buttonGroupVertical");
   popupWordArt = $(".popupWordArt");
   popupShape = $(".popupShape");
diff --git a/less/buttons.less b/less/buttons.less
index 09faaad..426773b 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -150,7 +150,7 @@
   padding: 5% 5% 5% 5%;
 }
 
-.buttonGroupAdd {
+#buttonGroupAdd {
   display: none;
   z-index: 1000;
   margin-top: -60%;
diff --git a/www/index.html b/www/index.html
index 7622c3b..c4464d0 100644
--- a/www/index.html
+++ b/www/index.html
@@ -35,7 +35,7 @@
     <img class="btnOops btn" src="img/buttons/btnOops.png" /><br/>
     <img class="btnAdd btn" src="img/buttons/btnAdd.png" /><br/>
 
-    <div class="buttonGroup buttonGroupAdd">
+    <div class="buttonGroup" id="buttonGroupAdd">
       <img class="btnWordArt btn" src="img/buttons/btnWordArt.png" />
       <img class="btnShape btn" src="img/buttons/btnShape.png" />    
     </div>