зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1547399 - New stub installer background for release. r=agashlin
The new background image has a white background behind the footer text, so this patch changes the color of the footer to black. It also moves the footer text a bit lower to align with the new logo placement. Differential Revision: https://phabricator.services.mozilla.com/D30210 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
ff8f2e78c9
Коммит
1c5caaa201
|
@ -36,11 +36,13 @@
|
||||||
!define INTRO_BLURB_EDGE_DU "196u"
|
!define INTRO_BLURB_EDGE_DU "196u"
|
||||||
!define INTRO_BLURB_LTR_TOP_DU "16u"
|
!define INTRO_BLURB_LTR_TOP_DU "16u"
|
||||||
!define INTRO_BLURB_RTL_TOP_DU "11u"
|
!define INTRO_BLURB_RTL_TOP_DU "11u"
|
||||||
|
!define INSTALL_FOOTER_TOP_DU "-48u"
|
||||||
|
|
||||||
# UI Colors that can be customized for each channel
|
# UI Colors that can be customized for each channel
|
||||||
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
|
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
|
||||||
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
|
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
|
||||||
!define FOOTER_BKGRD_COLOR 0xFFFFFF
|
!define FOOTER_BKGRD_COLOR 0xFFFFFF
|
||||||
|
!define INSTALL_FOOTER_TEXT_COLOR 0xFFFFFF
|
||||||
!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
|
!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
|
||||||
!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
|
!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
|
||||||
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
|
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
|
||||||
|
|
|
@ -35,11 +35,13 @@
|
||||||
!define INTRO_BLURB_EDGE_DU "198u"
|
!define INTRO_BLURB_EDGE_DU "198u"
|
||||||
!define INTRO_BLURB_LTR_TOP_DU "16u"
|
!define INTRO_BLURB_LTR_TOP_DU "16u"
|
||||||
!define INTRO_BLURB_RTL_TOP_DU "11u"
|
!define INTRO_BLURB_RTL_TOP_DU "11u"
|
||||||
|
!define INSTALL_FOOTER_TOP_DU "-48u"
|
||||||
|
|
||||||
# UI Colors that can be customized for each channel
|
# UI Colors that can be customized for each channel
|
||||||
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
|
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
|
||||||
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
|
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
|
||||||
!define FOOTER_BKGRD_COLOR 0xFFFFFF
|
!define FOOTER_BKGRD_COLOR 0xFFFFFF
|
||||||
|
!define INSTALL_FOOTER_TEXT_COLOR 0xFFFFFF
|
||||||
!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
|
!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
|
||||||
!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
|
!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
|
||||||
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
|
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
|
||||||
|
|
Двоичные данные
browser/branding/official/bgstub.jpg
Двоичные данные
browser/branding/official/bgstub.jpg
Двоичный файл не отображается.
До Ширина: | Высота: | Размер: 18 KiB После Ширина: | Высота: | Размер: 18 KiB |
Двоичные данные
browser/branding/official/bgstub_2x.jpg
Двоичные данные
browser/branding/official/bgstub_2x.jpg
Двоичный файл не отображается.
До Ширина: | Высота: | Размер: 88 KiB После Ширина: | Высота: | Размер: 50 KiB |
|
@ -40,11 +40,13 @@
|
||||||
!define INTRO_BLURB_EDGE_DU "170u"
|
!define INTRO_BLURB_EDGE_DU "170u"
|
||||||
!define INTRO_BLURB_LTR_TOP_DU "20u"
|
!define INTRO_BLURB_LTR_TOP_DU "20u"
|
||||||
!define INTRO_BLURB_RTL_TOP_DU "12u"
|
!define INTRO_BLURB_RTL_TOP_DU "12u"
|
||||||
|
!define INSTALL_FOOTER_TOP_DU "-33u"
|
||||||
|
|
||||||
# UI Colors that can be customized for each channel
|
# UI Colors that can be customized for each channel
|
||||||
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
|
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
|
||||||
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666
|
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666
|
||||||
!define FOOTER_BKGRD_COLOR 0xFFFFFF
|
!define FOOTER_BKGRD_COLOR 0xFFFFFF
|
||||||
|
!define INSTALL_FOOTER_TEXT_COLOR 0x000000
|
||||||
!define INTRO_BLURB_TEXT_COLOR 0x666666
|
!define INTRO_BLURB_TEXT_COLOR 0x666666
|
||||||
!define INSTALL_BLURB_TEXT_COLOR 0x666666
|
!define INSTALL_BLURB_TEXT_COLOR 0x666666
|
||||||
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666
|
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666
|
||||||
|
|
|
@ -35,11 +35,13 @@
|
||||||
!define INTRO_BLURB_EDGE_DU "198u"
|
!define INTRO_BLURB_EDGE_DU "198u"
|
||||||
!define INTRO_BLURB_LTR_TOP_DU "16u"
|
!define INTRO_BLURB_LTR_TOP_DU "16u"
|
||||||
!define INTRO_BLURB_RTL_TOP_DU "11u"
|
!define INTRO_BLURB_RTL_TOP_DU "11u"
|
||||||
|
!define INSTALL_FOOTER_TOP_DU "-48u"
|
||||||
|
|
||||||
# UI Colors that can be customized for each channel
|
# UI Colors that can be customized for each channel
|
||||||
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
|
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
|
||||||
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
|
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
|
||||||
!define FOOTER_BKGRD_COLOR 0xFFFFFF
|
!define FOOTER_BKGRD_COLOR 0xFFFFFF
|
||||||
|
!define INSTALL_FOOTER_TEXT_COLOR 0xFFFFFF
|
||||||
!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
|
!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
|
||||||
!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
|
!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
|
||||||
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
|
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
|
||||||
|
|
|
@ -152,7 +152,6 @@ VIAddVersionKey "ProductVersion" "${AppVersion}"
|
||||||
!define PROFILE_CLEANUP_LABEL_TOP_DU 39u
|
!define PROFILE_CLEANUP_LABEL_TOP_DU 39u
|
||||||
!define NOW_INSTALLING_TOP_DU 70u
|
!define NOW_INSTALLING_TOP_DU 70u
|
||||||
!define INSTALL_BLURB_TOP_DU 137u
|
!define INSTALL_BLURB_TOP_DU 137u
|
||||||
!define INSTALL_FOOTER_TOP_DU -48u
|
|
||||||
!define INSTALL_FOOTER_WIDTH_DU 250u
|
!define INSTALL_FOOTER_WIDTH_DU 250u
|
||||||
!define PROGRESS_BAR_TOP_DU 112u
|
!define PROGRESS_BAR_TOP_DU 112u
|
||||||
!define APPNAME_BMP_EDGE_DU 19u
|
!define APPNAME_BMP_EDGE_DU 19u
|
||||||
|
|
|
@ -746,7 +746,7 @@ Function createProfileCleanup
|
||||||
!endif
|
!endif
|
||||||
Pop $0
|
Pop $0
|
||||||
SendMessage $0 ${WM_SETFONT} $FontFooter 0
|
SendMessage $0 ${WM_SETFONT} $FontFooter 0
|
||||||
SetCtlColors $0 ${INSTALL_BLURB_TEXT_COLOR} transparent
|
SetCtlColors $0 ${INSTALL_FOOTER_TEXT_COLOR} transparent
|
||||||
|
|
||||||
Call DrawBackgroundImage
|
Call DrawBackgroundImage
|
||||||
|
|
||||||
|
@ -818,7 +818,7 @@ Function createInstall
|
||||||
!endif
|
!endif
|
||||||
Pop $0
|
Pop $0
|
||||||
SendMessage $0 ${WM_SETFONT} $FontFooter 0
|
SendMessage $0 ${WM_SETFONT} $FontFooter 0
|
||||||
SetCtlColors $0 ${INSTALL_BLURB_TEXT_COLOR} transparent
|
SetCtlColors $0 ${INSTALL_FOOTER_TEXT_COLOR} transparent
|
||||||
|
|
||||||
${NSD_CreateProgressBar} 20% ${PROGRESS_BAR_TOP_DU} 60% 12u ""
|
${NSD_CreateProgressBar} 20% ${PROGRESS_BAR_TOP_DU} 60% 12u ""
|
||||||
Pop $Progressbar
|
Pop $Progressbar
|
||||||
|
|
Загрузка…
Ссылка в новой задаче