diff --git a/mozilla/browser/themes/pinstripe/browser/browser.css b/mozilla/browser/themes/pinstripe/browser/browser.css index 7051b4375e1..ac2afa547fe 100755 --- a/mozilla/browser/themes/pinstripe/browser/browser.css +++ b/mozilla/browser/themes/pinstripe/browser/browser.css @@ -845,7 +845,7 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke border: none; background: url("chrome://browser/skin/urlbar/endcap.png") transparent right center no-repeat; margin: 0px 4px 1px 4px; - -moz-padding-end: 8px; + -moz-padding-end: 10px; font: icon !important; width: 7em; min-width: 7em; @@ -920,7 +920,6 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke /* ----- PAGE PROXY ICON ----- */ -#page-proxy-stack, #page-proxy-favicon, #urlbar-throbber { width: 16px; @@ -930,7 +929,10 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke } #page-proxy-stack { - -moz-margin-start: 11px; + -moz-margin-start: 9px; + width: 24px; + height: 20px; + padding: 2px 4px; opacity: 1.0; } @@ -2001,7 +2003,7 @@ tabpanels.plain { #identity-box { background: url("chrome://browser/skin/urlbar/startcap.png") left center no-repeat; - min-width: 42px; + min-width: 44px; } #urlbar[focused="true"] > #identity-box { @@ -2013,7 +2015,7 @@ tabpanels.plain { -moz-outline-radius: 2px; } -#identity-box:active, +#identity-box:hover:active, #identity-box[open="true"] { background-image: url("chrome://browser/skin/urlbar/startcap-active.png"); } @@ -2023,72 +2025,117 @@ tabpanels.plain { color: black; padding: 2px 6px 3px; -moz-padding-end: 14px; +} + +#identity-box.unknownIdentity > hbox > #identity-icon-label { + display: none; +} + + +/* Verified domain */ +/* - Normal state */ +#identity-box.verifiedDomain { + background-image: url("chrome://browser/skin/urlbar/startcap-secure-start.png"); + -moz-padding-start: 12px; +} + +#identity-box.verifiedDomain > hbox { + padding: 0; + background: url("chrome://browser/skin/urlbar/startcap-secure-mid.png") repeat-x center center; + -moz-box-pack: center; +} + +#identity-box.verifiedDomain > hbox > #identity-icon-label { background: url("chrome://browser/skin/urlbar/startcap-secure-end.png") no-repeat center right; } -#urlbar[focused="true"] > #identity-box > hbox > #identity-icon-label { +/* - Active state */ +#identity-box.verifiedDomain:hover:active { + background-image: url("chrome://browser/skin/urlbar/startcap-secure-start-active.png"); +} + +#identity-box.verifiedDomain:hover:active > hbox { + padding: 0; + background: url("chrome://browser/skin/urlbar/startcap-secure-mid-active.png") repeat-x center center; + -moz-box-pack: center; +} + +#identity-box.verifiedDomain:hover:active > hbox > #identity-icon-label { + background: url("chrome://browser/skin/urlbar/startcap-secure-end-active.png") no-repeat center right; +} + +/* - Focus state */ +#urlbar[focused="true"] > #identity-box.verifiedDomain { + background-image: url("chrome://browser/skin/urlbar/startcap-secure-start-focused.png"); +} + +#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox { + background-image: url("chrome://browser/skin/urlbar/startcap-secure-mid-focused.png"); +} + +#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox > #identity-icon-label { background-image: url("chrome://browser/skin/urlbar/startcap-secure-end-focused.png"); } +#identity-box.verifiedDomain > hbox > #identity-icon-label[value=""] { + -moz-padding-start: 3px !important; + -moz-padding-end: 8px !important; +} + + +/* Verified Identity */ +/* - Normal state */ +#identity-box.verifiedIdentity { + background-image: url("chrome://browser/skin/urlbar/startcap-verified-start.png"); + -moz-padding-start: 12px; +} + +#identity-box.verifiedIdentity > hbox { + padding: 0; + background: url("chrome://browser/skin/urlbar/startcap-verified-mid.png") repeat-x center center; + -moz-box-pack: center; +} + #identity-box.verifiedIdentity > hbox > #identity-icon-label { background: url("chrome://browser/skin/urlbar/startcap-verified-end.png") no-repeat center right; } +/* - Active state */ +#identity-box.verifiedIdentity:hover:active { + background-image: url("chrome://browser/skin/urlbar/startcap-verified-start-active.png"); +} + +#identity-box.verifiedIdentity:hover:active > hbox { + background: url("chrome://browser/skin/urlbar/startcap-verified-mid-active.png") repeat-x center center; +} + +#identity-box.verifiedIdentity:hover:active > hbox > #identity-icon-label { + background: url("chrome://browser/skin/urlbar/startcap-verified-end-active.png") no-repeat center right; +} + +/* - Focus state */ +#urlbar[focused="true"] > #identity-box.verifiedIdentity { + background-image: url("chrome://browser/skin/urlbar/startcap-verified-start-focused.png"); +} + +#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox { + background-image: url("chrome://browser/skin/urlbar/startcap-verified-mid-focused.png"); +} + #urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox > #identity-icon-label { background-image: url("chrome://browser/skin/urlbar/startcap-verified-end-focused.png"); } -#identity-box.verifiedDomain { - background-image: url("chrome://browser/skin/urlbar/startcap-secure-start.png") !important; - -moz-padding-start: 11px; -} - -#urlbar[focused="true"] > #identity-box.verifiedDomain { - background-image: url("chrome://browser/skin/urlbar/startcap-secure-start-focused.png") !important; -} - -#identity-box.verifiedIdentity { - background-image: url("chrome://browser/skin/urlbar/startcap-verified-start.png") !important; - -moz-padding-start: 12px; -} - -#urlbar[focused="true"] > #identity-box.verifiedIdentity { - background-image: url("chrome://browser/skin/urlbar/startcap-verified-start-focused.png") !important; -} - -#identity-box.verifiedDomain > hbox { - padding: 0; - background: url("chrome://browser/skin/urlbar/startcap-secure-mid.png") repeat-x center center !important; - -moz-box-pack: center; -} - -#urlbar[focused="true"] > #identity-box.verifiedDomain > hbox { - background-image: url("chrome://browser/skin/urlbar/startcap-secure-mid-focused.png") !important; -} - -#identity-box.verifiedDomain > hbox > #identity-icon-label[value=""] { - -moz-padding-start: 3px !important; - -moz-padding-end: 12px !important; -} - -#identity-box.verifiedIdentity > hbox { - padding: 0; - background: url("chrome://browser/skin/urlbar/startcap-verified-mid.png") repeat-x center center !important; - -moz-box-pack: center; -} - -#urlbar[focused="true"] > #identity-box.verifiedIdentity > hbox { - background-image: url("chrome://browser/skin/urlbar/startcap-verified-mid-focused.png") !important; -} - +/* Favicon Glow */ #identity-box.verifiedIdentity > hbox > #page-proxy-stack, #identity-box.verifiedDomain > hbox > #page-proxy-stack { - -moz-margin-start: 0; + -moz-margin-start: -3px; + width: 24px; + height: 20px; + padding: 2px 4px; + background: url("chrome://browser/skin/urlbar/urlbar-favicon-glow.png") center center no-repeat; } -#identity-box.unknownIdentity > hbox > #identity-icon-label { - display: none; -} /* Popup Icons */ #identity-popup-icon { diff --git a/mozilla/browser/themes/pinstripe/browser/jar.mn b/mozilla/browser/themes/pinstripe/browser/jar.mn index e29b0e1142c..b29dd4005b5 100644 --- a/mozilla/browser/themes/pinstripe/browser/jar.mn +++ b/mozilla/browser/themes/pinstripe/browser/jar.mn @@ -151,12 +151,18 @@ classic.jar: skin/classic/browser/urlbar/startcap-secure-start.png (urlbar/startcap-secure-start.png) skin/classic/browser/urlbar/startcap-secure-mid.png (urlbar/startcap-secure-mid.png) skin/classic/browser/urlbar/startcap-secure-end.png (urlbar/startcap-secure-end.png) + skin/classic/browser/urlbar/startcap-secure-start-active.png (urlbar/startcap-secure-start-active.png) + skin/classic/browser/urlbar/startcap-secure-mid-active.png (urlbar/startcap-secure-mid-active.png) + skin/classic/browser/urlbar/startcap-secure-end-active.png (urlbar/startcap-secure-end-active.png) skin/classic/browser/urlbar/startcap-secure-start-focused.png (urlbar/startcap-secure-start-focused.png) skin/classic/browser/urlbar/startcap-secure-mid-focused.png (urlbar/startcap-secure-mid-focused.png) skin/classic/browser/urlbar/startcap-secure-end-focused.png (urlbar/startcap-secure-end-focused.png) skin/classic/browser/urlbar/startcap-verified-start.png (urlbar/startcap-verified-start.png) skin/classic/browser/urlbar/startcap-verified-mid.png (urlbar/startcap-verified-mid.png) skin/classic/browser/urlbar/startcap-verified-end.png (urlbar/startcap-verified-end.png) + skin/classic/browser/urlbar/startcap-verified-start-active.png (urlbar/startcap-verified-start-active.png) + skin/classic/browser/urlbar/startcap-verified-mid-active.png (urlbar/startcap-verified-mid-active.png) + skin/classic/browser/urlbar/startcap-verified-end-active.png (urlbar/startcap-verified-end-active.png) skin/classic/browser/urlbar/startcap-verified-start-focused.png (urlbar/startcap-verified-start-focused.png) skin/classic/browser/urlbar/startcap-verified-mid-focused.png (urlbar/startcap-verified-mid-focused.png) skin/classic/browser/urlbar/startcap-verified-end-focused.png (urlbar/startcap-verified-end-focused.png) @@ -166,6 +172,7 @@ classic.jar: 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/startcap-secure-active.png (urlbar/startcap-secure-active.png) + skin/classic/browser/urlbar/urlbar-favicon-glow.png (urlbar/urlbar-favicon-glow.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 diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png index dc433797a20..d8cd489ec38 100755 Binary files a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-active-rtl.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-active.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-active.png index f451d92410c..f094426ddda 100644 Binary files a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-active.png and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-active.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-active.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-active.png new file mode 100644 index 00000000000..343fca8b67e Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-active.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused.png index 682fe25d3b9..35c4e03a79a 100644 Binary files a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused.png and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-end-focused.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-end.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-end.png index fd35d24b32a..ffdd9561b2c 100644 Binary files a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-end.png and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-end.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-active.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-active.png new file mode 100644 index 00000000000..77bc4754921 Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-active.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused.png index 15813bfa70e..cd33dd289d3 100644 Binary files a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused.png and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid-focused.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid.png index 236ad1a3aa1..e053ef37923 100644 Binary files a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid.png and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-mid.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-active.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-active.png new file mode 100644 index 00000000000..74a65262e02 Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-active.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused.png index 190b0856ee6..70c18f96eae 100644 Binary files a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused.png and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-start-focused.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-start.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-start.png index 844022ab746..6caf8557c69 100644 Binary files a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-start.png and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-secure-start.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-active.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-active.png new file mode 100644 index 00000000000..124bc03717a Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-active.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused.png index 4a55541b9d7..a7e05b21fa4 100644 Binary files a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused.png and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-end-focused.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-end.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-end.png index 8be6c8c3be9..ef2297fcb30 100644 Binary files a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-end.png and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-end.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-active.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-active.png new file mode 100644 index 00000000000..d1d10fa3150 Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-mid-active.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-active.png b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-active.png new file mode 100644 index 00000000000..03726eff83b Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/urlbar/startcap-verified-start-active.png differ diff --git a/mozilla/browser/themes/pinstripe/browser/urlbar/urlbar-favicon-glow.png b/mozilla/browser/themes/pinstripe/browser/urlbar/urlbar-favicon-glow.png new file mode 100644 index 00000000000..68803e5d078 Binary files /dev/null and b/mozilla/browser/themes/pinstripe/browser/urlbar/urlbar-favicon-glow.png differ