Bug 742419 - Implement new identity block design (OS X). r=fryn a=desktop-only
authorJared Wein <jwein@mozilla.com>
Sat, 21 Apr 2012 00:03:44 -0700
changeset 92075 961ec289d615
parent 92074 e79686174491
child 92076 e8f573bf8f2e
push id22504
push userphilringnalda@gmail.com
push dateSun, 22 Apr 2012 06:24:14 +0000
treeherdermozilla-central@990f6542747b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfryn, desktop-only
bugs742419
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 742419 - Implement new identity block design (OS X). r=fryn a=desktop-only
browser/themes/pinstripe/browser.css
browser/themes/pinstripe/identity-icons-generic.png
browser/themes/pinstripe/identity-icons-https-ev.png
browser/themes/pinstripe/identity-icons-https.png
browser/themes/pinstripe/jar.mn
--- a/browser/themes/pinstripe/browser.css
+++ b/browser/themes/pinstripe/browser.css
@@ -970,21 +970,21 @@ toolbar[mode="icons"] #zoom-in-button {
 
 @conditionalForwardWithUrlbar@ + #urlbar-container:-moz-locale-dir(rtl),
 @conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
   /* let pinstripe-urlbar-back-button-mask clip the urlbar's right side for RTL */
   -moz-transform: scaleX(-1);
 }
 
 #identity-box {
-  background-image: -moz-linear-gradient(hsl(0,0%,98%), hsl(0,0%,92%));
-  box-shadow: 0 1px 0 hsla(0,0%,0%,.05) inset;
-  -moz-border-end: 1px solid hsla(0,0%,0%,.1);
   -moz-margin-end: 3px;
-  padding: 1px 4px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 0;
 }
 
 #identity-box:-moz-locale-dir(ltr) {
   border-top-left-radius: 2px;
   border-bottom-left-radius: 2px;
 }
 
 #identity-box:-moz-locale-dir(rtl) {
@@ -1019,58 +1019,32 @@ toolbar[mode="icons"] #zoom-in-button {
 @conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
   padding-left: 10.01px;
 }
 
 @conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
   padding-right: 10.01px;
 }
 
-#identity-box:active:hover,
-#identity-box[open="true"] {
-  background-image: -moz-linear-gradient(hsl(0,0%,93%), hsl(0,0%,80%));
-  box-shadow: 0 1px 1px hsla(0,0%,0%,.3) inset,
-              0 1px 3px hsla(0,0%,0%,.3) inset;
-}
-
-#identity-box.verifiedDomain {
-  background-image: -moz-linear-gradient(hsl(215,60%,92%), hsl(215,58%,88%));
-  -moz-border-end-color: hsla(215,54%,33%,.2);
-  color: hsl(215,54%,33%);
-}
-
-#identity-box.verifiedDomain:active:hover,
-#identity-box.verifiedDomain[open="true"] {
-  background-image: -moz-linear-gradient(hsl(215,85%,85%), hsl(215,70%,68%));
-  box-shadow: 0 1px 1px hsla(215,54%,33%,.7) inset,
-              0 1px 3px 1px hsla(215,54%,33%,.5) inset;
-}
-
 #identity-box.verifiedIdentity {
-  background-image: -moz-linear-gradient(hsl(91,70%,90%), hsl(93,60%,81%));
-  -moz-border-end-color: hsla(92,81%,16%,.2);
+  background-color: #fff;
   color: hsl(92,100%,20%);
-}
-
-#identity-box.verifiedIdentity:active:hover,
-#identity-box.verifiedIdentity[open="true"] {
-  background-image: -moz-linear-gradient(hsl(92,69%,77%), hsl(92,44%,51%));
-  box-shadow: 0 1px 1px hsla(92,81%,16%,.6) inset,
-              0 1px 3px 1px hsla(92,81%,16%,.5) inset;
+  -moz-border-end: 1px solid hsla(92,81%,16%,.2);
+  -moz-padding-end: 4px;
 }
 
 #identity-box:-moz-focusring {
   box-shadow: 0 0 2px 1px -moz-mac-focusring inset,
               0 0 2px 2px -moz-mac-focusring;
   -moz-border-end-style: none;
   -moz-padding-end: 5px;
 }
 
 #identity-icon-labels {
-  -moz-margin-start: 6px;
+  -moz-margin-start: 4px;
 }
 
 .urlbar-input-box {
   -moz-margin-start: 0;
   padding: 3px 0 2px;
 }
 
 .urlbar-history-dropmarker {
@@ -1107,20 +1081,31 @@ toolbar[mode="icons"] #zoom-in-button {
   height: 22px;
 }
 
 #page-proxy-favicon {
   width: 16px;
   height: 16px;
   margin: 0px;
   padding: 0px;
-}
-
-#page-proxy-favicon:not([src]) {
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+  list-style-image: url(chrome://browser/skin/identity-icons-generic.png);
+  -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.verifiedDomain > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon {
+  list-style-image: url(chrome://browser/skin/identity-icons-https.png);
+}
+
+.verifiedIdentity > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon {
+  list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png);
+}
+
+#identity-box:hover:active > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon,
+#identity-box[open=true] > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 
 #page-proxy-favicon[pageproxystate="invalid"] {
   opacity: 0.5;
 }
 
 #wrapper-urlbar-container[place="palette"] {
   max-width: 20em;
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..51f48bca43bf7755cfdb97324237d3d92cd1ec38
GIT binary patch
literal 634
zc$@)x0)_pFP)<h;3K|Lk000e1NJLTq001BW000mO1ONa4-3hhQ0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!97#k$R5(wqlkacRKp4mG4}rgH^>2Yd
zU<j<Ejqw)>!3HZqL~J{!+cc3FH={4yqEz<6s4;VHnPXA8KpacIetSd&d}q8*j_dWq
z^|^bVR*3)Ayr`G+I^KYEyu25k_h!`0nH_ULI%eLS_wIrxpJN+c_V@7MN>`iq#)2tZ
zSjQ&&HcS}OnD&mg7963E9o)wXw%~Ad184G=f>sPZ;RKIx5f{)zfuj)=e*0GBUcZMk
zjPL``&{C}7HCnP23B4X!?(fr{;usC+ifecRUFyn<rrxGJMUM-c6W)Zg<<KwbHT)z8
zjJ!1AX*g3}G`g>_$A})E|A!5HM57z}Tz3PzXmi`SDJl$+Q(n|Z58$Fc!wOS*jQUyV
zv!m;{gzOAg7;qn1<wb2!!<YuU%bnEVLvqWtVdyi1494i}m$^8@M1SWFGs+9ww_&qD
z9o|~U3*6;w7oS-Z+Yf!(Pb1CBY~n3$V3kEo<0alPjcMgYRj=YPi}a0r;n}Oi9*-(X
zDLsW-IK)@-fp=465jVqeoJ1>P^)064M6ttzSX^)imb6rvl96OT$pRlL+AxsB`S4dJ
z$7K|vqE&+1Oj?f|F#`{Ilxk3!yhsTx5fqrT1G2{wT8zIKB&OfRvR0N3&%ed$J4|F*
zmd{OT5!d3f$j7d-9#>IBT*hZSTPa$~m;BO@_`I6`SVSxu%g6lKkodg%%l~ux1@oI3
U>BLSBRR91007*qoM6N<$g2&e>6aWAK
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..997157d6b1f04c7acdbbf2638cab22a88e5e9f72
GIT binary patch
literal 541
zc$@(p0^<FNP)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0005xNkl<Zc-pPi
z%}X0m6a{ceDC5evC_!eI_>m~Fj;&F*2D(U%SQ5}Gh7$ZnkW!)uVq1jPBBJ02G}uLv
zF1nBu+J*nX)U6u}g)UsW6%o|k?YVFZ1DTgRFpD3&oH>ERFq6~~(Y+mB<h+7V4-N28
zG)NZocKN%t9`FDZL?8kEA|aXLPSpX6KYLrD1XrTOS(O1nP|&`9lA4-6=sF$WZo6fC
z=8UgNC#W4z_|X%COCT@FVig9|L*#>-ni=0}yBXVzkr!v{Zfcf0+|>?v{XJ0vf@847
zv1FwR0~91Ci_YnbjVMig>in~NmU+YY%o$(f4k+z_S4Z7fKwx_^Te54-fB@JqFuD=F
z9r@Twd%rVl_&mz^%o#@9aYwoV-vJBXo)9z5Wq<`y$Pd47A%=4SW<<f0=OG4G*?{@4
zk6oZDT%Q37`f^+G^Xys+Rl*(af+`y@_oa(W_zVca)6CmuGQnL4l?|Bw?2rM!0XC$c
zuQrhh?t)!5V6ym#4Cn?74y{DU1b2N0<o7$sfc6fgm&0U0e+ORf#L0l}8AuK+g~<eW
zeV>8ccH9N3;+N(vaI){Bf1ee?R0(&u3#yiXMiw-J14&53pqFGxaHMP1azH>vC<uYA
f5t5Ge|CjI|Z2i9#R<I1@00000NkvXXu0mjf+^FzJ
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..71fe2aefd41a64289c8f7835feaa401e9fec9fb0
GIT binary patch
literal 306
zc$@(;0nPr2P)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^0002_Nkl<Zc-rmN
zF{*?x6ouipjVwT1q$nsTDB=P{1QA4#AX>PAy#0vG0?wSmV&1?dw|i4e@ihmM{9S$k
z{HxCl*!MjkOV`a(puMzdnt&`_H%oykVB5BkPQsg$LdD}DorE_hh2DU5T`hqQGPi?3
z))!FMwI$F&=5`RsdIPMr7lF*nW(f4~1yoga5y-r3hCmN*z_KhLcy>`)mLNdh<$!sf
z9l^s%j~7MZ2p&!hn5GFDQb3;P&=3R0afE^xkYyPZ<bYuqpdbdMX$l27pznJqhyh8G
zKtT@Zx(*6rKpe+VkOSJbbp(%JDIkg>NAUP_{`(s~0npR4SjUvOGXMYp07*qoM6N<$
Eg89IE$p8QV
--- a/browser/themes/pinstripe/jar.mn
+++ b/browser/themes/pinstripe/jar.mn
@@ -20,16 +20,19 @@ browser.jar:
   skin/classic/browser/hud-style-check-box-checked.png
   skin/classic/browser/hud-style-check-box-empty.png
   skin/classic/browser/hud-style-dropmarker-double-arrows.png
   skin/classic/browser/hud-style-expander-closed.png
   skin/classic/browser/hud-style-expander-open.png
   skin/classic/browser/hud-style-new-folder-plus-sign.png
   skin/classic/browser/hud-style-twisties.png
   skin/classic/browser/identity.png
+  skin/classic/browser/identity-icons-generic.png
+  skin/classic/browser/identity-icons-https.png
+  skin/classic/browser/identity-icons-https-ev.png
   skin/classic/browser/Info.png
   skin/classic/browser/KUI-background.png
   skin/classic/browser/KUI-close.png
   skin/classic/browser/menu-back.png
   skin/classic/browser/menu-forward.png
   skin/classic/browser/page-livemarks.png
   skin/classic/browser/pageInfo.css
   skin/classic/browser/Privacy-16.png