From 13b2b9edf56ed4d1d729883963039d96ef59c830 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 28 Jun 2019 13:58:07 +0200 Subject: Update branding. --- .../branding/official/VisualElements_150.png | Bin 33851 -> 27921 bytes .../branding/official/VisualElements_70.png | Bin 9272 -> 7785 bytes .../branding/official/content/about-logo.png | Bin 47114 -> 42128 bytes .../branding/official/content/about-logo@2x.png | Bin 171175 -> 166292 bytes .../branding/official/content/about-wordmark.png | Bin 11708 -> 10178 bytes .../branding/official/content/about-wordmark.svg | 133 +++++++++++---------- .../palemoon/branding/official/content/about.png | Bin 64588 -> 47380 bytes .../palemoon/branding/official/content/icon48.png | Bin 4390 -> 3885 bytes .../palemoon/branding/official/content/icon64.png | Bin 6928 -> 6176 bytes .../palemoon/branding/official/default16.png | Bin 881 -> 767 bytes .../palemoon/branding/official/default22.png | Bin 1324 -> 1198 bytes .../palemoon/branding/official/default24.png | Bin 1493 -> 1372 bytes .../palemoon/branding/official/default256.png | Bin 80380 -> 70279 bytes .../palemoon/branding/official/default32.png | Bin 2325 -> 2079 bytes .../palemoon/branding/official/default48.png | Bin 4425 -> 3885 bytes application/palemoon/branding/official/disk.icns | Bin 184077 -> 164632 bytes application/palemoon/branding/official/disk.ico | Bin 77586 -> 0 bytes .../palemoon/branding/official/document.icns | Bin 132198 -> 111772 bytes .../palemoon/branding/official/document.ico | Bin 55494 -> 54261 bytes .../palemoon/branding/official/firefox.icns | Bin 286658 -> 251912 bytes application/palemoon/branding/official/firefox.ico | Bin 107919 -> 101320 bytes .../palemoon/branding/official/mozicon128.png | Bin 23032 -> 20601 bytes .../palemoon/branding/official/palemoon.desktop | 2 +- .../palemoon/branding/official/wizHeader.bmp | Bin 25818 -> 25818 bytes .../palemoon/branding/official/wizHeaderRTL.bmp | Bin 25818 -> 25818 bytes .../palemoon/branding/official/wizWatermark.bmp | Bin 154542 -> 154542 bytes 26 files changed, 69 insertions(+), 66 deletions(-) delete mode 100644 application/palemoon/branding/official/disk.ico (limited to 'application/palemoon') diff --git a/application/palemoon/branding/official/VisualElements_150.png b/application/palemoon/branding/official/VisualElements_150.png index aa784449d..0100b7dde 100644 Binary files a/application/palemoon/branding/official/VisualElements_150.png and b/application/palemoon/branding/official/VisualElements_150.png differ diff --git a/application/palemoon/branding/official/VisualElements_70.png b/application/palemoon/branding/official/VisualElements_70.png index e785bfbc1..147a6f804 100644 Binary files a/application/palemoon/branding/official/VisualElements_70.png and b/application/palemoon/branding/official/VisualElements_70.png differ diff --git a/application/palemoon/branding/official/content/about-logo.png b/application/palemoon/branding/official/content/about-logo.png index 0a475c028..93536f033 100644 Binary files a/application/palemoon/branding/official/content/about-logo.png and b/application/palemoon/branding/official/content/about-logo.png differ diff --git a/application/palemoon/branding/official/content/about-logo@2x.png b/application/palemoon/branding/official/content/about-logo@2x.png index c9d9d43de..d87a62309 100644 Binary files a/application/palemoon/branding/official/content/about-logo@2x.png and b/application/palemoon/branding/official/content/about-logo@2x.png differ diff --git a/application/palemoon/branding/official/content/about-wordmark.png b/application/palemoon/branding/official/content/about-wordmark.png index bf09f15a0..1b849be2e 100644 Binary files a/application/palemoon/branding/official/content/about-wordmark.png and b/application/palemoon/branding/official/content/about-wordmark.png differ diff --git a/application/palemoon/branding/official/content/about-wordmark.svg b/application/palemoon/branding/official/content/about-wordmark.svg index 166ea2c37..6ceacc6d6 100644 --- a/application/palemoon/branding/official/content/about-wordmark.svg +++ b/application/palemoon/branding/official/content/about-wordmark.svg @@ -14,7 +14,10 @@ id="svg2" version="1.1" inkscape:version="0.92.1 r15371" - sodipodi:docname="about-wordmark.svg"> + sodipodi:docname="about-wordmark.svg" + inkscape:export-filename="E:\branding\Pale Moon 2019\about-wordmark.png" + inkscape:export-xdpi="73.991577" + inkscape:export-ydpi="73.991577"> image/svg+xml - + @@ -114,66 +117,66 @@ style="stroke-width:1.13777781" />  - - - - - - - - - - - - - - + style="font-style:normal;font-weight:normal;font-size:48px;line-height:125%;font-family:'Museo 500';-inkscape-font-specification:'Museo 500';letter-spacing:0px;word-spacing:0px;fill:#0b3575;fill-opacity:1;stroke:none;filter:url(#filter4610)" + id="text2997" + inkscape:export-xdpi="73.991577" + inkscape:export-ydpi="73.991577"> + + + + + + + + + + + + diff --git a/application/palemoon/branding/official/content/about.png b/application/palemoon/branding/official/content/about.png index e34dd11ed..0a4fbb393 100644 Binary files a/application/palemoon/branding/official/content/about.png and b/application/palemoon/branding/official/content/about.png differ diff --git a/application/palemoon/branding/official/content/icon48.png b/application/palemoon/branding/official/content/icon48.png index abc17585f..c3a98f128 100644 Binary files a/application/palemoon/branding/official/content/icon48.png and b/application/palemoon/branding/official/content/icon48.png differ diff --git a/application/palemoon/branding/official/content/icon64.png b/application/palemoon/branding/official/content/icon64.png index bccb5e8ec..93a7ce23c 100644 Binary files a/application/palemoon/branding/official/content/icon64.png and b/application/palemoon/branding/official/content/icon64.png differ diff --git a/application/palemoon/branding/official/default16.png b/application/palemoon/branding/official/default16.png index d58dbc5cc..a2e8b1a01 100644 Binary files a/application/palemoon/branding/official/default16.png and b/application/palemoon/branding/official/default16.png differ diff --git a/application/palemoon/branding/official/default22.png b/application/palemoon/branding/official/default22.png index 3b7a33e4a..6508e7b84 100644 Binary files a/application/palemoon/branding/official/default22.png and b/application/palemoon/branding/official/default22.png differ diff --git a/application/palemoon/branding/official/default24.png b/application/palemoon/branding/official/default24.png index e70cc06f3..1d4e66a27 100644 Binary files a/application/palemoon/branding/official/default24.png and b/application/palemoon/branding/official/default24.png differ diff --git a/application/palemoon/branding/official/default256.png b/application/palemoon/branding/official/default256.png index 9a5e7ccab..53adcfa73 100644 Binary files a/application/palemoon/branding/official/default256.png and b/application/palemoon/branding/official/default256.png differ diff --git a/application/palemoon/branding/official/default32.png b/application/palemoon/branding/official/default32.png index 5be7a3378..ce9630745 100644 Binary files a/application/palemoon/branding/official/default32.png and b/application/palemoon/branding/official/default32.png differ diff --git a/application/palemoon/branding/official/default48.png b/application/palemoon/branding/official/default48.png index 9cd9712f7..c3a98f128 100644 Binary files a/application/palemoon/branding/official/default48.png and b/application/palemoon/branding/official/default48.png differ diff --git a/application/palemoon/branding/official/disk.icns b/application/palemoon/branding/official/disk.icns index 8dc67b202..f3a549583 100644 Binary files a/application/palemoon/branding/official/disk.icns and b/application/palemoon/branding/official/disk.icns differ diff --git a/application/palemoon/branding/official/disk.ico b/application/palemoon/branding/official/disk.ico deleted file mode 100644 index cc5412a3a..000000000 Binary files a/application/palemoon/branding/official/disk.ico and /dev/null differ diff --git a/application/palemoon/branding/official/document.icns b/application/palemoon/branding/official/document.icns index 74c2b4c1e..c9f33dbfa 100644 Binary files a/application/palemoon/branding/official/document.icns and b/application/palemoon/branding/official/document.icns differ diff --git a/application/palemoon/branding/official/document.ico b/application/palemoon/branding/official/document.ico index 762655001..2f843dbd1 100644 Binary files a/application/palemoon/branding/official/document.ico and b/application/palemoon/branding/official/document.ico differ diff --git a/application/palemoon/branding/official/firefox.icns b/application/palemoon/branding/official/firefox.icns index e1a2f9a46..64f17ff62 100644 Binary files a/application/palemoon/branding/official/firefox.icns and b/application/palemoon/branding/official/firefox.icns differ diff --git a/application/palemoon/branding/official/firefox.ico b/application/palemoon/branding/official/firefox.ico index 0f55f0ba5..0d142c5f1 100644 Binary files a/application/palemoon/branding/official/firefox.ico and b/application/palemoon/branding/official/firefox.ico differ diff --git a/application/palemoon/branding/official/mozicon128.png b/application/palemoon/branding/official/mozicon128.png index b19a61fdc..35eafcb08 100644 Binary files a/application/palemoon/branding/official/mozicon128.png and b/application/palemoon/branding/official/mozicon128.png differ diff --git a/application/palemoon/branding/official/palemoon.desktop b/application/palemoon/branding/official/palemoon.desktop index 0e6c104b4..3f678e1bf 100644 --- a/application/palemoon/branding/official/palemoon.desktop +++ b/application/palemoon/branding/official/palemoon.desktop @@ -64,7 +64,7 @@ Comment[ko]=웹을 돌아 다닙니다 Comment[ku]=Li torê bigere Comment[lt]=Naršykite internete Comment[nb]=Surf på nettet -Comment[nl]=Verken het internet +Comment[nl]=Surf op het internet Comment[nn]=Surf på nettet Comment[no]=Surf på nettet Comment[pl]=Przeglądanie stron WWW diff --git a/application/palemoon/branding/official/wizHeader.bmp b/application/palemoon/branding/official/wizHeader.bmp index 368e01b90..c023036b6 100644 Binary files a/application/palemoon/branding/official/wizHeader.bmp and b/application/palemoon/branding/official/wizHeader.bmp differ diff --git a/application/palemoon/branding/official/wizHeaderRTL.bmp b/application/palemoon/branding/official/wizHeaderRTL.bmp index 0671342c1..11edaa883 100644 Binary files a/application/palemoon/branding/official/wizHeaderRTL.bmp and b/application/palemoon/branding/official/wizHeaderRTL.bmp differ diff --git a/application/palemoon/branding/official/wizWatermark.bmp b/application/palemoon/branding/official/wizWatermark.bmp index 778749aa2..ad7703d8f 100644 Binary files a/application/palemoon/branding/official/wizWatermark.bmp and b/application/palemoon/branding/official/wizWatermark.bmp differ -- cgit v1.2.3 From b9acf529ef9d0007214950e5d81f03236b200acf Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 28 Jun 2019 14:25:04 +0200 Subject: Re-save wordmark SVG as plain SVG. Tag #1010 --- .../branding/official/content/about-wordmark.svg | 179 ++++++++------------- 1 file changed, 65 insertions(+), 114 deletions(-) (limited to 'application/palemoon') diff --git a/application/palemoon/branding/official/content/about-wordmark.svg b/application/palemoon/branding/official/content/about-wordmark.svg index 6ceacc6d6..708adaaec 100644 --- a/application/palemoon/branding/official/content/about-wordmark.svg +++ b/application/palemoon/branding/official/content/about-wordmark.svg @@ -1,80 +1,48 @@ - - + id="svg2" + height="44.113129" + width="314.56464"> + id="filter4610" + style="color-interpolation-filters:sRGB"> + flood-color="rgb(252,252,247)" + flood-opacity="1" /> + operator="in" + in2="SourceGraphic" + in="flood" /> + stdDeviation="1" + in="composite1" /> + dy="0" + dx="2.77556e-017" /> + operator="over" + in2="offset" + in="SourceGraphic" /> - @@ -83,100 +51,83 @@ image/svg+xml - + + transform="translate(-29.067649,-53.687969)" + id="layer1">   + x="34.479874" + id="tspan2987">      + style="font-style:normal;font-weight:normal;font-size:48px;line-height:125%;font-family:'Museo 500';-inkscape-font-specification:'Museo 500';letter-spacing:0px;word-spacing:0px;fill:#0b3575;fill-opacity:1;stroke:none;filter:url(#filter4610)"> + style="fill:#0b3575;fill-opacity:1;stroke-width:1.06666672" /> + style="fill:#0b3575;fill-opacity:1;stroke-width:1.06666672" /> + style="fill:#0b3575;fill-opacity:1;stroke-width:1.06666672" /> + style="fill:#0b3575;fill-opacity:1;stroke-width:1.06666672" /> + style="fill:#0b3575;fill-opacity:1;stroke-width:1.06666672" /> + style="fill:#0b3575;fill-opacity:1;stroke-width:1.06666672" /> + style="fill:#0b3575;fill-opacity:1;stroke-width:1.06666672" /> + style="fill:#0b3575;fill-opacity:1;stroke-width:1.06666672" /> + style="font-style:normal;font-weight:normal;font-size:10px;line-height:125%;font-family:'Museo 500';-inkscape-font-specification:'Museo 500';letter-spacing:0px;word-spacing:0px;fill:#0b3575;fill-opacity:1;stroke:none;filter:url(#filter4610)"> + style="fill:#0b3575;fill-opacity:1;stroke-width:1.06666672" /> + style="fill:#0b3575;fill-opacity:1;stroke-width:1.06666672" /> -- cgit v1.2.3 From e4b2fa17baea1d35d80de19ffb90d9ba2a1033f8 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 29 Jun 2019 01:37:06 +0200 Subject: [Pale Moon] Remove *.pdf file association in the installer. --- application/palemoon/installer/windows/nsis/shared.nsh | 2 -- application/palemoon/installer/windows/nsis/uninstaller.nsi | 1 - 2 files changed, 3 deletions(-) (limited to 'application/palemoon') diff --git a/application/palemoon/installer/windows/nsis/shared.nsh b/application/palemoon/installer/windows/nsis/shared.nsh index 49e9369f7..385a411a3 100644 --- a/application/palemoon/installer/windows/nsis/shared.nsh +++ b/application/palemoon/installer/windows/nsis/shared.nsh @@ -322,11 +322,9 @@ WriteRegStr SHCTX "$0\.xhtml" "" "PaleMoonHTML" ${EndIf} - ${AddAssociationIfNoneExist} ".pdf" ${AddAssociationIfNoneExist} ".oga" ${AddAssociationIfNoneExist} ".ogg" ${AddAssociationIfNoneExist} ".ogv" - ${AddAssociationIfNoneExist} ".pdf" ${AddAssociationIfNoneExist} ".webm" ; An empty string is used for the 5th param because PaleMoonHTML is not a diff --git a/application/palemoon/installer/windows/nsis/uninstaller.nsi b/application/palemoon/installer/windows/nsis/uninstaller.nsi index 215e93ac4..44b7c060b 100644 --- a/application/palemoon/installer/windows/nsis/uninstaller.nsi +++ b/application/palemoon/installer/windows/nsis/uninstaller.nsi @@ -246,7 +246,6 @@ Section "Uninstall" ${un.RegCleanFileHandler} ".oga" "PaleMoonHTML" ${un.RegCleanFileHandler} ".ogg" "PaleMoonHTML" ${un.RegCleanFileHandler} ".ogv" "PaleMoonHTML" - ${un.RegCleanFileHandler} ".pdf" "PaleMoonHTML" ${un.RegCleanFileHandler} ".webm" "PaleMoonHTML" ${EndIf} -- cgit v1.2.3 From 01af8598698507ce11c3382ed71d2889da0e8c13 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 29 Jun 2019 11:26:21 -0400 Subject: [Pale Moon] Add a configure flag to functionally disable personas at build time --- application/palemoon/base/content/browser-addons.js | 3 ++- application/palemoon/base/content/browser.js | 2 ++ application/palemoon/base/content/browser.xul | 2 ++ application/palemoon/configure.in | 13 +++++++++++++ application/palemoon/confvars.sh | 3 +++ 5 files changed, 22 insertions(+), 1 deletion(-) (limited to 'application/palemoon') diff --git a/application/palemoon/base/content/browser-addons.js b/application/palemoon/base/content/browser-addons.js index f5c398f33..630a0cf79 100644 --- a/application/palemoon/base/content/browser-addons.js +++ b/application/palemoon/base/content/browser-addons.js @@ -263,7 +263,7 @@ var AddonsMgrListener = { onDisabled: function(aAddon) this.onUninstalled(), }; - +#ifdef MOZ_PERSONAS var LightWeightThemeWebInstaller = { handleEvent: function (event) { switch (event.type) { @@ -534,3 +534,4 @@ var LightweightThemeListener = { this.updateStyleSheet("url(" + themeData.headerURL + ")"); }, }; +#endif diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js index 16b7c0019..a5d77a90d 100644 --- a/application/palemoon/base/content/browser.js +++ b/application/palemoon/base/content/browser.js @@ -1216,9 +1216,11 @@ var gBrowserInit = { placesContext.addEventListener("popuphiding", updateEditUIVisibility, false); #endif +#ifdef MOZ_PERSONAS gBrowser.mPanelContainer.addEventListener("InstallBrowserTheme", LightWeightThemeWebInstaller, false, true); gBrowser.mPanelContainer.addEventListener("PreviewBrowserTheme", LightWeightThemeWebInstaller, false, true); gBrowser.mPanelContainer.addEventListener("ResetBrowserThemePreview", LightWeightThemeWebInstaller, false, true); +#endif // Bug 666808 - AeroPeek support for e10s if (!gMultiProcessBrowser) { diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul index ddc305a7b..0a249afa9 100644 --- a/application/palemoon/base/content/browser.xul +++ b/application/palemoon/base/content/browser.xul @@ -53,8 +53,10 @@ titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;" #endif titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" +#ifdef MOZ_PERSONAS lightweightthemes="true" lightweightthemesfooter="browser-bottombox" +#endif windowtype="navigator:browser" macanimationtype="document" screenX="4" screenY="4" diff --git a/application/palemoon/configure.in b/application/palemoon/configure.in index eb02af3c0..9d820f6d4 100644 --- a/application/palemoon/configure.in +++ b/application/palemoon/configure.in @@ -36,3 +36,16 @@ MOZ_ARG_DISABLE_BOOL(sync, MOZ_SERVICES_SYNC=, MOZ_SERVICES_SYNC=1) +dnl ======================================================== +dnl = Disable Lightweight Themes +dnl ======================================================== +MOZ_ARG_DISABLE_BOOL(personas, +[ --disable-personas Disable lightweight theme support], + MOZ_PERSONAS=, + MOZ_PERSONAS=1) + +if test -n "$MOZ_PERSONAS"; then + AC_DEFINE(MOZ_PERSONAS) +fi + +AC_SUBST(MOZ_PERSONAS) \ No newline at end of file diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh index 6216cba5b..79681f013 100644 --- a/application/palemoon/confvars.sh +++ b/application/palemoon/confvars.sh @@ -46,6 +46,9 @@ MOZ_PHOENIX=1 # Browser Feature: Status bar Component MOZ_BROWSER_STATUSBAR=1 +# Lightweight Themes +MOZ_PERSONAS=1 + # Browser Feature: Profile Migration Component MOZ_PROFILE_MIGRATOR= -- cgit v1.2.3