From 01f19671aa9e77d682d553199257197c08b29056 Mon Sep 17 00:00:00 2001 From: Philip Chee Date: Tue, 12 Jan 2010 15:59:36 +0100 Subject: [PATCH] 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 | Bin 0 -> 4348 bytes suite/branding/jar.mn | 1 + suite/profile/migration.xul | 1 + suite/themes/modern/global/wizard.css | 8 ++++++-- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 suite/branding/content/icon48.png diff --git a/suite/branding/content/icon48.png b/suite/branding/content/icon48.png 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$q97`3!5==Z`oNDs_JU5fxc>@@yOIZ80i1d5HTQky?>~P2yq}JH zT>GGM^V@|B7sh=2?`qt7TLY^zQs=sm%kdHkOgs!CGAp{yv}9bS$34%}(a|B0jisT-KqKcEqw~Qa3m^hDdG6F{>; 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*Uv*x2sc$jD>6qv&T_;5VC7kMBz5viaMLpA8^WEEZR;U%&p% zm5%oQfqjF`;o;#Uqobokso_JwXezG&?LZIE2kug6>ow-&*NCiIRw%rtCzo4P&gCjj zx}-GyWGq22VQaO0)n;?ofjHj&d>n7v4UI7+p3dz0h|}4O(`)5-IQ|zdvnAclqIwzt00008CoI$ literal 0 HcmV?d00001 diff --git a/suite/branding/jar.mn b/suite/branding/jar.mn index 78b82ab427..9793f1ad7b 100644 --- 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) diff --git a/suite/profile/migration.xul b/suite/profile/migration.xul index 2201a4d0bc..022ae7235f 100644 --- a/suite/profile/migration.xul +++ b/suite/profile/migration.xul @@ -46,6 +46,7 @@ onload="MigrationWizard.init()" onunload="MigrationWizard.uninit()" style="width: 40em; height: 32em;" + branded="true" buttons="accept,cancel" xmlns:xhtml="http://www.w3.org/1999/xhtml"> diff --git a/suite/themes/modern/global/wizard.css b/suite/themes/modern/global/wizard.css index 00ea2c6c93..c568a82317 100644 --- a/suite/themes/modern/global/wizard.css +++ b/suite/themes/modern/global/wizard.css @@ -55,12 +55,16 @@ } .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; }