From 93462d696378f487f673909e363456f9c7f5d145 Mon Sep 17 00:00:00 2001 From: "rflint@ryanflint.com" Date: Tue, 6 Nov 2007 21:09:12 -0800 Subject: [PATCH] Bug 387646 - Endcap cleanup. r+a=mconnor --- .../themes/gnomestripe/browser/browser.css | 199 ++++++------------ .../browser/endcap-bkgnd-hover.png | Bin 0 -> 2827 bytes browser/themes/gnomestripe/browser/jar.mn | 14 +- .../themes/gnomestripe/browser/searchbar.css | 131 ++---------- 4 files changed, 92 insertions(+), 252 deletions(-) create mode 100755 browser/themes/gnomestripe/browser/endcap-bkgnd-hover.png diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css index a3e3ced621a..43cce3b610e 100644 --- a/browser/themes/gnomestripe/browser/browser.css +++ b/browser/themes/gnomestripe/browser/browser.css @@ -1001,6 +1001,40 @@ statusbarpanel#statusbar-display { border-top: 1px solid GrayText; } +/* ::::: endcaps ::::: */ + +.endcap { + padding: 2px 0px 2px 0px; +} + +.endcap-box { + -moz-border-top-colors: #96969D; + -moz-border-right-colors: #96969D; + -moz-border-bottom-colors: #96969D; + -moz-border-radius: 0 4px 4px 0; + border: 1px solid; + border-left: none; + background-image: url("chrome://browser/skin/endcap-bkgnd.png"); + background-repeat: repeat-x; + background-position: 50% 50%; +} + +toolbar:not([mode="text"]) .endcap:hover > .endcap-box { + background-image: url("chrome://browser/skin/endcap-bkgnd-hover.png"); +} + +.endcap-box[chromedir="rtl"] { + -moz-border-radius: 4px 0 0 4px; + -moz-border-left-colors: #96969D; + border-left: 1px solid; + border-right: none; +} + +toolbar[mode="text"] .endcap-box { + border: none; + background-image: none; +} + /* ::::: go button ::::: */ /* In text icon mode, the Go button scales independently of the location bar, @@ -1014,31 +1048,49 @@ toolbar[mode="text"] #urlbar-button-box { -moz-box-align: center; } -toolbar[mode="text"] #go-button { - -moz-margin-start: 5px; +#go-button { + -moz-appearance: none; + list-style-image: url("chrome://browser/skin/Go-arrow.png"); + -moz-image-region: rect(0px 25px 22px 0px); + border: none; + padding: 0; } -toolbar[mode="text"] #go-button, -toolbar[mode="text"] #go-button-stack .go-button-background { - list-style-image: none; - background-image: none; +#go-button[chromedir="rtl"] { + list-style-image: url("chrome://browser/skin/Go-arrow-rtl.png"); +} + +toolbar[mode="text"] #go-button { + -moz-appearance: toolbarbutton; + -moz-margin-start: 5px; + padding: 3px; } toolbar[mode="text"] #go-button-stack { padding: 0; } -#go-button-stack { - padding: 2px 0px 2px 0px; +#go-button > .toolbarbutton-icon { + margin: 0; +} + +#go-button:hover { + -moz-image-region: rect(0px 50px 22px 25px); +} + +#go-button:hover:active { + -moz-image-region: rect(0px 100px 22px 75px); +} + +#go-button[disabled="true"] { + -moz-image-region: rect(0px 75px 22px 50px); } toolbar:not([mode="text"]) #go-button, -#palette-box #go-button { - -moz-appearance: none; - list-style-image: url("chrome://browser/skin/Go-arrow.png"); - -moz-image-region: rect(0px 25px 22px 0px); - border: none; - padding: 0; +toolbar:not([mode="text"]) .search-go-button, +toolbarpaletteitem:not([place="toolbar"]) #go-button, +toolbarpaletteitem:not([place="toolbar"]) .search-go-button { + -moz-binding: url(chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton-image); } /* star button */ @@ -1055,129 +1107,12 @@ toolbar:not([mode="text"]) #star-button[starred="true"], list-style-image: url("chrome://browser/skin/places/pageStarred.png"); } -#go-button[chromedir="rtl"] { - list-style-image: url("chrome://browser/skin/Go-arrow-rtl.png"); -} - -#go-button-top { - list-style-image: url("chrome://browser/skin/Go-bkgnd.png"); - -moz-image-region: rect(0px, 25px, 10px, 0px); - height: 10px; -} - -/* GTK does not stretch image regions properly, so use background - images instead. See bugs 351764 and 254659. */ -#go-button-mid-top { - background-image: url("chrome://browser/skin/Go-mid-top.png"); -} - -#go-button-mid-bottom { - background-image: url("chrome://browser/skin/Go-mid-bottom.png"); -} - -#go-button-bottom { - list-style-image: url("chrome://browser/skin/Go-bkgnd.png"); - -moz-image-region: rect(12px, 25px, 22px, 0px); - height: 10px; -} - -#go-button-top[chromedir="rtl"], -#go-button-bottom[chromedir="rtl"] { - list-style-image: url("chrome://browser/skin/Go-bkgnd-rtl.png"); -} - -#go-button-mid-top[chromedir="rtl"] { - background-image: url("chrome://browser/skin/Go-mid-top-rtl.png"); -} - -#go-button-mid-bottom[chromedir="rtl"] { - background-image: url("chrome://browser/skin/Go-mid-bottom-rtl.png"); -} - -#go-button-stack:hover #go-button-top { - -moz-image-region: rect(0px, 50px, 10px, 25px); -} - -#go-button-stack:hover #go-button-mid-top, -#go-button-stack:hover #go-button-mid-bottom { - background-position: -25px 0px; -} - -#go-button-stack:hover #go-button-bottom { - -moz-image-region: rect(12px, 50px, 22px, 25px); -} - -/* Disabled images are not used. */ -#go-button-stack[disabled="true"] #go-button-top { - -moz-image-region: rect(0px, 75px, 10px, 50px) !important; -} - -#go-button-stack[disabled="true"] #go-button-mid-top, -#go-button-stack[disabled="true"] #go-button-mid-bottom { - background-position: -50px 0px; -} - -#go-button-stack[disabled="true"] #go-button-bottom { - -moz-image-region: rect(12px, 75px, 22px, 50px) !important; -} - - -#go-button-stack:hover:active #go-button-top { - -moz-image-region: rect(0px, 100px, 10px, 75px); -} - -#go-button-stack:hover:active #go-button-mid-top, -#go-button-stack:hover:active #go-button-mid-bottom { - background-position: -75px; -} - -#go-button-stack:hover:active #go-button-bottom { - -moz-image-region: rect(12px, 100px, 22px, 75px); -} - - -toolbar[mode="text"] #go-button-top, -toolbar[mode="text"] #go-button-mid-top, -toolbar[mode="text"] #go-button-mid-bottom, -toolbar[mode="text"] #go-button-bottom { - display: none; -} - -toolbar[mode="text"] #go-button > .toolbarbutton-text { - display: -moz-box !important; - -moz-margin-start: 4px !important; -} - -/* Not used. */ -#go-button:not([disabled="true"]):hover { - -moz-image-region: rect(0px 50px 22px 25px); -} - -#go-button[disabled="true"] { - -moz-image-region: rect(0px 75px 22px 50px); -} - -#go-button:not([disabled="true"]):hover:active { - -moz-image-region: rect(0px 100px 22px 75px); -} - -#go-button > .toolbarbutton-icon { - margin: 0; -} - -toolbar:not([mode="text"]) #go-button, -toolbar:not([mode="text"]) .search-go-button, -toolbarpaletteitem:not([place="toolbar"]) #go-button, -toolbarpaletteitem:not([place="toolbar"]) .search-go-button { - -moz-binding: url(chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton-image); -} +/* ::::: content area ::::: */ #sidebar { background-color: Window; } -/* ::::: content area ::::: */ - #status-bar { border-top: none; } diff --git a/browser/themes/gnomestripe/browser/endcap-bkgnd-hover.png b/browser/themes/gnomestripe/browser/endcap-bkgnd-hover.png new file mode 100755 index 0000000000000000000000000000000000000000..3550d4c12dea780865276bae4a6c1156e6efa37e GIT binary patch literal 2827 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 literal 0 HcmV?d00001 diff --git a/browser/themes/gnomestripe/browser/jar.mn b/browser/themes/gnomestripe/browser/jar.mn index b15824b406e..87f27d3caa1 100644 --- a/browser/themes/gnomestripe/browser/jar.mn +++ b/browser/themes/gnomestripe/browser/jar.mn @@ -2,6 +2,8 @@ classic.jar: % skin browser classic/1.0 %skin/classic/browser/ * skin/classic/browser/browser.css (browser.css) skin/classic/browser/browser.xml + skin/classic/browser/endcap-bkgnd.png + skin/classic/browser/endcap-bkgnd-hover.png * skin/classic/browser/engineManager.css (engineManager.css) skin/classic/browser/Info.png skin/classic/browser/pageInfo.css @@ -20,21 +22,9 @@ classic.jar: skin/classic/browser/Toolbar-small.png skin/classic/browser/Go-arrow.png skin/classic/browser/Go-arrow-rtl.png - skin/classic/browser/Go-bkgnd.png - skin/classic/browser/Go-bkgnd-rtl.png - skin/classic/browser/Go-mid-top.png - skin/classic/browser/Go-mid-top-rtl.png - skin/classic/browser/Go-mid-bottom.png - skin/classic/browser/Go-mid-bottom-rtl.png * skin/classic/browser/searchbar.css (searchbar.css) skin/classic/browser/Search-glass.png skin/classic/browser/Search-glass-rtl.png - skin/classic/browser/Search-bkgnd.png - skin/classic/browser/Search-bkgnd-rtl.png - skin/classic/browser/Search-mid-top.png - skin/classic/browser/Search-mid-top-rtl.png - skin/classic/browser/Search-mid-bottom.png - skin/classic/browser/Search-mid-bottom-rtl.png skin/classic/browser/Search-provider-bkgnd.png skin/classic/browser/Search-provider-mid-top.png skin/classic/browser/Search-provider-mid-bottom.png diff --git a/browser/themes/gnomestripe/browser/searchbar.css b/browser/themes/gnomestripe/browser/searchbar.css index c9817fc0b39..be202529165 100644 --- a/browser/themes/gnomestripe/browser/searchbar.css +++ b/browser/themes/gnomestripe/browser/searchbar.css @@ -1,11 +1,13 @@ -/* *** winstripe *** */ - %ifdef MOZ_WIDGET_GTK2 #searchbar { -moz-margin-start: 3px; } %endif +.searchbar-box { + -moz-padding-end: 5px; +} + .searchbar-textbox { min-height: 22px; width: 4em; @@ -133,7 +135,8 @@ toolbar[mode="text"] .searchbar-box { .search-go-button { list-style-image: url("chrome://browser/skin/Search-glass.png"); - border: 0px !important; + -moz-image-region: rect(0px 25px 22px 0px); + border: 0px; padding: 0px; -moz-appearance: none; } @@ -142,110 +145,6 @@ toolbar[mode="text"] .searchbar-box { list-style-image: url("chrome://browser/skin/Search-glass-rtl.png"); } -.search-go-button-stack { - padding: 2px 0px 2px 0px; - -moz-padding-end: 5px; -} - -toolbar[mode="text"] .search-go-button { - -moz-margin-start: 5px; - padding: 3px; - -moz-appearance: toolbarbutton; -} - -toolbar[mode="text"] .search-go-button-stack { - padding: 0px; -} - -toolbar[mode="text"] .search-go-button, -toolbar[mode="text"] .search-go-button-stack .search-go-button-bkgnd { - background-image: none; - list-style-image: none; - width: auto; -} - -.search-go-button-top { - list-style-image: url("chrome://browser/skin/Search-bkgnd.png"); - -moz-image-region: rect(0px, 25px, 10px, 0px); - height: 10px; -} - -/* GTK does not stretch image regions properly, so use background - images instead. See bugs 351764 and 254659. */ -.search-go-button-mid-top { - background-image: url("chrome://browser/skin/Search-mid-top.png"); -} - -.search-go-button-mid-bottom { - background-image: url("chrome://browser/skin/Search-mid-bottom.png"); -} - -.search-go-button-bottom { - list-style-image: url("chrome://browser/skin/Search-bkgnd.png"); - -moz-image-region: rect(12px, 25px, 22px, 0px); - height: 10px; -} - -.search-go-button-top[chromedir="rtl"], -.search-go-button-bottom[chromedir="rtl"] { - list-style-image: url("chrome://browser/skin/Search-bkgnd-rtl.png"); -} - -.search-go-button-mid-top[chromedir="rtl"] { - background-image: url("chrome://browser/skin/Search-mid-top-rtl.png"); -} - -.search-go-button-mid-bottom[chromedir="rtl"] { - background-image: url("chrome://browser/skin/Search-mid-bottom-rtl.png"); -} - -.search-go-button-stack:hover .search-go-button-top { - -moz-image-region: rect(0px, 50px, 10px, 25px); -} - -.search-go-button-stack:hover .search-go-button-mid-top, -.search-go-button-stack:hover .search-go-button-mid-bottom { - background-position: -25px 0px; -} - -.search-go-button-stack:hover .search-go-button-bottom { - -moz-image-region: rect(12px, 50px, 22px, 25px); -} - - -/* Disabled images are not used. */ -.search-go-button-stack[disabled="true"] .search-go-button-top { - -moz-image-region: rect(0px, 75px, 10px, 50px); -} - -.search-go-button-stack[disabled="true"] .search-go-button-mid-top, -.search-go-button-stack[disabled="true"] .search-go-button-mid-bottom { - background-position: -50px 0px; -} - -.search-go-button-stack[disabled="true"] .search-go-button-bottom { - -moz-image-region: rect(12px, 75px, 22px, 50px); -} - - -.search-go-button-stack:hover:active .search-go-button-top { - -moz-image-region: rect(0px, 100px, 10px, 75px); -} - -.search-go-button-stack:hover:active .search-go-button-mid-top, -.search-go-button-stack:hover:active .search-go-button-mid-bottom { - background-position: -75px 0px; -} - -.search-go-button-stack:hover:active .search-go-button-bottom { - -moz-image-region: rect(12px, 100px, 22px, 75px); -} - - -.search-go-button { - -moz-image-region: rect(0px 25px 22px 0px); -} - .search-go-button:hover { -moz-image-region: rect(0px 50px 22px 25px); } @@ -258,8 +157,24 @@ toolbar[mode="text"] .search-go-button-stack .search-go-button-bkgnd { -moz-image-region: rect(0px, 100px, 22px, 75px); } +toolbar[mode="text"] .search-go-button { + -moz-margin-start: 5px; + padding: 3px; + -moz-appearance: toolbarbutton; +} + +toolbar[mode="text"] .search-go-button-stack { + padding: 0px; +} + +toolbar[mode="text"] .search-go-button { + background-image: none; + list-style-image: none; + width: auto; +} + .search-go-button > .toolbarbutton-icon { - margin: 0px !important; + margin: 0px; } .searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {