Bug 1110009 - Show a warning icon in the legacy-Sync-to-FxA migration menu panel items. r=markh
authorDrew Willcoxon <adw@mozilla.com>
Fri, 02 Jan 2015 17:26:45 +1100
changeset 247640 f0c081ab585843f37faf24cd6d4f09c85bf7e398
parent 247639 f8b05f7fa4be9d4b887254e8ed963073f22f15de
child 247641 b5753e67278ce3d60f2dda6b97555460d43fa2ff
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh
bugs1110009
milestone37.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 1110009 - Show a warning icon in the legacy-Sync-to-FxA migration menu panel items. r=markh
browser/themes/linux/jar.mn
browser/themes/osx/customizableui/panelUIOverlay.css
browser/themes/osx/jar.mn
browser/themes/shared/customizableui/panelUIOverlay.inc.css
browser/themes/shared/warning16.png
browser/themes/shared/warning16@2x.png
browser/themes/windows/jar.mn
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -408,8 +408,10 @@ browser.jar:
   skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png   (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
   skin/classic/browser/devtools/tooltip/arrow-horizontal-light.png   (../shared/devtools/tooltip/arrow-horizontal-light.png)
   skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png   (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
   skin/classic/browser/devtools/tooltip/arrow-vertical-light.png   (../shared/devtools/tooltip/arrow-vertical-light.png)
   skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png   (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
 #ifdef E10S_TESTING_ONLY
   skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
 #endif
+  skin/classic/browser/warning16.png                        (../shared/warning16.png)
+  skin/classic/browser/warning16@2x.png                     (../shared/warning16@2x.png)
--- a/browser/themes/osx/customizableui/panelUIOverlay.css
+++ b/browser/themes/osx/customizableui/panelUIOverlay.css
@@ -29,16 +29,22 @@
   #PanelUI-fxa-status {
     list-style-image: url(chrome://browser/skin/sync-horizontalbar@2x.png);
   }
 
   #PanelUI-fxa-status[syncstatus="active"] {
     list-style-image: url(chrome://browser/skin/syncProgress-horizontalbar@2x.png);
   }
 
+  #PanelUI-fxa-status[fxastatus="migrate-signup"],
+  #PanelUI-fxa-status[fxastatus="migrate-verify"] {
+    list-style-image: url(chrome://browser/skin/warning16@2x.png);
+    -moz-image-region: rect(0, 64px, 32px, 32px);
+  }
+
   #PanelUI-customize {
     list-style-image: url(chrome://browser/skin/menuPanel-customize@2x.png);
   }
 
   #main-window[customize-entered] #PanelUI-customize {
     list-style-image: url(chrome://browser/skin/customizableui/menuPanel-customizeFinish@2x.png);
   }
 
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -571,16 +571,18 @@ browser.jar:
   skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png   (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
   skin/classic/browser/devtools/tooltip/arrow-horizontal-light.png   (../shared/devtools/tooltip/arrow-horizontal-light.png)
   skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png   (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
   skin/classic/browser/devtools/tooltip/arrow-vertical-light.png   (../shared/devtools/tooltip/arrow-vertical-light.png)
   skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png   (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
 #ifdef E10S_TESTING_ONLY
   skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
 #endif
+  skin/classic/browser/warning16.png                        (../shared/warning16.png)
+  skin/classic/browser/warning16@2x.png                     (../shared/warning16@2x.png)
 
 % override chrome://browser/skin/toolbarbutton-dropmarker.png              chrome://browser/skin/lion/toolbarbutton-dropmarker.png                 os=Darwin osversion>=10.7
 % override chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon.png     chrome://browser/skin/lion/tabbrowser/alltabs-box-bkgnd-icon.png        os=Darwin osversion>=10.7
 % override chrome://browser/skin/tabview/tabview.png                       chrome://browser/skin/lion/tabview/tabview.png                          os=Darwin osversion>=10.7
 % override chrome://browser/skin/places/toolbar.png                        chrome://browser/skin/lion/places/toolbar.png                           os=Darwin osversion>=10.7
 % override chrome://browser/skin/Toolbar.png                               chrome://browser/skin/yosemite/Toolbar.png                              os=Darwin osversion>=10.10
 % override chrome://browser/skin/Toolbar@2x.png                            chrome://browser/skin/yosemite/Toolbar@2x.png                           os=Darwin osversion>=10.10
 % override chrome://browser/skin/menuPanel.png                             chrome://browser/skin/yosemite/menuPanel.png                            os=Darwin osversion>=10.10
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -569,16 +569,22 @@ toolbarpaletteitem[place="palette"] > to
 #PanelUI-fxa-status {
   list-style-image: url(chrome://browser/skin/sync-horizontalbar.png);
 }
 
 #PanelUI-fxa-status[syncstatus="active"] {
   list-style-image: url(chrome://browser/skin/syncProgress-horizontalbar.png);
 }
 
+#PanelUI-fxa-status[fxastatus="migrate-signup"],
+#PanelUI-fxa-status[fxastatus="migrate-verify"] {
+  list-style-image: url(chrome://browser/skin/warning16.png);
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
 #PanelUI-customize {
   list-style-image: url(chrome://browser/skin/menuPanel-customize.png);
 }
 
 #customization-panelHolder #PanelUI-customize {
   list-style-image: url(chrome://browser/skin/customizableui/menuPanel-customizeFinish.png);
 }
 
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..46200cec5cf0883e5b09b820c5091decabb31890
GIT binary patch
literal 445
zc$@*f0Yd(XP)<h;3K|Lk000e1NJLTq001BW000mO1ONa4-3hhQ0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzUr9tkR5(wq$uVofKor371HXWdQqV=y
zK@=1RyQJU8$vwoNVvvOR0YWqtAq|p-sC1F~HQYr6XX&D;dA%IxVeMsV?+^Fh<A>0H
zzD0Ji!967TFgx7f5*^LQbHKeM`EWc0T#^Su5C(t?gGZhlf)N^k3k|L#-|@k3`Yrsw
z@?3Xx(3^S-|2+3f-o^XEGvxu^%J;67w2OvaOKE_&Uyf$p3~=dLhRnBnA9w@6r3V=@
z@7=AskqfxIn<F!FYqzde)kp<gUd@pisXrV!O9x05r$D#&TkkLXK&tc$bi4IwV+u5J
zT4wvx)w_)@(8O+;?aa|+H33c^SMRJk!0GC?Xaj9$3wF`ovimu9MO1*cQv{``Y}rj5
zjn*Te+2l6ay^8Plx(zhqZIj)^k#)3ycChMJ&Dyj3Gj{nX1MMK!<(j-_H*sY4%##V6
n&ZZi>)RRsUa5_sW`uqC^P2*`ACv4$T00000NkvXXu0mjf5Gc$u
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d1426d381a33a38f25a4b825852a89878e95444d
GIT binary patch
literal 583
zc$@)80=WH&P)<h;3K|Lk000e1NJLTq002M$001Be1ONa42$Z%D0006GNkl<ZcwWWO
zPe@i-9LM43USFgFBV9<yP*^L8qKz;NVgGU0%7P?<lKzR!;7Ego@iG>@8A91Ep_*B=
zw4z<0ZK{R42--9X3Nzpgw1^f(pw8;RdpX>NoQ2Qg>^_Gd-)z<T%3eq_Crz##S1egF
zEK@4AuPE2=4ygHRLW$JAvZ};pHw0CG_^d=)pDQz{MbK<WiL}0affj@6{bIr=F{yp_
zOboYNRWxQ;%zQ#$zCf$Xpr$5w-4F)c^{+^3pG}DwH-x`!w}M7XnsLvd$b4cSFF>1q
z@X-qRZcZmI8uyP#S|1<4H5)-LSOy!6xTHvGA0M#IIlyK?6X2{d3kp*E_<#|OfFA^H
zfJWE#DM;(%19mziXw~EkwrCcdcH3V9r1kLuRTTm4-lJVWMb#+<34L@xhhFt|L?3Wc
z%?E*$K0ctTLA_m`qeH!1)d_*rzOo{)$8klw!&}f}uXg|meYC)+T+w0eIHV{u>X;z0
z&;A7HG%FJ+@uOK_A+Zk&@cSBaMs)+JefAjm$y>2E?qfigSeMtZkl2R>Zi>z5wv4A{
z>{rAM2Ozc29>PJd#Cl8tdOZ<4YMRBQJ}mH?7@6Rk7{8h(wa-D97#B2v+<B2urS)Nf
zFE)uC@zSJKKien9H%RTXNvIjNcH^$FnAC>_s+RTHx`y~ak5nPG&mKs#C{1pi{SU)~
V(}ZC)5f1<W002ovPDHLkV1jdM2K@j4
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -446,16 +446,18 @@ browser.jar:
         skin/classic/browser/devtools/tooltip/arrow-vertical-dark@2x.png   (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
         skin/classic/browser/devtools/tooltip/arrow-horizontal-light.png   (../shared/devtools/tooltip/arrow-horizontal-light.png)
         skin/classic/browser/devtools/tooltip/arrow-horizontal-light@2x.png   (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
         skin/classic/browser/devtools/tooltip/arrow-vertical-light.png   (../shared/devtools/tooltip/arrow-vertical-light.png)
         skin/classic/browser/devtools/tooltip/arrow-vertical-light@2x.png   (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
 #ifdef E10S_TESTING_ONLY
         skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
 #endif
+        skin/classic/browser/warning16.png                            (../shared/warning16.png)
+        skin/classic/browser/warning16@2x.png                         (../shared/warning16@2x.png)
 
 #ifdef XP_WIN
 browser.jar:
 % skin browser classic/1.0 %skin/classic/aero/browser/ os=WINNT osversion>=6
         skin/classic/aero/browser/sanitizeDialog.css                       (sanitizeDialog.css)
 *       skin/classic/aero/browser/aboutSessionRestore.css            (aboutSessionRestore.css)
         skin/classic/aero/browser/aboutSessionRestore-window-icon.png (aboutSessionRestore-window-icon-aero.png)
         skin/classic/aero/browser/aboutCertError.css
@@ -903,16 +905,18 @@ browser.jar:
         skin/classic/aero/browser/devtools/tooltip/arrow-vertical-dark@2x.png   (../shared/devtools/tooltip/arrow-vertical-dark@2x.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-horizontal-light.png   (../shared/devtools/tooltip/arrow-horizontal-light.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-horizontal-light@2x.png   (../shared/devtools/tooltip/arrow-horizontal-light@2x.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-vertical-light.png   (../shared/devtools/tooltip/arrow-vertical-light.png)
         skin/classic/aero/browser/devtools/tooltip/arrow-vertical-light@2x.png   (../shared/devtools/tooltip/arrow-vertical-light@2x.png)
 #ifdef E10S_TESTING_ONLY
         skin/classic/aero/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
 #endif
+        skin/classic/aero/browser/warning16.png                       (../shared/warning16.png)
+        skin/classic/aero/browser/warning16@2x.png                    (../shared/warning16@2x.png)
 
 % override chrome://browser/skin/Toolbar.png               chrome://browser/skin/Toolbar-aero.png                  os=WINNT osversion=6
 % override chrome://browser/skin/Toolbar.png               chrome://browser/skin/Toolbar-aero.png                  os=WINNT osversion=6.1
 
 % override chrome://browser/skin/menuPanel.png             chrome://browser/skin/menuPanel-aero.png                os=WINNT osversion=6
 % override chrome://browser/skin/menuPanel.png             chrome://browser/skin/menuPanel-aero.png                os=WINNT osversion=6.1
 
 % override chrome://browser/skin/menuPanel-small.png       chrome://browser/skin/menuPanel-small-aero.png          os=WINNT osversion=6