Commit 60f14083 authored by webchick's avatar webchick

Roll-back of #555712. User testing showed the collapse bar to the left...

Roll-back of #555712. User testing showed the collapse bar to the left introduced its own issues. Back to the drawing board...
parent 6ab2b28d
......@@ -76,7 +76,7 @@ div#toolbar div.toolbar-menu {
div#toolbar div.toolbar-menu #toolbar-user {
position: absolute;
right: 10px;
right: 35px;
}
div#toolbar div.toolbar-menu #toolbar-menu {
......@@ -84,16 +84,9 @@ div#toolbar div.toolbar-menu #toolbar-menu {
left: 10px;
}
/**
* Give space for the shortcuts visibility toggling element when it is added.
*/
div#toolbar.toolbar-processed div.toolbar-menu #toolbar-menu {
left: 45px;
}
div#toolbar div.toolbar-menu span.toggle {
position: absolute;
left: 10px;
right: 10px;
cursor: pointer;
background: url(toolbar.png) 0 -60px no-repeat;
text-indent: -9999px;
......
......@@ -10,9 +10,6 @@ Drupal.behaviors.admin = {
// Set the intial state of the toolbar.
$('#toolbar', context).once('toolbar', Drupal.admin.toolbar.init);
// Add the toggling element for shortcuts visibility.
$('#toolbar div.toolbar-menu').prepend('<span class="toggle toggle-active"><a href="#">' + Drupal.t('Show shortcuts') + '</a></span>');
// Toggling of admin shortcuts visibility.
$('#toolbar span.toggle', context).once('toolbar-toggle').click(function() {
Drupal.admin.toolbar.toggle();
......
......@@ -16,6 +16,7 @@
?>
<div id="toolbar" class="clearfix">
<div class="toolbar-menu clearfix">
<span class="toggle toggle-active"><?php print t('Show shortcuts'); ?></span>
<?php print render($toolbar['toolbar_menu']); ?>
<?php print render($toolbar['toolbar_user']); ?>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment