Bug 867543 - Part 2 - Add static labels. r=mbrubeck

--HG--
extra : rebase_source : bc7b5b58ecc667982160e325b99a45eb2cd9fd2a
This commit is contained in:
Jonathan Wilde 2013-07-16 13:38:05 -07:00
parent afa3533a45
commit fe0d196966
4 changed files with 34 additions and 7 deletions

View File

@ -361,12 +361,22 @@
<!-- Context button bar -->
<appbar id="contextappbar">
<toolbar id="contextualactions-tray" flex="1">
<toolbarbutton id="delete-selected-button" class="appbar-secondary" hidden="true" fade="true" oncommand="Appbar.dispatchContextualAction('delete')"/>
<toolbarbutton id="restore-selected-button" class="appbar-secondary" hidden="true" fade="true" oncommand="Appbar.dispatchContextualAction('restore')"/>
<toolbarbutton id="pin-selected-button" class="appbar-secondary" hidden="true" fade="true" oncommand="Appbar.dispatchContextualAction('pin')"/>
<toolbarbutton id="unpin-selected-button" class="appbar-secondary" hidden="true" fade="true" oncommand="Appbar.dispatchContextualAction('unpin')"/>
<toolbarbutton id="clear-selected-button" class="appbar-secondary" hidden="true" fade="true" oncommand="Appbar.dispatchContextualAction('clear')"/>
<toolbar id="contextualactions-tray" labelled="true" flex="1">
<toolbarbutton id="delete-selected-button" class="appbar-secondary"
hidden="true" fade="true"
oncommand="Appbar.dispatchContextualAction('delete')"/>
<toolbarbutton id="restore-selected-button" class="appbar-secondary"
hidden="true" fade="true"
oncommand="Appbar.dispatchContextualAction('restore')"/>
<toolbarbutton id="pin-selected-button" class="appbar-secondary"
hidden="true" fade="true"
oncommand="Appbar.dispatchContextualAction('pin')"/>
<toolbarbutton id="unpin-selected-button" class="appbar-secondary"
hidden="true" fade="true"
oncommand="Appbar.dispatchContextualAction('unpin')"/>
<toolbarbutton id="clear-selected-button" class="appbar-secondary"
hidden="true" fade="true"
oncommand="Appbar.dispatchContextualAction('clear')"/>
</toolbar>
</appbar>

View File

@ -414,6 +414,9 @@ documenttab[selected] .documenttab-selection {
transition-timing-function: ease-in;
transition-delay: 80ms;
}
#contextualactions-tray > toolbarbutton > .toolbarbutton-text {
color: white;
}
#pin-selected-button {
-moz-image-region: rect(0px, 240px, 40px, 200px) !important;

View File

@ -19,6 +19,7 @@
%define toolbar_vertical_spacing 5px
%define toolbar_horizontal_spacing 20px
%define toolbar_height 68px
%define labelled_toolbar_height 90px
%define tabs_height 178px
%define findbar_height 54px

View File

@ -498,7 +498,6 @@ notification {
-moz-box-flex: 9999;
}
/* Dialogs ----------------------------------------------------------------- */
.modal-block,
@ -708,6 +707,20 @@ appbar toolbar > toolbarbutton[disabled] {
visibility: collapse;
}
appbar toolbar[labelled] {
min-height: @labelled_toolbar_height@;
}
appbar toolbar[labelled] > toolbarbutton {
-moz-box-orient: vertical;
}
appbar toolbar[labelled] > toolbarbutton > .toolbarbutton-text {
display: block;
padding-top: @metro_spacing_small@;
font-size: 0.75rem;
}
/* Sprites */
.appbar-primary > .toolbarbutton-icon,