Bug 512732 - Need a chrome://branding/content/icon48.png since mozapps css refers to this; Patch v1.2.
authorPhilip Chee <philip.chee@gmail.com>
Tue, 12 Jan 2010 15:59:36 +0100
changeset 4684 161b631365876a6e369c4c4e24fc631561a3621a
parent 4683 bf44fd8f2d0e7263a5c8c52e911cc5b5dd8aea82
child 4685 5fdf1bd04492496f35d4829f1b65603b863d6ac0
push id3664
push usersgautherie.bz@free.fr
push dateTue, 12 Jan 2010 15:10:29 +0000
treeherdercomm-central@5fdf1bd04492 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs512732
Bug 512732 - Need a chrome://branding/content/icon48.png since mozapps css refers to this; Patch v1.2. r+sr=neil ui-r=kairo.
suite/branding/content/icon48.png
suite/branding/jar.mn
suite/profile/migration.xul
suite/themes/modern/global/wizard.css
new file mode 100644
index 0000000000000000000000000000000000000000..a7640d9ce62a3d4e940aae8a5f3e25ba05daa24c
GIT binary patch
literal 4348
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%0Aju#j
z0W4p=rNRe4RN!sjg(n6qw_ad5;=^-ePzxOvmf^BBhQ6{;FmUK#%=On#@XKF@96pjn
z<6KVhJZ33PVtgW-GYXW=7WBy{ACk$*%RT@+3hYVOz%dJ3A#ea*cnbdGAy{&;G5r#T
zk!G_hU;aWTmw&LxDPLFoP`T?0Ltlr(Ys!L#O5iI~P348>nq2oSpWE-Ob7ag?sd%)v
z3)!4a4WBVmL{rZTBBcBW*Y()9Z>!X5x8Ie11sO^0J8or8fm(v}+xJ*o>9h7vPdjZx
zzkK!PHp-`Dx$q9<t*hYrbA(^qKgGXq4S8{Y%-~?m@GuMw#T+;g(bneBQE}*;=T6IE
z%fks}nB(!8=6PA2m>7`3!5==Z`oNDs_JU5fxc>@@yOIZ80i1d5HTQky?>~P2yq}JH
zT>GGM^V@|B7sh=2?`qt7TLY^zQs=sm%kdHkOgs!CGAp{yv}9bS$34%}(a|B<wd?yk
z8;#F>0jisT-KqK<yEfXYcZvuf`N*}=xf{=^tY3ffdkWo4J3sxnvSko{a-|`=KhSqx
zT$P`1YEmw{sll2qLZ;6Nr*)3Ubyh!lZf0h{^RgT|v`4mYzhi40-*g-B1TdIL{Bg?b
zs+#U~VQg&t)Q)ogeSvkZxMQ2s`Q4|LH?0&tau$63OTUUfe^Zw`dN`w{wpd(OQ{J|`
zJ)<NuK<19k2AIrNCX-WZL-y|djqKa^okzp)Yj*?NfSsvq#>cEqw~Qa3m^h<cDt=Ck
zS^MNL<@ekJXZBgW<1!;&eRT3|Z+Z6*9)5U;D8BZ+ix$1r&F3qsIwd0UG>DdG6F{>;
z%ov|Mm%P(;9dfz6PEH<{ty}+#M&pLtVB2G<@q1F)jDPC~jsph{T+-d$eedoG_~K*A
zQ^Uf2@3yw=O!;?x`+J-J{K_jIOg#Y<`r!TVs#GpmUa73{ve^>GSioY8sxe8}NQ|C6
zJJY;Z*L6fh2*U<LLr(|0cmHS)eC1AH7w|0bB2b;XXpaft&O7hC=pFC8<U21+c=^Re
zKbqYC{Qid?{_p2+_~*}V9vB$dneuRd`uGxHF}(I{W6s%7E}ylkRO&0XwJpN)GPth6
zam*}*ku)7nDh<}gOiT>v*x2sc$jD>6qv&T_;5VC7kMBz5viaMLpA8^WEEZR;U%&p%
zm5%oQfqjF`;o;#Uqobokso_JwXezG&?LZIE2kug6>ow-&*NCiIRw%rtCzo4P&gCjj
zx}-GyWGq22VQaO0)n;?ofjHj&d>n7v4U<C<4FChFgC^!`{VM_B0P~XwOlRt<@zfJz
zNtQ}DYlC2bEKmj(0Nv^D+kpafE&wl+Y)GeT779@aM~<Y_m;eqZL6bx2b@OE(0A9ss
z)(ntOk~wS|uKg6uvHsLapU(qrvsx}4mpK74O0|441yM_{gI7YASMrr|?h9Yd|Ckhz
qn>I7+p3dz0h|}4O(`)5-IQ|zdvnAclqIwzt0000<MNUMnLSTY>8CoI$
--- a/suite/branding/jar.mn
+++ b/suite/branding/jar.mn
@@ -1,5 +1,6 @@
 comm.jar:
 % content branding %content/branding/
   content/branding/about.png                              (content/about.png)
+  content/branding/icon48.png                             (content/icon48.png)
   content/branding/icon64.png                             (content/icon64.png)
   content/branding/aboutRights.xhtml                      (content/aboutRights.xhtml)
--- a/suite/profile/migration.xul
+++ b/suite/profile/migration.xul
@@ -41,16 +41,17 @@
 <!DOCTYPE dialog SYSTEM "chrome://communicator/locale/migration/migration.dtd" >
 
 <wizard id="migrationWizard"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&migrationWizard.title;"
         onload="MigrationWizard.init()"
         onunload="MigrationWizard.uninit()"
         style="width: 40em; height: 32em;"
+        branded="true"
         buttons="accept,cancel"
         xmlns:xhtml="http://www.w3.org/1999/xhtml">
 
   <script type="application/javascript"
           src="chrome://communicator/content/migration/migration.js"/>
 
   <stringbundle id="bundle"
                 src="chrome://communicator/locale/migration/migration.properties"/>
--- a/suite/themes/modern/global/wizard.css
+++ b/suite/themes/modern/global/wizard.css
@@ -50,22 +50,26 @@
   color: #ffffff;
 }
 
 .wizard-header-description[value=""] {
   display: none;
 }
 
 .wizard-header-label {
-  -moz-margin-start: 23px;
+  -moz-margin-start: 23px !important;
   font-weight: bold;
 }
 
 .wizard-header-description {
-  -moz-margin-start: 44px;
+  -moz-margin-start: 44px !important;
+}
+
+wizard[branded="true"] .wizard-header-icon {
+  list-style-image: url("chrome://branding/content/icon48.png");
   -moz-margin-end: 5px;
 }
 
 .wizard-page-box {
   margin: 10px 44px;
 }
 
 .wizard-buttons-separator {