From 5f0e70a2ef63113d423b5857aaa73bc24e4a241f Mon Sep 17 00:00:00 2001 From: Guillaume Lambert Date: Tue, 22 May 2012 23:33:02 -0400 Subject: [PATCH] fixed a conflict with .hidden class when using twitter bootstrap and made animation smoother Signed-off-by: Guillaume Lambert --- laravel/profiling/profiler.css | 2 +- laravel/profiling/profiler.js | 19 +++++++++++-------- public/laravel/css/style.css | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/laravel/profiling/profiler.css b/laravel/profiling/profiler.css index a17c559d..f5cafa60 100755 --- a/laravel/profiling/profiler.css +++ b/laravel/profiling/profiler.css @@ -21,7 +21,7 @@ .anbu-tabs background-position:5px -8px; } -.anbu.hidden .anbu-tabs +.anbu-hidden .anbu-tabs { background-image:none; } diff --git a/laravel/profiling/profiler.js b/laravel/profiling/profiler.js index 25099843..ab73ad8e 100755 --- a/laravel/profiling/profiler.js +++ b/laravel/profiling/profiler.js @@ -139,10 +139,10 @@ var anbu = { show: function() { anbu.el.closed_tabs.fadeOut(600, function () { + anbu.el.main.removeClass('anbu-hidden'); anbu.el.open_tabs.fadeIn(200); }); anbu.el.main.animate({width: '100%'}, 700); - anbu.el.main.removeClass('hidden'); }, @@ -153,14 +153,17 @@ var anbu = { hide: function() { anbu.close_window(); - anbu.el.window.slideUp(400, function () { - anbu.close_window(); - anbu.el.main.addClass('hidden'); - anbu.el.open_tabs.fadeOut(200, function () { - anbu.el.closed_tabs.fadeIn(200); + + setTimeout(function() { + anbu.el.window.slideUp(400, function () { + anbu.close_window(); + anbu.el.main.addClass('anbu-hidden'); + anbu.el.open_tabs.fadeOut(200, function () { + anbu.el.closed_tabs.fadeIn(200); + }); + anbu.el.main.animate({width: anbu.mini_button_width}, 700); }); - anbu.el.main.animate({width: anbu.mini_button_width}, 700); - }); + }, 100); }, diff --git a/public/laravel/css/style.css b/public/laravel/css/style.css index 5a1108d6..b4cd810e 100755 --- a/public/laravel/css/style.css +++ b/public/laravel/css/style.css @@ -166,7 +166,7 @@ .content>h1:not(:first-child) { .content table { border-collapse:collapse - border:1px solid #eee; + border: 1px solid #eee; width:100%; line-height:1.5em; }