From 18bf283f08bbe4969b5b2a9d43f5702bd3b87683 Mon Sep 17 00:00:00 2001 From: "mozilla.mano%sent.com" Date: Sun, 24 Sep 2006 23:03:36 +0000 Subject: [PATCH] Switching back to non-native tabbrowser-tabstrip, see bug 353757. git-svn-id: svn://10.0.0.236/trunk@212273 18797224-902f-48f8-a5cc-f745e15eee43 --- .../themes/winstripe/global/browser.css | 442 ++++++++++++++++-- 1 file changed, 391 insertions(+), 51 deletions(-) diff --git a/mozilla/toolkit/themes/winstripe/global/browser.css b/mozilla/toolkit/themes/winstripe/global/browser.css index 1f117b5c1a0..a4610bde7ac 100644 --- a/mozilla/toolkit/themes/winstripe/global/browser.css +++ b/mozilla/toolkit/themes/winstripe/global/browser.css @@ -1,29 +1,137 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -.tabbrowser-strip { - -} - -tabpanels { - -moz-appearance: none; -} +/** + * Tabbrowser Tabs + */ .tabbrowser-tabs { + -moz-binding: url("chrome://global/skin/globalBindings.xml#tabbrowser-tabs") !important; + padding-top: 0px; + background: -moz-dialog url("chrome://global/skin/icons/tabbrowser-tabs-bkgnd.png") !important; + -moz-padding-start: 0px; +} + +.tabbrowser-tabs[overflow="true"] { + -moz-padding-start: 0px; +} + +/** + * Tab + */ + +.tabbrowser-tab { + -moz-appearance: none !important; + -moz-binding: url("chrome://global/skin/globalBindings.xml#tabbrowser-tab") !important; + background: transparent !important; + margin: 0px !important; + padding: 0px !important; + border: none !important; + height: 22px !important; + margin-bottom: 1px; +} + +.tabbrowser-tab > .tab-image-middle { padding-top: 1px; - background: transparent url("chrome://global/skin/icons/tabstrip-bottom.png") repeat-x bottom center !important; - -moz-padding-start: 2px; - border-bottom: 2px solid; - -moz-border-bottom-colors: threedshadow threedlightshadow; + -moz-padding-start: 1px; } -.tabs-left, -.tabs-right { - width: 3px; - border-bottom-width: 0px; +.tabbrowser-tab[busy] > .tab-image-middle > .tab-icon > .tab-icon-image { + list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif") !important; + opacity: 0.6; } -.tab-icon { +.tabbrowser-tab[selected="true"] { + font-weight: bold; +} + +.tabbrowser-tab[selected="true"] > .tab-image-middle > .tab-text { + opacity: 1.0 !important; +} + +.tabbrowser-tab > .tab-image-left { + width: 8px; + height: 24px; + list-style-image: url("chrome://global/skin/icons/tabs.png"); + -moz-image-region: rect(75px,8px,99px,0); + background-color: -moz-dialog; + -moz-border-radius-topleft: 3px; +} + +.tabbrowser-tab[chromedir="rtl"] > .tab-image-left { + -moz-image-region: rect(75px,16px,99px,8px); + -moz-border-radius-topleft: 0px; + -moz-border-radius-topright: 3px; +} + +.tabbrowser-tab:not([selected="true"]) > .tab-image-left { + height: 23px; + margin-bottom: 1px; + -moz-image-region: rect(0,8px,23px,0); +} + +.tabbrowser-tab[chromedir="rtl"]:not([selected="true"])> .tab-image-left { + -moz-image-region: rect(0,16px,23px,8px); +} + +.tabbrowser-tab:not([selected="true"]):hover > .tab-image-left { + -moz-image-region: rect(75px,8px,98px,0); +} + +.tabbrowser-tab[chromedir="rtl"]:not([selected="true"]):hover > .tab-image-left { + -moz-image-region: rect(75px,16px,98px,8px); +} + +.tabbrowser-tab > .tab-image-middle { + height: 24px; + background: url("chrome://global/skin/icons/tab-middle.png") repeat-x; + background-color: -moz-dialog; +} + +.tabbrowser-tab:not([selected="true"]) > .tab-image-middle { + height: 23px; + margin-bottom: 1px; +} + +.tabbrowser-tab:not([selected="true"]):not(:hover) > .tab-image-middle { + background: url("chrome://global/skin/icons/tab-middle-bkgnd.png") repeat-x; + background-color: -moz-dialog; +} + +.tabbrowser-tab > .tab-image-right { + width: 8px; + height: 24px; + list-style-image: url("chrome://global/skin/icons/tabs.png"); + -moz-image-region: rect(75px,16px,99px,8px); + background-color: -moz-dialog; + -moz-border-radius-topright: 3px; +} + +.tabbrowser-tab[chromedir="rtl"] > .tab-image-right { + -moz-image-region: rect(75px,8px,99px,0); + -moz-border-radius-topleft: 3px; + -moz-border-radius-topright: 0px; +} + +.tabbrowser-tab:not([selected="true"]) > .tab-image-right { + height: 23px; + margin-bottom: 1px; + -moz-image-region: rect(0,16px,23px,8px); +} + +.tabbrowser-tab[chromedir="rtl"]:not([selected="true"]) > .tab-image-right { + -moz-image-region: rect(0,8px,23px,0); +} + +.tabbrowser-tab:not([selected="true"]):hover > .tab-image-right { + -moz-image-region: rect(75px,16px,98px,8px); +} + +.tabbrowser-tab[chromedir="rtl"]:not([selected="true"]):hover > .tab-image-right { + -moz-image-region: rect(75px,8px,98px,0); +} + +.tab-icon-image { margin-top: 1px; -moz-margin-end: 3px; width: 16px; @@ -32,21 +140,37 @@ tabpanels { -moz-image-region: rect(0px, 16px, 16px, 0px); } -tab[busy] > .tab-middle > .tab-icon { - list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif"); - opacity: 0.5; +.tabs-bottom { + height: 4px !important; + margin: 0px !important; + background: -moz-dialog url("chrome://global/skin/icons/tabstrip-bottom.png") repeat !important; + border-top: 1px solid threedshadow; + border-bottom: 1px solid threedshadow; } -tab[selected="true"] { - font-weight: bold; - margin-bottom: 0px; - -moz-padding-start: 3px; +tabpanels { + -moz-appearance: none; } -tab { - margin-bottom: 1px; +.tabs-left, +.tabs-right { + width: 3px; + border-bottom-width: 0px; } +/* tabbrowser-tab focus ring */ +.tabbrowser-tab > .tab-image-middle > .tab-text { + border: 1px dotted transparent; +} + +.tabbrowser-tab:focus > .tab-image-middle > .tab-text { + border: 1px dotted -moz-DialogText; +} + +/** + * Tab Drag and Drop + */ + .tab-drop-indicator-bar { display:none; height: 9px; @@ -71,17 +195,26 @@ tab { */ .tab-close-button > .toolbarbutton-icon { -moz-margin-end: 0px !important; + margin-top: 1px; } .tab-close-button { - list-style-image: url("chrome://global/skin/icons/close.png"); -moz-appearance: none; -moz-image-region: rect(0px, 64px, 16px, 48px); - -moz-margin-start: 2px; - margin-top: 2px; + height: 24px; border: none !important; padding: 0px; - opacity: 0.7; + cursor: default; + list-style-image: url("chrome://global/skin/icons/close.png"); +} + +.tabbrowser-tab:not([selected="true"]) > .tab-close-button { + height: 23px; + margin-bottom: 1px; +} + +.tabbrowser-tab:not([selected="true"]) > .tab-close-button > .toolbarbutton-icon { + margin-top: 2px; } .tab-close-button:hover, @@ -96,12 +229,19 @@ tab { opacity: 1.0; } +.tabbrowser-tab > .tab-close-button { + background-image: url("chrome://global/skin/icons/tab-middle-bkgnd.png"); + background-color: -moz-dialog; +} + +.tabbrowser-tab:hover > .tab-close-button { + background-image: url("chrome://global/skin/icons/tab-middle-hover.png"); +} + .tabbrowser-tab[selected="true"] > .tab-close-button { - -moz-margin-start: 2px; - margin-top: 0px; - opacity: 1.0; + background-image: url("chrome://global/skin/icons/tab-middle.png"); -moz-image-region: rect(0px, 16px, 16px, 0px); - /* Make this button focusable so clicking on it will not focus the tab while + /* Make this button focusable so clicking on it will not focus the tab while it's getting closed */ -moz-user-focus: normal; } @@ -111,23 +251,154 @@ tab { } /** - * Tabbrowser Tabs + * Tab Scrollbox Arrow Buttons */ -.tabbrowser-tab[selected="true"] { - -moz-padding-end: 4px; - padding-top: 4px; - padding-bottom: 1px; + +.tabbrowser-tabs[overflow="true"] .tabs-left { + display: none; } -.tabbrowser-tab > .tab-middle { - padding-top: 1px; +.tabbrowser-arrowscrollbox > .scrollbutton-up { + -moz-appearance: none !important; + border: none !important; + margin-top: 2px; + margin-bottom: 4px !important; + padding: 0px; + width: 18px; + height: 23px; + -moz-margin-start: 0px; + -moz-margin-end: 0px; + list-style-image: url("chrome://global/skin/icons/tabs.png"); + -moz-image-region: rect(0,27px,11px,16px); + background-repeat: no-repeat; + background-image: url("chrome://global/skin/icons/tab-arrow-start-bkgnd-enabled.png"); + background-color: -moz-dialog; + -moz-border-radius-topright: 5px; } -.tabbrowser-tab[selected="true"] > .tab-middle { - padding-bottom: 1px; - padding-top: 0; - -moz-padding-start: 1px; - margin-bottom: 1px; +.tabbrowser-arrowscrollbox[chromedir="rtl"] > .scrollbutton-up { + -moz-image-region: rect(11px,27px,22px,16px); + background-image: url("chrome://global/skin/icons/tab-arrow-end-bkgnd-enabled.png"); + -moz-border-radius-topleft: 5px; + -moz-border-radius-topright: 0px; +} + +.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled="true"] { + -moz-image-region: rect(0,49px,11px,38px); + background-image: url("chrome://global/skin/icons/tab-arrow-start-bkgnd-disabled.png"); +} + +.tabbrowser-arrowscrollbox[chromedir="rtl"] > .scrollbutton-up[disabled="true"] { + -moz-image-region: rect(11px,49px,22px,38px); + background-image: url("chrome://global/skin/icons/tab-arrow-end-bkgnd-disabled.png"); +} + +.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover { + -moz-image-region: rect(0,38px,11px,27px); + background-image: url("chrome://global/skin/icons/tab-arrow-start-bkgnd-hover.png"); +} + +.tabbrowser-arrowscrollbox[chromedir="rtl"] > .scrollbutton-up:not([disabled="true"]):hover { + -moz-image-region: rect(11px,38px,22px,27px); + background-image: url("chrome://global/skin/icons/tab-arrow-end-bkgnd-hover.png"); +} + +.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover:active { + -moz-image-region: rect(0,60px,11px,49px); +} + +.tabbrowser-arrowscrollbox[chromedir="rtl"] > .scrollbutton-up:not([disabled="true"]):hover:active { + -moz-image-region: rect(11px,60px,22px,49px); +} + +.tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon { + margin: 2px 0px 0px 0px; +} + +.tabbrowser-arrowscrollbox > .scrollbutton-down-stack { + margin-top: 2px; + margin-bottom: 4px; + height: 23px; +} + +.scrollbutton-rel-box > .scrollbutton-down-box { + -moz-appearance: none !important; + border: none !important; + width: 18px; + background-image: url("chrome://global/skin/icons/tab-arrow-end-bkgnd-enabled.png"); + background-repeat: no-repeat; + background-color: -moz-dialog; + -moz-border-radius-topleft: 5px; +} + +.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-rel-box > .scrollbutton-down-box { + background-image: url("chrome://global/skin/icons/tab-arrow-start-bkgnd-enabled.png"); + -moz-border-radius-topleft: 0px; + -moz-border-radius-topright: 5px; +} + +.scrollbutton-rel-box > .scrollbutton-down-box[disabled="true"] { + background-image: url("chrome://global/skin/icons/tab-arrow-end-bkgnd-disabled.png"); +} + +.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-rel-box > .scrollbutton-down-box[disabled="true"] { + background-image: url("chrome://global/skin/icons/tab-arrow-start-bkgnd-disabled.png"); +} + +.scrollbutton-rel-box > .scrollbutton-down-box-animate { + background-image: url("chrome://global/skin/icons/tab-arrow-end-bkgnd-animate.png"); + background-repeat: no-repeat; + opacity: 0.0; +} + +.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-rel-box > .scrollbutton-down-box-animate { + background-image: url("chrome://global/skin/icons/tab-arrow-start-bkgnd-animate.png"); +} + +.scrollbutton-rel-box > .scrollbutton-down { + -moz-appearance: none !important; + border: none !important; + width: 18px; + list-style-image: url("chrome://global/skin/icons/tabs.png"); + -moz-image-region: rect(11px,27px,22px,16px); + margin: 0px; + padding: 0px; +} + +.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-rel-box > .scrollbutton-down { + -moz-image-region: rect(0,27px,11px,16px); +} + +.scrollbutton-rel-box > .scrollbutton-down[disabled="true"] { + -moz-image-region: rect(11px,49px,22px,38px); +} + +.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-rel-box > .scrollbutton-down[disabled="true"] { + -moz-image-region: rect(0,49px,11px,38px); +} + +.scrollbutton-rel-box > .scrollbutton-down:not([disabled="true"]):hover { + -moz-image-region: rect(11px,38px,22px,27px); + background-image: url("chrome://global/skin/icons/tab-arrow-end-bkgnd-hover.png"); + background-repeat: no-repeat; + background-position: top left; +} + +.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-rel-box > .scrollbutton-down:not([disabled="true"]):hover { + -moz-image-region: rect(0,38px,11px,27px); + background-image: url("chrome://global/skin/icons/tab-arrow-start-bkgnd-hover.png"); +} + +.scrollbutton-rel-box > .scrollbutton-down:not([disabled="true"]):hover:active { + -moz-image-region: rect(11px,60px,22px,49px); +} + +.scrollbutton-rel-box[chromedir="rtl"] > .scrollbutton-down:not([disabled="true"]):hover:active { + -moz-image-region: rect(0,60px,11px,49px); +} + +.scrollbutton-rel-box > .scrollbutton-down > .toolbarbutton-icon { + margin: 2px 0px 0px 1px; } /** @@ -135,17 +406,86 @@ tab { */ .tabs-alltabs-box { - background-color: orange; - opacity: 0.0; + margin-top: 2px; + margin-bottom: 4px; + width: 18px !important; + height: 23px !important; + background-image: url("chrome://global/skin/icons/alltabs-box-end-bkgnd.png"); + background-repeat: no-repeat; + background-color: -moz-dialog; + -moz-border-radius-topleft: 5px; +} + +stack[chromedir="rtl"] > hbox > .tabs-alltabs-box { + background-image: url("chrome://global/skin/icons/alltabs-box-start-bkgnd.png"); + -moz-border-radius-topleft: 0px; + -moz-border-radius-topright: 5px; +} + +.tabbrowser-tabs[overflow="true"] .tabs-alltabs-box { + background-image: url("chrome://global/skin/icons/alltabs-box-overflow-end-bkgnd.png"); + -moz-border-radius-topleft: 0px; + -moz-border-radius-topright: 0px; +} + +.tabbrowser-tabs[overflow="true"] stack[chromedir="rtl"] > hbox > .tabs-alltabs-box { + background-image: url("chrome://global/skin/icons/alltabs-box-overflow-start-bkgnd.png"); } .tabs-alltabs-button { - list-style-image: url("chrome://global/skin/icons/alltabs.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); + -moz-appearance: none !important; + border: 0px !important; + margin-top: 2px; + margin-bottom: 4px; + width: 18px !important; + height: 23px !important; + border: 0px !important; + -moz-padding-start: 4px !important; + -moz-padding-end: 4px !important; + padding: 0px; +} + +.tabs-alltabs-button > .toolbarbutton-text { + display: none; +} + +.tabs-alltabs-button > .toolbarbutton-icon { + -moz-margin-end: 2px; +} + +.tabs-alltabs-button > .toolbarbutton-menu-dropmarker { + margin-top: 3px !important; } .tabs-alltabs-button:hover { - -moz-image-region: rect(0px, 48px, 16px, 32px); + background-image: url("chrome://global/skin/icons/alltabs-box-end-bkgnd-hover.png"); + background-repeat: no-repeat; +} + +stack[chromedir="rtl"] > hbox > .tabs-alltabs-button:hover { + background-image: url("chrome://global/skin/icons/alltabs-box-start-bkgnd-hover.png"); +} + +.tabbrowser-tabs[overflow="true"] .tabs-alltabs-button:hover { + background-image: url("chrome://global/skin/icons/alltabs-box-overflow-end-bkgnd-hover.png"); +} + +.tabbrowser-tabs[overflow="true"] stack[chromedir="rtl"] > hbox > .tabs-alltabs-button:hover { + background-image: url("chrome://global/skin/icons/alltabs-box-overflow-start-bkgnd-hover.png"); +} + +.tabs-alltabs-box-animate { + margin-top: 2px; + margin-bottom: 4px; + width: 18px !important; + height: 23px !important; + background-image: url("chrome://global/skin/icons/alltabs-box-overflow-end-bkgnd-animate.png"); + background-repeat: no-repeat; + opacity: 0.0; +} + +stack[chromedir="rtl"] > hbox > .tabs-alltabs-box-animate { + background-image: url("chrome://global/skin/icons/alltabs-box-overflow-start-bkgnd-animate.png"); } /** @@ -165,5 +505,5 @@ tab { .alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon { list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif"); - opacity: 0.5; + opacity: 0.6; }