Merge commit 'idan/master' into ui-rf

2 files changed, 7 insertions, 14 deletions

diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css
index c1fd4b0..316f4df 100644
--- a/debug_toolbar/media/debug_toolbar/toolbar.css
+++ b/debug_toolbar/media/debug_toolbar/toolbar.css
@@ -141,9 +141,9 @@
 	position:fixed;
 	margin:0;
 	top:0;
-	right:150px;
+	right:200px;
 	bottom:0;
-	left:50px;
+	left:0px;
 	background-color:#eee;
 	color:#666;
 	z-index:100000000;
diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js
index e47adfa..7b6d534 100644
--- a/debug_toolbar/media/debug_toolbar/toolbar.js
+++ b/debug_toolbar/media/debug_toolbar/toolbar.js
@@ -12,16 +12,13 @@ jQuery(function($j) {
 					return false;
 				}
 				current = $j('#djDebug #' + this.className);
-				$j(document).trigger('close.djDebug');
 				if (current.is(':visible')) {
+				    $j(document).trigger('close.djDebug');
 					$j(this).parent().removeClass("active");
 				} else {
-					$j('.panelContent').hide();
-					current.animate({
-					    right:"200px",
-					    left:"0px",
-					    opacity:"show"
-					},200);
+					//$j('.panelContent').hide();
+					$j(document).trigger('close.djDebug');
+					current.show();
 					$j.djDebug.open();
 					$j('#djDebugToolbar li').removeClass("active");
 					$j(this).parent().addClass("active");
@@ -111,11 +108,7 @@ jQuery(function($j) {
 	});
 	$j(document).bind('close.djDebug', function() {
 		$j(document).unbind('keydown.djDebug');
-		$j('.panelContent').animate({
-		    right:"150px",
-		    left:"50px",
-		    opacity:"hide"
-		}, 150);
+		$j('.panelContent').hide()
 		$j('#djDebugToolbar li').removeClass("active");
 	});
 });