domi/foxgirl-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update patches for 89.0

Browse source
This commit is contained in:
ohfp 2021-06-02 19:56:19 +02:00
parent 5bce5285fa
commit e3608826e9
No known key found for this signature in database
GPG key ID: 2954CC8585E27A3F
4 changed files with 4126 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
patches/context-menu.patch
View file

@ -1,8 +1,12 @@
diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
index a7fce1a806..3a9d07582d 100644
--- a/browser/base/content/browser-context.inc --- a/browser/base/content/browser-context.inc
+++ b/browser/base/content/browser-context.inc +++ b/browser/base/content/browser-context.inc
@@ -78,9 +78,6 @@ @@ -102,19 +102,16 @@
oncommand="gContextMenu.openLinkInPrivateWindow();"/>
<menuseparator id="context-sep-open"/>
<menuitem id="context-bookmarklink"
data-l10n-id="main-context-menu-bookmark-link"
oncommand="gContextMenu.bookmarkLink();"/>
<menuitem id="context-savelink" <menuitem id="context-savelink"
data-l10n-id="main-context-menu-save-link" data-l10n-id="main-context-menu-save-link"
oncommand="gContextMenu.saveLink();"/> oncommand="gContextMenu.saveLink();"/>
@ -12,13 +16,28 @@ index a7fce1a806..3a9d07582d 100644
<menuitem id="context-copyemail" <menuitem id="context-copyemail"
data-l10n-id="main-context-menu-copy-email" data-l10n-id="main-context-menu-copy-email"
oncommand="gContextMenu.copyEmail();"/> oncommand="gContextMenu.copyEmail();"/>
@@ -215,9 +212,6 @@ <menuitem id="context-copylink"
data-l10n-id="main-context-menu-copy-link-simple"
oncommand="gContextMenu.copyLink();"/>
<menu id="context-sendlinktodevice"
class="sync-ui-item"
@@ -254,19 +251,16 @@
#ifdef XP_MACOSX
<menuitem id="context-bookmarkpage"
data-l10n-id="main-context-menu-bookmark-add-mac"
oncommand="gContextMenu.bookmarkThisPage();"/>
#endif
<menuitem id="context-savepage" <menuitem id="context-savepage"
data-l10n-id="main-context-menu-page-save" data-l10n-id="main-context-menu-page-save"
oncommand="gContextMenu.savePageAs();"/> oncommand="gContextMenu.savePageAs();"/>
- <menuitem id="context-pocket" - <menuitem id="context-pocket"
- data-l10n-id="main-context-menu-save-to-pocket" - data-l10n-id="main-context-menu-save-to-pocket"
- oncommand="Pocket.savePage(gContextMenu.browser, gContextMenu.browser.currentURI.spec, gContextMenu.browser.contentTitle);"/> - oncommand="Pocket.savePage(gContextMenu.browser, gContextMenu.browser.currentURI.spec, gContextMenu.browser.contentTitle);"/>
<menuseparator id="context-sep-sendpagetodevice" class="sync-ui-item"
hidden="true"/>
<menu id="context-sendpagetodevice" <menu id="context-sendpagetodevice"
class="sync-ui-item"
data-l10n-id="main-context-menu-send-to-device"
hidden="true">
<menupopup id="context-sendpagetodevice-popup"
onpopupshowing="(() => { gSync.populateSendTabToDevicesMenu(event.target, gBrowser.currentURI.spec, gBrowser.contentTitle); })()"/>
</menu>
<menu id="fill-login" hidden="true">

97
patches/megabar.patch
View file

@ -1,8 +1,8 @@
diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
index 73d15df..99cc41b 100644 index 4c42071..12323dd 100644
--- a/browser/components/urlbar/UrlbarInput.jsm --- a/browser/components/urlbar/UrlbarInput.jsm
+++ b/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm
@@ -1692,13 +1692,13 @@ class UrlbarInput { @@ -1712,13 +1712,13 @@ class UrlbarInput {
// Enable the animation only after the first extend call to ensure it // Enable the animation only after the first extend call to ensure it
// doesn't run when opening a new window. // doesn't run when opening a new window.
@ -13,18 +13,18 @@ index 73d15df..99cc41b 100644
- }); - });
- }); - });
- } - }
+ // if (!this.hasAttribute("breakout-extend-animate")) { +// if (!this.hasAttribute("breakout-extend-animate")) {
+ // this.window.promiseDocumentFlushed(() => { +// this.window.promiseDocumentFlushed(() => {
+ // this.window.requestAnimationFrame(() => { +// this.window.requestAnimationFrame(() => {
+ // this.setAttribute("breakout-extend-animate", "true"); +// this.setAttribute("breakout-extend-animate", "true");
+ // }); +// });
+ // }); +// });
+ // } +// }
} }
endLayoutExtend() { endLayoutExtend() {
diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
index e9fde8b..6c4c444 100644 index e80aaf6..6ec0961 100644
--- a/browser/themes/shared/urlbar-searchbar.inc.css --- a/browser/themes/shared/urlbar-searchbar.inc.css
+++ b/browser/themes/shared/urlbar-searchbar.inc.css +++ b/browser/themes/shared/urlbar-searchbar.inc.css
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
@ -36,42 +36,60 @@ index e9fde8b..6c4c444 100644
%define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding)) %define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
:root { :root {
@@ -273,9 +273,9 @@ @@ -279,40 +279,40 @@
} }
#urlbar[breakout][breakout-extend] { #urlbar[breakout][breakout-extend] {
- top: -@urlbarBreakoutExtend@; - top: -@urlbarBreakoutExtend@;
- left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@); - left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
- width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@); - width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
+ top: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2); + top: 0;
+ left: 0; + left: 0;
+ width: 100%; + width: 100%;
} }
@supports -moz-bool-pref("browser.proton.urlbar.enabled") { @media (-moz-proton) {
@@ -288,7 +288,7 @@ #urlbar[breakout][breakout-extend] {
top: 0;
- left: -@urlbarMarginInline@;
- width: calc(100% + 2 * @urlbarMarginInline@);
+ left: 0;
+ width: 100%;
}
} /*** END proton ***/
@supports not -moz-bool-pref("browser.proton.urlbar.enabled") { @media not (-moz-proton) {
#urlbar[breakout][breakout-extend] > #urlbar-background { #urlbar[breakout][breakout-extend] > #urlbar-background {
- box-shadow: 0 3px 8px 0 rgba(0,0,0,.15) - box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
+ box-shadow: 0 1px 4px rgba(0,0,0,.05); + box-shadow: 0 1px 4px rgba(0,0,0,.05);
} }
#urlbar[breakout][breakout-extend][open] > #urlbar-background { #urlbar[breakout][breakout-extend][open] > #urlbar-background {
@@ -297,9 +297,9 @@ - box-shadow: 0 5px 18px rgba(0,0,0,.2);
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
}
} /*** END !proton ***/ } /*** END !proton ***/
#urlbar[breakout][breakout-extend] > #urlbar-input-container { #urlbar[breakout][breakout-extend] > #urlbar-input-container {
- height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@); - height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
- padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2); - padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
- padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@); - padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
+ height: var(--urlbar-height); + height: var(--urlbar-toolbar-height);
+ padding-block: 0; + padding-block: 0;
+ padding-inline: 0; + padding-inline: 0;
} }
@supports -moz-bool-pref("browser.proton.urlbar.enabled") { @media (-moz-proton) {
@@ -325,7 +325,7 @@ #urlbar[breakout][breakout-extend] > #urlbar-input-container {
height: var(--urlbar-toolbar-height);
- padding-block: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding));
- padding-inline: calc(@urlbarMarginInline@ + var(--urlbar-container-padding));
+ padding-block: 0;
+ padding-inline: 0;
}
} /*** END proton ***/
@@ -331,7 +331,7 @@
} }
#urlbar[breakout][breakout-extend] > #urlbar-background { #urlbar[breakout][breakout-extend] > #urlbar-background {
@ -81,38 +99,57 @@ index e9fde8b..6c4c444 100644
animation-timing-function: var(--animation-easing-function); animation-timing-function: var(--animation-easing-function);
} }
diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
index c6ce546..da00fac 100644 index d2bb269..0d47466 100644
--- a/browser/themes/shared/urlbarView.inc.css --- a/browser/themes/shared/urlbarView.inc.css
+++ b/browser/themes/shared/urlbarView.inc.css +++ b/browser/themes/shared/urlbarView.inc.css
@@ -74,8 +74,8 @@ @@ -73,16 +73,16 @@
display: block; display: block;
text-shadow: none; text-shadow: none;
overflow: clip; overflow: clip;
- margin-inline: calc(5px + var(--urlbar-container-padding)); - margin-inline: calc(5px + var(--urlbar-container-padding));
- width: calc(100% - 2 * (5px + var(--urlbar-container-padding))); - width: calc(100% - 2 * (5px + var(--urlbar-container-padding)));
+ margin-inline: 0; + margin-inline: 0;
+ width: 100%; + width: 100%
/* Match urlbar-background's border. */ /* Match urlbar-background's border. */
border-inline: 1px solid transparent; border-inline: 1px solid transparent;
} }
@@ -115,7 +115,7 @@
flex-wrap: nowrap; @media not (-moz-proton) {
.urlbarView {
- margin-inline: calc(4px + var(--identity-box-margin-inline));
- width: calc(100% - 2 * (4px + var(--identity-box-margin-inline)));
+ margin-inline: 0;
+ width: 100%;
}
/* If the view is open, offset the toolbar overlap so the view's top border
aligns with the toolbar. */
@@ -112,7 +112,7 @@
.urlbarView-row {
fill: currentColor; fill: currentColor;
fill-opacity: .6; fill-opacity: var(--urlbar-icon-fill-opacity);
- padding-block: 3px; - padding-block: 3px;
+ padding-block: 0; + padding-block: 0;
} }
:root[uidensity=compact] .urlbarView-row { @media not (-moz-proton) {
@@ -280,6 +280,7 @@ @@ -127,7 +127,7 @@
}
:root:not([uidensity=compact]) .urlbarView-row:not([type=tip], [type=dynamic]) {
- min-height: 32px;
+ min-height: 0;
}
} /*** END proton ***/
@@ -295,6 +295,7 @@
object-fit: contain; object-fit: contain;
flex-shrink: 0; flex-shrink: 0;
-moz-context-properties: fill, fill-opacity; -moz-context-properties: fill, fill-opacity;
+ margin-inline-start: 20px; + margin-inline-start: 20px;
} }
@supports not -moz-bool-pref("browser.proton.urlbar.enabled") { @media not (-moz-proton) {
@@ -324,10 +325,10 @@ @@ -328,10 +329,10 @@
.urlbarView-type-icon { .urlbarView-type-icon {
position: absolute; position: absolute;
@ -126,4 +163,4 @@ index c6ce546..da00fac 100644
+ margin-inline-start: 0; + margin-inline-start: 0;
align-self: end; align-self: end;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain; background-size: contain;

15
patches/mozilla-vpn-ad.patch
View file

@ -1,16 +1,17 @@
diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
index 4d22812723..2542791b9b 100644
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html --- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
+++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html +++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
@@ -54,11 +54,7 @@ @@ -54,13 +54,10 @@
<div class="info"> <div class="info">
<h1 data-l10n-id="about-private-browsing-info-title"></h1> <h1 id="info-title" data-l10n-id="about-private-browsing-info-title"></h1>
<p data-l10n-id="about-private-browsing-info-description"></p> <p id="info-body" data-l10n-id="about-private-browsing-info-description"></p>
- <a id="private-browsing-myths" data-l10n-id="about-private-browsing-info-myths"></a> - <a id="private-browsing-myths" data-l10n-id="about-private-browsing-info-myths"></a>
</div> </div>
</div> </div>
-
- <p id="private-browsing-vpn-text" class="vpn-promo" data-l10n-id="about-private-browsing-need-more-privacy"></p> <div class="promo">
- <a id="private-browsing-vpn-link" class="vpn-promo" data-l10n-id="about-private-browsing-turn-on-vpn"></a> - <p id="private-browsing-vpn-text" class="vpn-promo" data-l10n-id="about-private-browsing-need-more-privacy"></p>
- <a id="private-browsing-vpn-link" class="vpn-promo" data-l10n-id="about-private-browsing-turn-on-vpn"></a>
</div>
</body> </body>
</html> </html>

4027
patches/search-config.patch Normal file
View file

File diff suppressed because it is too large Load diff