Author: cmlenz
Date: Thu Jul 23 22:42:33 2009
New Revision: 797252
URL: http://svn.apache.org/viewvc?rev=797252&view=rev
Log:
Apply patch by Volker Mische to improve the sidebar toggle animation. Really
closes COUCHDB-425 now.
Modified:
couchdb/trunk/share/www/script/futon.js
couchdb/trunk/share/www/style/layout.css
Modified: couchdb/trunk/share/www/script/futon.js
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/script/futon.js?rev=797252&r1=797251&r2=797252&view=diff
==============================================================================
--- couchdb/trunk/share/www/script/futon.js (original)
+++ couchdb/trunk/share/www/script/futon.js Thu Jul 23 22:42:33 2009
@@ -107,17 +107,19 @@
var sidebar = $("#sidebar").stop(true, true);
var hidden = !$(sidebar).is(".hidden");
- sidebar.toggleClass("hidden").animate({
- width: hidden ? 26 : 210,
- height: hidden ? $("h1").outerHeight() - 1 : "100%",
- right: hidden ? 0 : -210
- }, speed).children(":not(#sidebar-toggle)").toggle(speed * 1.2);
- $("h1").animate({marginRight: hidden ? 26 : 0}, speed);
$("#wrap").animate({
marginRight: hidden ? 0 : 210
}, speed, function() {
$(document.body).toggleClass("fullwidth", hidden);
});
+ sidebar.toggleClass("hidden").animate({
+ width: hidden ? 26 : 210,
+ height: hidden ? $("h1").outerHeight() - 1 : "100%",
+ right: hidden ? 0 : -210
+ }, speed).children(":not(#sidebar-toggle)").animate({
+ opacity: "toggle"
+ }, speed);
+ $("h1").animate({marginRight: hidden ? 26 : 0}, speed);
$("#sidebar-toggle")
.attr("title", hidden ? "Show Sidebar" : "Hide Sidebar");
Modified: couchdb/trunk/share/www/style/layout.css
URL:
http://svn.apache.org/viewvc/couchdb/trunk/share/www/style/layout.css?rev=797252&r1=797251&r2=797252&view=diff
==============================================================================
--- couchdb/trunk/share/www/style/layout.css (original)
+++ couchdb/trunk/share/www/style/layout.css Thu Jul 23 22:42:33 2009
@@ -215,7 +215,6 @@
#content { padding: 1em 16px 3em 10px; overflow: auto; position: absolute;
top: 33px; bottom: 0; left: 0; right: 0;
}
-body.fullwidth #content { padding-right: 26px; }
/* Toolbar */
