Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #1190210 by aspilicious, richthegeek, jessebeach: convert toolbar.tpl.php to HTML5.

8.0.x
Dries 2012-01-27 10:17:34 -05:00
parent b989d0cc16
commit dd13c22eed
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/modules/shortcut/shortcut-rtl.css
View File

@ -1,35 +1,35 @@
div#toolbar a#edit-shortcuts { #toolbar #edit-shortcuts {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
padding: 5px 5px 5px 10px; padding: 5px 5px 5px 10px;
} }
div#toolbar div.toolbar-shortcuts ul { #toolbar .toolbar-shortcuts ul {
float: none; float: none;
margin-right: 5px; margin-right: 5px;
margin-left: 10em; margin-left: 10em;
} }
div#toolbar div.toolbar-shortcuts ul li a { #toolbar .toolbar-shortcuts ul li a {
margin-left: 5px; margin-left: 5px;
margin-right: 0; margin-right: 0;
padding: 0 5px; padding: 0 5px;
} }
div#toolbar div.toolbar-shortcuts span.icon { #toolbar .toolbar-shortcuts span.icon {
float: right; float: right;
} }
div.add-or-remove-shortcuts a span.icon { .add-or-remove-shortcuts a span.icon {
float: right; float: right;
margin-right: 8px; margin-right: 8px;
margin-left: 0; margin-left: 0;
} }
div.add-or-remove-shortcuts a span.text { .add-or-remove-shortcuts a span.text {
float: right; float: right;
padding-right: 10px; padding-right: 10px;
padding-left: 0; padding-left: 0;
} }
div.add-or-remove-shortcuts a:focus span.text, .add-or-remove-shortcuts a:focus span.text,
div.add-or-remove-shortcuts a:hover span.text { .add-or-remove-shortcuts a:hover span.text {
-moz-border-radius: 5px 0 0 5px; -moz-border-radius: 5px 0 0 5px;
-webkit-border-top-left-radius: 5px; -webkit-border-top-left-radius: 5px;
-webkit-border-bottom-left-radius: 5px; -webkit-border-bottom-left-radius: 5px;
@ -40,9 +40,9 @@ div.add-or-remove-shortcuts a:hover span.text {
padding-right: 17px; padding-right: 17px;
padding-left: 0; padding-left: 0;
} }
div.add-shortcut a:hover span.icon { .add-shortcut a:hover span.icon {
background-position: 0 -24px; background-position: 0 -24px;
} }
div.remove-shortcut a:hover span.icon { .remove-shortcut a:hover span.icon {
background-position: -12px -24px; background-position: -12px -24px;
} }

44
core/modules/shortcut/shortcut.css
View File

@ -1,17 +1,17 @@
div#toolbar a#edit-shortcuts { #toolbar #edit-shortcuts {
float: right; float: right;
padding: 5px 10px 5px 5px; padding: 5px 10px 5px 5px;
line-height: 24px; line-height: 24px;
color: #fefefe; color: #fefefe;
} }
div#toolbar a#edit-shortcuts:focus, #toolbar #edit-shortcuts:focus,
div#toolbar a#edit-shortcuts:hover, #toolbar #edit-shortcuts:hover,
div#toolbar a#edit-shortcuts.active { #toolbar #edit-shortcuts.active {
color: #fff; color: #fff;
text-decoration: underline; text-decoration: underline;
} }
div#toolbar div.toolbar-shortcuts ul { #toolbar .toolbar-shortcuts ul {
padding: 5px 0 2px 0; padding: 5px 0 2px 0;
height: 28px; height: 28px;
line-height: 24px; line-height: 24px;
@ -19,7 +19,7 @@ div#toolbar div.toolbar-shortcuts ul {
margin-left:5px; /* LTR */ margin-left:5px; /* LTR */
} }
div#toolbar div.toolbar-shortcuts ul li a { #toolbar .toolbar-shortcuts ul li a {
padding: 0 5px 0 5px; padding: 0 5px 0 5px;
margin-right: 5px; /* LTR */ margin-right: 5px; /* LTR */
-moz-border-radius: 5px; -moz-border-radius: 5px;
@ -27,18 +27,18 @@ div#toolbar div.toolbar-shortcuts ul li a {
border-radius: 5px; border-radius: 5px;
} }
div#toolbar div.toolbar-shortcuts ul li a:focus, #toolbar .toolbar-shortcuts ul li a:focus,
div#toolbar div.toolbar-shortcuts ul li a:hover, #toolbar .toolbar-shortcuts ul li a:hover,
div#toolbar div.toolbar-shortcuts ul li a.active:focus { #toolbar .toolbar-shortcuts ul li a.active:focus {
background: #555; background: #555;
} }
div#toolbar div.toolbar-shortcuts ul li a.active:hover, #toolbar .toolbar-shortcuts ul li a.active:hover,
div#toolbar div.toolbar-shortcuts ul li a.active { #toolbar .toolbar-shortcuts ul li a.active {
background: #000; background: #000;
} }
div#toolbar div.toolbar-shortcuts span.icon { #toolbar .toolbar-shortcuts span.icon {
float: left; /* LTR */ float: left; /* LTR */
background: #444; background: #444;
width: 30px; width: 30px;
@ -49,11 +49,11 @@ div#toolbar div.toolbar-shortcuts span.icon {
border-radius: 5px; border-radius: 5px;
} }
div.add-or-remove-shortcuts { .add-or-remove-shortcuts {
padding-top: 5px; padding-top: 5px;
} }
div.add-or-remove-shortcuts a span.icon { .add-or-remove-shortcuts a span.icon {
display: block; display: block;
width: 12px; width: 12px;
background: transparent url(shortcut.png) no-repeat scroll 0 0; background: transparent url(shortcut.png) no-repeat scroll 0 0;
@ -62,26 +62,26 @@ div.add-or-remove-shortcuts a span.icon {
margin-left:8px; margin-left:8px;
} }
div.add-shortcut a:focus span.icon, .add-shortcut a:focus span.icon,
div.add-shortcut a:hover span.icon { .add-shortcut a:hover span.icon {
background-position: 0 -12px; background-position: 0 -12px;
} }
div.remove-shortcut a span.icon { .remove-shortcut a span.icon {
background-position: -12px 0; background-position: -12px 0;
} }
div.remove-shortcut a:focus span.icon, .remove-shortcut a:focus span.icon,
div.remove-shortcut a:hover span.icon { .remove-shortcut a:hover span.icon {
background-position: -12px -12px; background-position: -12px -12px;
} }
div.add-or-remove-shortcuts a span.text { .add-or-remove-shortcuts a span.text {
float: left; float: left;
padding-left:10px; padding-left:10px;
display: none; display: none;
} }
div.add-or-remove-shortcuts a:focus span.text, .add-or-remove-shortcuts a:focus span.text,
div.add-or-remove-shortcuts a:hover span.text { .add-or-remove-shortcuts a:hover span.text {
font-size: 10px; font-size: 10px;
line-height: 12px; line-height: 12px;
color: #fff; color: #fff;

4
core/modules/toolbar/toolbar.tpl.php
View File

@ -21,7 +21,7 @@
* @see template_preprocess_toolbar() * @see template_preprocess_toolbar()
*/ */
?> ?>
<div id="toolbar" class="<?php print $classes; ?> clearfix"> <nav id="toolbar" role="navigation" class="<?php print $classes; ?> clearfix">
<div class="toolbar-menu clearfix"> <div class="toolbar-menu clearfix">
<?php print render($toolbar['toolbar_home']); ?> <?php print render($toolbar['toolbar_home']); ?>
<?php print render($toolbar['toolbar_user']); ?> <?php print render($toolbar['toolbar_user']); ?>
@ -32,4 +32,4 @@
</div> </div>
<?php print render($toolbar['toolbar_drawer']); ?> <?php print render($toolbar['toolbar_drawer']); ?>
</div> </nav>