Bug 604531 - Styles for toolbarbutton inside #TabsToolbar not applied if it's also inside a toolbaritem. r=dao

This commit is contained in:
Geoff Lankow 2010-11-13 10:34:13 +13:00
parent 76721219af
commit d2808808df
3 changed files with 25 additions and 54 deletions

View File

@ -1565,14 +1565,9 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
-moz-transition: none;
}
#TabsToolbar > toolbarbutton > .toolbarbutton-icon,
#TabsToolbar > toolbarbutton > .toolbarbutton-menu-dropmarker,
#TabsToolbar > toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon,
#TabsToolbar > toolbarpaletteitem > toolbarbutton > .toolbarbutton-menu-dropmarker,
#TabsToolbar > #bookmarks-menu-button-container > #bookmarks-menu-button > .toolbarbutton-icon,
#TabsToolbar > #bookmarks-menu-button-container > #bookmarks-menu-button > .toolbarbutton-menu-dropmarker,
#TabsToolbar > toolbarpaletteitem > #bookmarks-menu-button-container > #bookmarks-menu-button > .toolbarbutton-icon,
#TabsToolbar > toolbarpaletteitem > #bookmarks-menu-button-container > #bookmarks-menu-button > .toolbarbutton-menu-dropmarker {
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon,
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
margin-top: -2px;
margin-bottom: -2px;
}

View File

@ -84,9 +84,7 @@
}
#tabbrowser-tabs[tabsontop="false"] > .tabbrowser-arrowscrollbox > .tabs-newtab-button:-moz-lwtheme-darktext,
#TabsToolbar[tabsontop="false"] > toolbarbutton:-moz-lwtheme-darktext,
#TabsToolbar[tabsontop="false"] > toolbarpaletteitem > toolbarbutton:-moz-lwtheme-darktext,
#TabsToolbar[tabsontop="false"] > #bookmarks-menu-button-container > #bookmarks-menu-button:-moz-lwtheme-darktext,
#TabsToolbar[tabsontop="false"] .toolbarbutton-1:-moz-lwtheme-darktext,
#TabsToolbar[tabsontop="false"] #tabs-closebutton:-moz-lwtheme-darktext,
#tabbrowser-tabs[tabsontop="false"] > .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-lwtheme-darktext,
#tabbrowser-tabs[tabsontop="false"] > .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-lwtheme-darktext,
@ -95,9 +93,7 @@
}
#tabbrowser-tabs[tabsontop="false"] > .tabbrowser-arrowscrollbox > .tabs-newtab-button:-moz-lwtheme-brighttext,
#TabsToolbar[tabsontop="false"] > toolbarbutton:-moz-lwtheme-brighttext,
#TabsToolbar[tabsontop="false"] > toolbarpaletteitem > toolbarbutton:-moz-lwtheme-brighttext,
#TabsToolbar[tabsontop="false"] > #bookmarks-menu-button-container > #bookmarks-menu-button:-moz-lwtheme-brighttext,
#TabsToolbar[tabsontop="false"] .toolbarbutton-1:-moz-lwtheme-brighttext,
#TabsToolbar[tabsontop="false"] #tabs-closebutton:-moz-lwtheme-brighttext,
#tabbrowser-tabs[tabsontop="false"] > .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-lwtheme-brighttext,
#tabbrowser-tabs[tabsontop="false"] > .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-lwtheme-brighttext,
@ -1713,13 +1709,9 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
* Tabstrip toolbar buttons
*/
#TabsToolbar > toolbarbutton,
#TabsToolbar > toolbarpaletteitem > toolbarbutton,
#TabsToolbar > #bookmarks-menu-button-container > #bookmarks-menu-button,
#TabsToolbar > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-button,
#TabsToolbar > toolbarpaletteitem > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-button,
#TabsToolbar > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-dropmarker,
#TabsToolbar > toolbarpaletteitem > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-dropmarker {
#TabsToolbar .toolbarbutton-1,
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
margin: 0;
padding: 0;
border: none;
@ -1728,13 +1720,9 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
box-shadow: none;
}
#TabsToolbar > toolbarbutton:not([type="menu-button"]),
#TabsToolbar > toolbarpaletteitem > toolbarbutton:not([type="menu-button"]),
#TabsToolbar > #bookmarks-menu-button-container > #bookmarks-menu-button,
#TabsToolbar > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-button,
#TabsToolbar > toolbarpaletteitem > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-button,
#TabsToolbar > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-dropmarker,
#TabsToolbar > toolbarpaletteitem > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-dropmarker {
#TabsToolbar .toolbarbutton-1:not([type="menu-button"]),
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-moz-border-start: 2px solid !important;
-moz-border-end: none !important;
-moz-border-left-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15) !important;
@ -1745,30 +1733,25 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
}
.tabs-newtab-button > .toolbarbutton-icon,
#TabsToolbar > toolbarbutton > .toolbarbutton-icon,
#TabsToolbar > toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon,
#TabsToolbar > #bookmarks-menu-button-container > #bookmarks-menu-button > .toolbarbutton-icon,
#TabsToolbar > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
#TabsToolbar > toolbarpaletteitem > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon,
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
padding: 0;
}
.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover,
.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled="true"]):hover,
#TabsToolbar > toolbarbutton:not([type="menu-button"]):not([disabled="true"]):not([open="true"]):hover,
#TabsToolbar > #bookmarks-menu-button-container > #bookmarks-menu-button:not([type="menu-button"]):not([disabled="true"]):not([open="true"]):hover,
#TabsToolbar > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-button:not([disabled="true"]):hover,
#TabsToolbar > toolbarbutton[type="menu-button"]:not([disabled="true"]):not([buttonover="true"]):hover > .toolbarbutton-menubutton-dropmarker {
#TabsToolbar .toolbarbutton-1:not([type="menu-button"]):not([disabled]):not([open]):hover,
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover,
#TabsToolbar .toolbarbutton-1:not([disabled]):not([buttonover]):hover > .toolbarbutton-menubutton-dropmarker {
background-image: -moz-linear-gradient(transparent, rgba(0,0,0,.15)) !important;
}
.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover:active,
.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled="true"]):hover:active,
#TabsToolbar > toolbarbutton:not([type="menu-button"]):not([disabled="true"]):hover:active,
#TabsToolbar > #bookmarks-menu-button-container > #bookmarks-menu-button:not([type="menu-button"]):not([disabled="true"]):hover:active,
#TabsToolbar > toolbarbutton[type="menu"][open="true"],
#TabsToolbar > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-button:not([disabled="true"]):hover:active,
#TabsToolbar > toolbarbutton[type="menu-button"][open="true"]:not([disabled="true"]):hover > .toolbarbutton-menubutton-dropmarker {
#TabsToolbar .toolbarbutton-1:not([type="menu-button"]):not([disabled]):hover:active,
#TabsToolbar .toolbarbutton-1[type="menu"][open],
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover:active,
#TabsToolbar .toolbarbutton-1[open]:not([disabled]):hover > .toolbarbutton-menubutton-dropmarker {
background-image: -moz-linear-gradient(transparent, rgba(0,0,0,.3)) !important;
}

View File

@ -607,13 +607,9 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
min-width: 57px;
}
#TabsToolbar > .toolbarbutton-1,
#TabsToolbar > .toolbarbutton-1 > .toolbarbutton-menubutton-button,
#TabsToolbar > .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
#TabsToolbar > toolbarpaletteitem > .toolbarbutton-1,
#TabsToolbar > toolbarpaletteitem > .toolbarbutton-1 > .toolbarbutton-menubutton-button,
#TabsToolbar > toolbarpaletteitem > .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
#TabsToolbar > #bookmarks-menu-button-container > #bookmarks-menu-button {
#TabsToolbar .toolbarbutton-1,
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-moz-appearance: toolbarbutton;
%ifdef WINSTRIPE_AERO
margin: -2px 0 -1px;
@ -640,8 +636,7 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
}
%endif
#TabsToolbar > .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
#TabsToolbar > toolbarpaletteitem > .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-moz-appearance: none;
}
@ -1550,9 +1545,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
@media all and (-moz-touch-enabled) {
.tabbrowser-arrowscrollbox > .scrollbutton-up,
.tabbrowser-arrowscrollbox > .scrollbutton-down,
#TabsToolbar > toolbarbutton,
#TabsToolbar > toolbarpaletteitem > toolbarbutton,
#TabsToolbar > #bookmarks-menu-button-container > #bookmarks-menu-button {
#TabsToolbar .toolbarbutton-1 {
min-width: 8.1mozmm;
}