Index: modules/toolbar/toolbar.css =================================================================== RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.css,v retrieving revision 1.16 diff -u -r1.16 toolbar.css --- modules/toolbar/toolbar.css 7 Jan 2010 20:29:33 -0000 1.16 +++ modules/toolbar/toolbar.css 29 Jan 2010 16:45:35 -0000 @@ -33,10 +33,18 @@ background: #666; color: #ccc; position: fixed; + top: 0; left: 0; right: 0; - top: 0; + margin: 0 -20px; + padding: 0 20px; z-index: 600; + box-shadow: 0 3px 20px #000; + -moz-box-shadow: 0 3px 20px #000; + -webkit-box-shadow: 0 3px 20px #000; + -khtml-box-shadow: 0 3px 20px #000; + filter: progid:DXImageTransform.Microsoft.Shadow(color=#000000, direction='180', strength='10'); + -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(color=#000000, direction='180', strength='10')"; } #toolbar div.collapsed { @@ -44,15 +52,6 @@ visibility: hidden; } -#toolbar div.shadow { - position: absolute; - left: 0; - right: 0; - bottom: -15px; - height: 15px; - background: url(toolbar.png) 0 -45px repeat-x; -} - #toolbar a { text-decoration: none; color: #fff; @@ -78,7 +77,7 @@ width: 11px; height: 14px; display: block; - background: url(toolbar.png) no-repeat -6px -63px; + background: url(toolbar.png) no-repeat 0 -45px; text-indent: -9999px; margin: 3px 0px; } @@ -142,6 +141,6 @@ */ * html #toolbar { position: absolute; - top: 0; - left: 0; + margin: 0; + padding: 0; } Index: modules/toolbar/toolbar.js =================================================================== RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.js,v retrieving revision 1.14 diff -u -r1.14 toolbar.js --- modules/toolbar/toolbar.js 26 Jan 2010 21:42:37 -0000 1.14 +++ modules/toolbar/toolbar.js 29 Jan 2010 16:45:35 -0000 @@ -49,7 +49,7 @@ .removeClass('toggle-active') .attr('title', toggle_text) .html(toggle_text); - $('body').removeClass('toolbar-drawer').css('paddingTop', $('#toolbar').outerHeight()); + $('body').addClass('toolbar-drawer').css('paddingTop', Drupal.toolbar.height()); $.cookie( 'Drupal.toolbar.collapsed', 1, @@ -71,7 +71,7 @@ .addClass('toggle-active') .attr('title', toggle_text) .html(toggle_text); - $('body').addClass('toolbar-drawer').css('paddingTop', $('#toolbar').outerHeight()); + $('body').addClass('toolbar-drawer').css('paddingTop', Drupal.toolbar.height()); $.cookie( 'Drupal.toolbar.collapsed', 0, @@ -96,7 +96,13 @@ }; Drupal.toolbar.height = function() { - return $("#toolbar").height(); + var height = $('#toolbar').outerHeight(); + // In IE, Shadow size is not taken into account by the outerHeight() function + // so we need to remove the extra height added by the filter. + if ($('#toolbar').attr('filters') && $('#toolbar').attr('filters').item("DXImageTransform.Microsoft.Shadow")) { + height -= $('#toolbar').attr('filters').item("DXImageTransform.Microsoft.Shadow").strength; + } + return height; }; })(jQuery); Index: modules/toolbar/toolbar.png =================================================================== RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.png,v retrieving revision 1.8 diff -u -r1.8 toolbar.png Binary files /tmp/cvsGEDMKw and toolbar.png differ Index: modules/toolbar/toolbar.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.tpl.php,v retrieving revision 1.8 diff -u -r1.8 toolbar.tpl.php --- modules/toolbar/toolbar.tpl.php 16 Dec 2009 19:41:22 -0000 1.8 +++ modules/toolbar/toolbar.tpl.php 29 Jan 2010 16:45:35 -0000 @@ -35,6 +35,4 @@
- -