diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml index 9bf0745168c..6b858d29db4 100644 --- a/browser/components/search/content/search.xml +++ b/browser/components/search/content/search.xml @@ -78,23 +78,21 @@ showcommentcolumn="true" tabscrolling="true" xbl:inherits="disabled,disableautocomplete,searchengine,src,newlines"> - - - - - - - - - - + + + + + + + + #back-forward-dropmarke /* ::::: nav-bar-inner ::::: */ #urlbar { - direction: ltr; -} - -.searchbar-textbox, -#urlbar { - font: icon; + direction: ltr !important; + font: icon !important; width: 7em; min-width: 7em; -moz-appearance: none; @@ -802,7 +798,6 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke -moz-padding-end: 6px; } -.searchbar-textbox[focused="true"], #urlbar[focused="true"] { -moz-border-top-colors: rgba(0,0,0,.3); -moz-border-right-colors: rgba(0,0,0,.2); @@ -814,7 +809,6 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke 0 0 2px 1px -moz-mac-focusring; } -.searchbar-engine-button, #identity-box { background: #fff url(navbar-textbox-button.png) bottom repeat-x; -moz-background-clip: padding; @@ -828,7 +822,6 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke margin-top: -1px; margin-bottom: -1px; -moz-margin-start: -1px; - -moz-margin-end: 0; } #identity-box:focus:not(:active):not([open="true"]) #page-proxy-stack { @@ -837,13 +830,6 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke 0 0 3px 2px -moz-mac-focusring; } -.searchbar-textbox[focused="true"] .searchbar-engine-button, -#urlbar[focused="true"] > #identity-box { - -moz-box-shadow: 0 0 1px -moz-mac-focusring inset; -} - -.searchbar-engine-button[open="true"], -.searchbar-engine-button:hover:active, #identity-box[open="true"], #identity-box:hover:active { border-style: none; @@ -853,7 +839,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke -moz-box-shadow: 0 0 50px rgba(0,0,0,.3) inset, 0 3px 3px rgba(0,0,0,.6) inset, 2px 0 2px rgba(0,0,0,.3) inset, - 0 -2px 2px rgba(0,0,0,.1) inset !important; + 0 -2px 2px rgba(0,0,0,.1) inset; } #identity-box.verifiedDomain { @@ -872,30 +858,17 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke display: none; } -.searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box, #urlbar > .autocomplete-textbox-container > .textbox-input-box { + -moz-border-radius-topleft: 100%; + -moz-border-radius-bottomleft: 100%; -moz-margin-end: 0; -moz-margin-start: -16px; background-color: -moz-field; -moz-padding-start: 10px; -} - -.searchbar-textbox[chromedir="ltr"] > .autocomplete-textbox-container > .textbox-input-box, -#urlbar > .autocomplete-textbox-container > .textbox-input-box { - -moz-border-radius-topleft: 100%; - -moz-border-radius-bottomleft: 100%; -moz-box-shadow: 1px 1px 1px rgba(0,0,0,.3) inset, 1px 0 0 rgba(0,0,0,.2) inset; } -.searchbar-textbox[chromedir="rtl"] > .autocomplete-textbox-container > .textbox-input-box { - -moz-border-radius-topright: 100%; - -moz-border-radius-bottomright: 100%; - -moz-box-shadow: -1px 1px 1px rgba(0,0,0,.3) inset, - -1px 0 0 rgba(0,0,0,.2) inset; -} - -.searchbar-textbox[focused="true"][chromedir="ltr"] > .autocomplete-textbox-container > .textbox-input-box, #urlbar[focused="true"] > .autocomplete-textbox-container > .textbox-input-box { -moz-box-shadow: 1px 1px 1px rgba(0,0,0,.3) inset, 1px 0 0 rgba(0,0,0,.2) inset, @@ -903,11 +876,8 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke 1px 0 1px -moz-mac-focusring inset; } -.searchbar-textbox[focused="true"][chromedir="rtl"] > .autocomplete-textbox-container > .textbox-input-box { - -moz-box-shadow: -1px 1px 1px rgba(0,0,0,.3) inset, - -1px 0 0 rgba(0,0,0,.2) inset, - -2px 0 0 -moz-field inset, - -1px 0 1px -moz-mac-focusring inset; +#urlbar[focused="true"] > #identity-box { + -moz-box-shadow: 0 0 1px -moz-mac-focusring inset; } #urlbar-icons { diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn index 8ffd59b568f..85f0add328e 100644 --- a/browser/themes/pinstripe/browser/jar.mn +++ b/browser/themes/pinstripe/browser/jar.mn @@ -125,5 +125,19 @@ classic.jar: skin/classic/browser/tabbrowser/tabbrowser-tabs-bkgnd.png (tabbrowser/tabbrowser-tabs-bkgnd.png) skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png) skin/classic/browser/tabbrowser/tab-bkgnd.png (tabbrowser/tab-bkgnd.png) + skin/classic/browser/urlbar/endcap.png (urlbar/endcap.png) + skin/classic/browser/urlbar/endcap-rtl.png (urlbar/endcap-rtl.png) + skin/classic/browser/urlbar/endcap-focused.png (urlbar/endcap-focused.png) + skin/classic/browser/urlbar/endcap-focused-rtl.png (urlbar/endcap-focused-rtl.png) + skin/classic/browser/urlbar/startcap.png (urlbar/startcap.png) + skin/classic/browser/urlbar/startcap-rtl.png (urlbar/startcap-rtl.png) + skin/classic/browser/urlbar/startcap-focused.png (urlbar/startcap-focused.png) + skin/classic/browser/urlbar/startcap-focused-rtl.png (urlbar/startcap-focused-rtl.png) + skin/classic/browser/urlbar/startcap-active.png (urlbar/startcap-active.png) + skin/classic/browser/urlbar/startcap-active-rtl.png (urlbar/startcap-active-rtl.png) + skin/classic/browser/urlbar/startcap-active-focused.png (urlbar/startcap-active-focused.png) + skin/classic/browser/urlbar/startcap-active-focused-rtl.png (urlbar/startcap-active-focused-rtl.png) + skin/classic/browser/urlbar/textfield-mid.png (urlbar/textfield-mid.png) + skin/classic/browser/urlbar/textfield-mid-focused.png (urlbar/textfield-mid-focused.png) icon.png preview.png diff --git a/browser/themes/pinstripe/browser/searchbar.css b/browser/themes/pinstripe/browser/searchbar.css index 70080c09066..1e5c2cee67e 100644 --- a/browser/themes/pinstripe/browser/searchbar.css +++ b/browser/themes/pinstripe/browser/searchbar.css @@ -1,3 +1,27 @@ +/* *** pinstripe *** */ + +.searchbar-textbox { + -moz-appearance: none; + font: icon; + height: 28px; + width: 5em; + margin: 0 3px 1px; + min-width: 5em; + border: none; + background-color: transparent; +} + +.searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box { + background: url("chrome://browser/skin/urlbar/textfield-mid.png") repeat-x; + padding: 0; + margin: 0; + -moz-margin-start: 45px; +} + +.searchbar-textbox[focused="true"] > .autocomplete-textbox-container > .textbox-input-box { + background-image: url("chrome://browser/skin/urlbar/textfield-mid-focused.png"); +} + .searchbar-engine-image { width: 16px; height: 16px; @@ -6,8 +30,47 @@ } .searchbar-engine-button { + background: url("chrome://browser/skin/urlbar/startcap.png") center center no-repeat; -moz-appearance: none; - min-width: 0; + height: 28px; + min-width: 45px; + border: 0; + -moz-box-align: center; + margin: 0; + -moz-margin-start: -45px; + padding: 0; +} + +.searchbar-engine-button[chromedir="rtl"] { + background-image: url("chrome://browser/skin/urlbar/startcap-rtl.png"); +} + +.searchbar-textbox[focused="true"] > .searchbar-engine-button { + background-image: url("chrome://browser/skin/urlbar/startcap-focused.png"); +} + +.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"] { + background-image: url("chrome://browser/skin/urlbar/startcap-focused-rtl.png"); +} + +.searchbar-engine-button:hover:active, +.searchbar-engine-button[open="true"] { + background-image: url("chrome://browser/skin/urlbar/startcap-active.png") !important; +} + +.searchbar-engine-button:hover:active[chromedir="rtl"], +.searchbar-engine-button[open="true"][chromedir="rtl"] { + background-image: url("chrome://browser/skin/urlbar/startcap-active-rtl.png") !important; +} + +.searchbar-textbox[focused="true"] > .searchbar-engine-button:active, +.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"] { + background-image: url("chrome://browser/skin/urlbar/startcap-active-focused.png") !important; +} + +.searchbar-textbox[focused="true"] > .searchbar-engine-button[chromedir="rtl"]:active, +.searchbar-textbox[focused="true"] > .searchbar-engine-button[open="true"][chromedir="rtl"] { + background-image: url("chrome://browser/skin/urlbar/startcap-active-focused-rtl.png") !important; } .searchbar-engine-button > .button-box { @@ -18,11 +81,7 @@ } .searchbar-engine-button[addengines="true"] > .button-box { - background: transparent url(chrome://browser/skin/Search-addengines.png) no-repeat right center; -} - -.searchbar-textbox[chromedir="rtl"] .searchbar-engine-button[addengines="true"] > .button-box { - background-position: left center; + background: transparent url(chrome://browser/skin/Search-addengines.png) no-repeat 25px 50%; } .searchbar-dropmarker-image { @@ -33,10 +92,28 @@ .search-go-container { -moz-box-align: center; + background: url("chrome://browser/skin/urlbar/endcap.png") no-repeat right top; + -moz-padding-end: 5px; +} + +.search-go-container[chromedir="rtl"] { + background-image: url("chrome://browser/skin/urlbar/endcap-rtl.png"); +} + +.searchbar-textbox[focused="true"] > .search-go-container { + background-image: url("chrome://browser/skin/urlbar/endcap-focused.png"); +} + +.searchbar-textbox[focused="true"] > .search-go-container[chromedir="rtl"] { + background: url("chrome://browser/skin/urlbar/endcap-focused-rtl.png") no-repeat left top; } .search-go-button { + padding: 1px; list-style-image: url("chrome://browser/skin/Search.png"); + margin: 0; + padding: 0; + -moz-padding-end: 6px; } .searchbar-engine-menuitem[selected="true"] > .menu-iconic-text { diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png b/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png new file mode 100644 index 00000000000..b7cb9c63c0f Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/endcap-focused-rtl.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-focused.png b/browser/themes/pinstripe/browser/urlbar/endcap-focused.png new file mode 100644 index 00000000000..786fd2979e5 Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/endcap-focused.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png b/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png new file mode 100644 index 00000000000..e26eaebf8a1 Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/endcap-rtl.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/endcap.png b/browser/themes/pinstripe/browser/urlbar/endcap.png new file mode 100644 index 00000000000..60069850d30 Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/endcap.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-rtl.png new file mode 100644 index 00000000000..ed2bb440306 Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused-rtl.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png new file mode 100644 index 00000000000..7076d1df6cd Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/startcap-active-focused.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png new file mode 100644 index 00000000000..2047ada0fc5 Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-active.png b/browser/themes/pinstripe/browser/urlbar/startcap-active.png new file mode 100644 index 00000000000..33603dea249 Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/startcap-active.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png new file mode 100644 index 00000000000..26909af696f Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/startcap-focused-rtl.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-focused.png b/browser/themes/pinstripe/browser/urlbar/startcap-focused.png new file mode 100644 index 00000000000..499d1c4df50 Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/startcap-focused.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png b/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png new file mode 100644 index 00000000000..a73a41e50a6 Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/startcap-rtl.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/startcap.png b/browser/themes/pinstripe/browser/urlbar/startcap.png new file mode 100644 index 00000000000..5d822e9c074 Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/startcap.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png b/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png new file mode 100644 index 00000000000..0d870658055 Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/textfield-mid-focused.png differ diff --git a/browser/themes/pinstripe/browser/urlbar/textfield-mid.png b/browser/themes/pinstripe/browser/urlbar/textfield-mid.png new file mode 100644 index 00000000000..b1ba5e9343a Binary files /dev/null and b/browser/themes/pinstripe/browser/urlbar/textfield-mid.png differ diff --git a/browser/themes/winstripe/browser/searchbar.css b/browser/themes/winstripe/browser/searchbar.css index c855c4dd664..7684ba79fa6 100644 --- a/browser/themes/winstripe/browser/searchbar.css +++ b/browser/themes/winstripe/browser/searchbar.css @@ -4,10 +4,6 @@ min-width: 6em; } -.autocomplete-textbox-container { - -moz-box-align: stretch; -} - .searchbar-textbox:-moz-system-metric(windows-default-theme) { -moz-appearance: none; border-width: 1px; @@ -37,6 +33,8 @@ margin: 0; -moz-margin-end: 3px; padding: 0; + height: 1.23em; + min-height: 20px; -moz-box-align: center; background: -moz-dialog url(navbar-textbox-buttons.png) repeat-x; border: 0 solid;