Removed patches/nightly and patches/release
Bert van der Weerd
parent
9797e2ce7e
commit
5899038df5
|
|
@ -1,43 +0,0 @@
|
|||
diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
|
||||
--- a/browser/base/content/browser-context.inc
|
||||
+++ b/browser/base/content/browser-context.inc
|
||||
@@ -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"
|
||||
data-l10n-id="main-context-menu-save-link"
|
||||
oncommand="gContextMenu.saveLink();"/>
|
||||
- <menuitem id="context-savelinktopocket"
|
||||
- data-l10n-id="main-context-menu-save-link-to-pocket"
|
||||
- oncommand= "Pocket.savePage(gContextMenu.browser, gContextMenu.linkURL);"/>
|
||||
<menuitem id="context-copyemail"
|
||||
data-l10n-id="main-context-menu-copy-email"
|
||||
oncommand="gContextMenu.copyEmail();"/>
|
||||
<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"
|
||||
data-l10n-id="main-context-menu-page-save"
|
||||
oncommand="gContextMenu.savePageAs();"/>
|
||||
- <menuitem id="context-pocket"
|
||||
- data-l10n-id="main-context-menu-save-to-pocket"
|
||||
- oncommand="Pocket.savePage(gContextMenu.browser, gContextMenu.browser.currentURI.spec, gContextMenu.browser.contentTitle);"/>
|
||||
<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">
|
||||
|
|
@ -1,245 +0,0 @@
|
|||
diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
|
||||
--- a/browser/components/urlbar/UrlbarInput.jsm
|
||||
+++ b/browser/components/urlbar/UrlbarInput.jsm
|
||||
@@ -1699,23 +1699,23 @@ class UrlbarInput {
|
||||
this.removeAttribute("breakout-extend-disabled");
|
||||
}
|
||||
|
||||
this._toolbar.setAttribute("urlbar-exceeds-toolbar-bounds", "true");
|
||||
this.setAttribute("breakout-extend", "true");
|
||||
|
||||
// Enable the animation only after the first extend call to ensure it
|
||||
// doesn't run when opening a new window.
|
||||
- if (!this.hasAttribute("breakout-extend-animate")) {
|
||||
- this.window.promiseDocumentFlushed(() => {
|
||||
- this.window.requestAnimationFrame(() => {
|
||||
- this.setAttribute("breakout-extend-animate", "true");
|
||||
- });
|
||||
- });
|
||||
- }
|
||||
+// if (!this.hasAttribute("breakout-extend-animate")) {
|
||||
+// this.window.promiseDocumentFlushed(() => {
|
||||
+// this.window.requestAnimationFrame(() => {
|
||||
+// this.setAttribute("breakout-extend-animate", "true");
|
||||
+// });
|
||||
+// });
|
||||
+// }
|
||||
}
|
||||
|
||||
endLayoutExtend() {
|
||||
// If reduce motion is enabled, we want to collapse the Urlbar here so the
|
||||
// user sees only sees two states: not expanded, and expanded with the view
|
||||
// open.
|
||||
if (!this.hasAttribute("breakout-extend") || this.view.isOpen) {
|
||||
return;
|
||||
diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
--- a/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
@@ -1,16 +1,16 @@
|
||||
%if 0
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
%endif
|
||||
|
||||
%define fieldHoverBorderColor hsla(240,5%,5%,.35)
|
||||
-%define urlbarMarginInline 5px
|
||||
+%define urlbarMarginInline 0px
|
||||
%define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
|
||||
|
||||
:root {
|
||||
--toolbar-field-border-color: hsla(240,5%,5%,.25);
|
||||
}
|
||||
|
||||
@media not (-moz-proton) {
|
||||
:root {
|
||||
@@ -268,50 +268,50 @@
|
||||
#urlbar[breakout][breakout-extend-disabled][open] {
|
||||
/* The z-index needs to be big enough to trump other positioned UI pieces
|
||||
that we want to overlay. 3 is used in the tab bar. */
|
||||
z-index: 3;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend] {
|
||||
- top: -@urlbarBreakoutExtend@;
|
||||
- left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
|
||||
- width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
|
||||
+ top: 0;
|
||||
+ left: 0;
|
||||
+ width: 100%;
|
||||
}
|
||||
|
||||
@media (-moz-proton) {
|
||||
#urlbar[breakout][breakout-extend] {
|
||||
top: 0;
|
||||
- left: -@urlbarMarginInline@;
|
||||
- width: calc(100% + 2 * @urlbarMarginInline@);
|
||||
+ left: 0;
|
||||
+ width: 100%;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
@media not (-moz-proton) {
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||
- box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
|
||||
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend][open] > #urlbar-background {
|
||||
- box-shadow: 0 5px 18px rgba(0,0,0,.2);
|
||||
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
|
||||
- height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
|
||||
- padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
|
||||
- padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
|
||||
+ height: var(--urlbar-toolbar-height);
|
||||
+ padding-block: 0;
|
||||
+ padding-inline: 0;
|
||||
}
|
||||
|
||||
@media (-moz-proton) {
|
||||
#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 ***/
|
||||
|
||||
#urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button {
|
||||
fill: currentColor;
|
||||
fill-opacity: .6;
|
||||
}
|
||||
|
||||
@@ -320,17 +320,17 @@
|
||||
transform: scaleX(.99) scaleY(.95);
|
||||
}
|
||||
100% {
|
||||
transform: scale(1.0);
|
||||
}
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||
- animation-name: urlbar-grow;
|
||||
+ animation-name: none;
|
||||
animation-duration: 0s;
|
||||
animation-timing-function: var(--animation-easing-function);
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
#urlbar[breakout][breakout-extend][breakout-extend-animate] > #urlbar-background {
|
||||
animation-duration: 150ms;
|
||||
}
|
||||
diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
|
||||
--- a/browser/themes/shared/urlbarView.inc.css
|
||||
+++ b/browser/themes/shared/urlbarView.inc.css
|
||||
@@ -82,26 +82,26 @@
|
||||
|
||||
.urlbarView {
|
||||
/* Don't handle window drag events in case we are overlapping a toolbar */
|
||||
-moz-window-dragging: no-drag;
|
||||
|
||||
display: block;
|
||||
text-shadow: none;
|
||||
overflow: clip;
|
||||
- margin-inline: calc(5px + var(--urlbar-container-padding));
|
||||
- width: calc(100% - 2 * (5px + var(--urlbar-container-padding)));
|
||||
+ margin-inline: 0;
|
||||
+ width: 100%
|
||||
/* Match urlbar-background's border. */
|
||||
border-inline: 1px solid transparent;
|
||||
}
|
||||
|
||||
@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. */
|
||||
#urlbar[open] > .urlbarView {
|
||||
margin-block-start: -@urlbarBreakoutExtend@;
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
@@ -123,27 +123,27 @@
|
||||
padding-block: 0;
|
||||
}
|
||||
|
||||
.urlbarView-row {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
fill: currentColor;
|
||||
fill-opacity: .6;
|
||||
- padding-block: 3px;
|
||||
+ padding-block: 0px;
|
||||
}
|
||||
|
||||
:root[uidensity=compact] .urlbarView-row {
|
||||
padding-block: 2px;
|
||||
}
|
||||
|
||||
@media (-moz-proton) {
|
||||
:root:not([uidensity=compact]) .urlbarView-row:not([type=tip], [type=dynamic]) {
|
||||
- min-height: 32px;
|
||||
- padding-block: 4px;
|
||||
+ min-height: 0px; /* todo: check this */
|
||||
+ padding-block: 0px;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
.urlbarView-row-inner {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
@@ -288,16 +288,17 @@
|
||||
width: @urlbarViewFaviconWidth@;
|
||||
height: @urlbarViewFaviconWidth@;
|
||||
margin-inline-end: calc(@urlbarViewIconMarginEnd@);
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
object-fit: contain;
|
||||
flex-shrink: 0;
|
||||
-moz-context-properties: fill, fill-opacity;
|
||||
+ margin-inline-start: 20px;
|
||||
}
|
||||
|
||||
@media not (-moz-proton) {
|
||||
.urlbarView-favicon {
|
||||
/* 2px is from identity-block.inc.css */
|
||||
margin-inline-end: calc(var(--urlbar-icon-padding) / 2 + var(--identity-box-margin-inline) + 2px);
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
@@ -321,20 +322,20 @@
|
||||
color: var(--urlbar-popup-url-color);
|
||||
-moz-context-properties: fill;
|
||||
}
|
||||
|
||||
/* Type icon */
|
||||
|
||||
.urlbarView-type-icon {
|
||||
position: absolute;
|
||||
- width: 12px;
|
||||
- height: 12px;
|
||||
- margin-bottom: -4px;
|
||||
- margin-inline-start: 8px;
|
||||
+ width: 16px;
|
||||
+ height: 16px;;
|
||||
+ margin-bottom: 0;
|
||||
+ margin-inline-start: 0;
|
||||
align-self: end;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
-moz-context-properties: fill, stroke;
|
||||
}
|
||||
|
||||
/* Favicon badges have this priority: pinned > bookmark. */
|
||||
|
||||
|
|
@ -1,123 +0,0 @@
|
|||
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
|
||||
--- a/browser/extensions/moz.build
|
||||
+++ b/browser/extensions/moz.build
|
||||
@@ -1,14 +1,11 @@
|
||||
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DIRS += [
|
||||
- "doh-rollout",
|
||||
"formautofill",
|
||||
"screenshots",
|
||||
- "webcompat",
|
||||
- "report-site-issue",
|
||||
"pictureinpicture",
|
||||
]
|
||||
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
|
||||
--- a/browser/locales/Makefile.in
|
||||
+++ b/browser/locales/Makefile.in
|
||||
@@ -56,17 +56,16 @@ l10n-%:
|
||||
$(if $(filter en-US,$(AB_CD)),, @$(MAKE) merge-$*)
|
||||
$(NSINSTALL) -D $(DIST)/install
|
||||
@$(MAKE) -C ../../toolkit/locales l10n-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
||||
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
ifneq (,$(wildcard ../extensions/formautofill/locales))
|
||||
@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
endif
|
||||
- @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
||||
@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
||||
@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
|
||||
@$(MAKE) multilocale.txt-$* AB_CD=$* XPI_NAME=locale-$*
|
||||
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
|
||||
chrome-%: AB_CD=$*
|
||||
chrome-%: IS_LANGUAGE_REPACK=1
|
||||
@@ -77,17 +76,16 @@ chrome-%:
|
||||
@$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$*
|
||||
ifneq (,$(wildcard ../extensions/formautofill/locales))
|
||||
@$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$*
|
||||
endif
|
||||
@$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$*
|
||||
@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
|
||||
@$(MAKE) chrome AB_CD=$*
|
||||
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
|
||||
- @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
|
||||
|
||||
package-win32-installer: $(SUBMAKEFILES)
|
||||
$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
|
||||
|
||||
langpack: langpack-$(AB_CD)
|
||||
|
||||
# This is a generic target that will make a langpack, repack ZIP (+tarball)
|
||||
# builds, and repack an installer if applicable. It is called from the
|
||||
diff --git a/browser/locales/filter.py b/browser/locales/filter.py
|
||||
--- a/browser/locales/filter.py
|
||||
+++ b/browser/locales/filter.py
|
||||
@@ -15,17 +15,16 @@ def test(mod, path, entity=None):
|
||||
"toolkit",
|
||||
"security/manager",
|
||||
"devtools/client",
|
||||
"devtools/shared",
|
||||
"devtools/startup",
|
||||
"browser",
|
||||
"browser/extensions/formautofill",
|
||||
"browser/extensions/fxmonitor",
|
||||
- "browser/extensions/report-site-issue",
|
||||
"extensions/spellcheck",
|
||||
"other-licenses/branding/firefox",
|
||||
"browser/branding/official",
|
||||
"services/sync",
|
||||
):
|
||||
return "ignore"
|
||||
if mod not in ("browser", "extensions/spellcheck"):
|
||||
# we only have exceptions for browser and extensions/spellcheck
|
||||
diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
|
||||
--- a/browser/locales/l10n.ini
|
||||
+++ b/browser/locales/l10n.ini
|
||||
@@ -9,17 +9,16 @@ all = browser/locales/all-locales
|
||||
[compare]
|
||||
dirs = browser
|
||||
other-licenses/branding/firefox
|
||||
browser/branding/official
|
||||
devtools/client
|
||||
devtools/startup
|
||||
browser/extensions/formautofill
|
||||
browser/extensions/fxmonitor
|
||||
- browser/extensions/report-site-issue
|
||||
|
||||
[includes]
|
||||
# non-central apps might want to use %(topsrcdir)s here, or other vars
|
||||
# RFE: that needs to be supported by compare-locales, too, though
|
||||
toolkit = toolkit/locales/l10n.ini
|
||||
services_sync = services/sync/locales/l10n.ini
|
||||
|
||||
[extras]
|
||||
diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
|
||||
--- a/browser/locales/l10n.toml
|
||||
+++ b/browser/locales/l10n.toml
|
||||
@@ -130,20 +130,16 @@ locales = [
|
||||
reference = "browser/extensions/formautofill/locales/en-US/**"
|
||||
l10n = "{l}browser/extensions/formautofill/**"
|
||||
|
||||
[[paths]]
|
||||
reference = "browser/extensions/fxmonitor/locales/en-US/**"
|
||||
l10n = "{l}browser/extensions/fxmonitor/**"
|
||||
|
||||
[[paths]]
|
||||
- reference = "browser/extensions/report-site-issue/locales/en-US/**"
|
||||
- l10n = "{l}browser/extensions/report-site-issue/**"
|
||||
-
|
||||
-[[paths]]
|
||||
reference = "services/sync/locales/en-US/**"
|
||||
l10n = "{l}services/sync/**"
|
||||
|
||||
|
||||
[[includes]]
|
||||
path = "toolkit/locales/l10n.toml"
|
||||
|
||||
[[includes]]
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc
|
||||
--- a/browser/base/content/browser-context.inc
|
||||
+++ b/browser/base/content/browser-context.inc
|
||||
@@ -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"
|
||||
data-l10n-id="main-context-menu-save-link"
|
||||
oncommand="gContextMenu.saveLink();"/>
|
||||
- <menuitem id="context-savelinktopocket"
|
||||
- data-l10n-id="main-context-menu-save-link-to-pocket"
|
||||
- oncommand= "Pocket.savePage(gContextMenu.browser, gContextMenu.linkURL);"/>
|
||||
<menuitem id="context-copyemail"
|
||||
data-l10n-id="main-context-menu-copy-email"
|
||||
oncommand="gContextMenu.copyEmail();"/>
|
||||
<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"
|
||||
data-l10n-id="main-context-menu-page-save"
|
||||
oncommand="gContextMenu.savePageAs();"/>
|
||||
- <menuitem id="context-pocket"
|
||||
- data-l10n-id="main-context-menu-save-to-pocket"
|
||||
- oncommand="Pocket.savePage(gContextMenu.browser, gContextMenu.browser.currentURI.spec, gContextMenu.browser.contentTitle);"/>
|
||||
<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">
|
||||
|
|
@ -1,245 +0,0 @@
|
|||
diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm
|
||||
--- a/browser/components/urlbar/UrlbarInput.jsm
|
||||
+++ b/browser/components/urlbar/UrlbarInput.jsm
|
||||
@@ -1699,23 +1699,23 @@ class UrlbarInput {
|
||||
this.removeAttribute("breakout-extend-disabled");
|
||||
}
|
||||
|
||||
this._toolbar.setAttribute("urlbar-exceeds-toolbar-bounds", "true");
|
||||
this.setAttribute("breakout-extend", "true");
|
||||
|
||||
// Enable the animation only after the first extend call to ensure it
|
||||
// doesn't run when opening a new window.
|
||||
- if (!this.hasAttribute("breakout-extend-animate")) {
|
||||
- this.window.promiseDocumentFlushed(() => {
|
||||
- this.window.requestAnimationFrame(() => {
|
||||
- this.setAttribute("breakout-extend-animate", "true");
|
||||
- });
|
||||
- });
|
||||
- }
|
||||
+// if (!this.hasAttribute("breakout-extend-animate")) {
|
||||
+// this.window.promiseDocumentFlushed(() => {
|
||||
+// this.window.requestAnimationFrame(() => {
|
||||
+// this.setAttribute("breakout-extend-animate", "true");
|
||||
+// });
|
||||
+// });
|
||||
+// }
|
||||
}
|
||||
|
||||
endLayoutExtend() {
|
||||
// If reduce motion is enabled, we want to collapse the Urlbar here so the
|
||||
// user sees only sees two states: not expanded, and expanded with the view
|
||||
// open.
|
||||
if (!this.hasAttribute("breakout-extend") || this.view.isOpen) {
|
||||
return;
|
||||
diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
--- a/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
|
||||
@@ -1,16 +1,16 @@
|
||||
%if 0
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
%endif
|
||||
|
||||
%define fieldHoverBorderColor hsla(240,5%,5%,.35)
|
||||
-%define urlbarMarginInline 5px
|
||||
+%define urlbarMarginInline 0px
|
||||
%define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
|
||||
|
||||
:root {
|
||||
--toolbar-field-border-color: hsla(240,5%,5%,.25);
|
||||
}
|
||||
|
||||
@media not (-moz-proton) {
|
||||
:root {
|
||||
@@ -268,50 +268,50 @@
|
||||
#urlbar[breakout][breakout-extend-disabled][open] {
|
||||
/* The z-index needs to be big enough to trump other positioned UI pieces
|
||||
that we want to overlay. 3 is used in the tab bar. */
|
||||
z-index: 3;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend] {
|
||||
- top: -@urlbarBreakoutExtend@;
|
||||
- left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@);
|
||||
- width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@);
|
||||
+ top: 0;
|
||||
+ left: 0;
|
||||
+ width: 100%;
|
||||
}
|
||||
|
||||
@media (-moz-proton) {
|
||||
#urlbar[breakout][breakout-extend] {
|
||||
top: 0;
|
||||
- left: -@urlbarMarginInline@;
|
||||
- width: calc(100% + 2 * @urlbarMarginInline@);
|
||||
+ left: 0;
|
||||
+ width: 100%;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
@media not (-moz-proton) {
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||
- box-shadow: 0 3px 8px 0 rgba(0,0,0,.15)
|
||||
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend][open] > #urlbar-background {
|
||||
- box-shadow: 0 5px 18px rgba(0,0,0,.2);
|
||||
+ box-shadow: 0 1px 4px rgba(0,0,0,.05);
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-input-container {
|
||||
- height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@);
|
||||
- padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2);
|
||||
- padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@);
|
||||
+ height: var(--urlbar-toolbar-height);
|
||||
+ padding-block: 0;
|
||||
+ padding-inline: 0;
|
||||
}
|
||||
|
||||
@media (-moz-proton) {
|
||||
#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 ***/
|
||||
|
||||
#urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button {
|
||||
fill: currentColor;
|
||||
fill-opacity: .6;
|
||||
}
|
||||
|
||||
@@ -320,17 +320,17 @@
|
||||
transform: scaleX(.99) scaleY(.95);
|
||||
}
|
||||
100% {
|
||||
transform: scale(1.0);
|
||||
}
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||
- animation-name: urlbar-grow;
|
||||
+ animation-name: none;
|
||||
animation-duration: 0s;
|
||||
animation-timing-function: var(--animation-easing-function);
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: no-preference) {
|
||||
#urlbar[breakout][breakout-extend][breakout-extend-animate] > #urlbar-background {
|
||||
animation-duration: 150ms;
|
||||
}
|
||||
diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css
|
||||
--- a/browser/themes/shared/urlbarView.inc.css
|
||||
+++ b/browser/themes/shared/urlbarView.inc.css
|
||||
@@ -82,26 +82,26 @@
|
||||
|
||||
.urlbarView {
|
||||
/* Don't handle window drag events in case we are overlapping a toolbar */
|
||||
-moz-window-dragging: no-drag;
|
||||
|
||||
display: block;
|
||||
text-shadow: none;
|
||||
overflow: clip;
|
||||
- margin-inline: calc(5px + var(--urlbar-container-padding));
|
||||
- width: calc(100% - 2 * (5px + var(--urlbar-container-padding)));
|
||||
+ margin-inline: 0;
|
||||
+ width: 100%
|
||||
/* Match urlbar-background's border. */
|
||||
border-inline: 1px solid transparent;
|
||||
}
|
||||
|
||||
@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. */
|
||||
#urlbar[open] > .urlbarView {
|
||||
margin-block-start: -@urlbarBreakoutExtend@;
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
|
||||
@@ -123,27 +123,27 @@
|
||||
padding-block: 0;
|
||||
}
|
||||
|
||||
.urlbarView-row {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
fill: currentColor;
|
||||
fill-opacity: .6;
|
||||
- padding-block: 3px;
|
||||
+ padding-block: 0px;
|
||||
}
|
||||
|
||||
:root[uidensity=compact] .urlbarView-row {
|
||||
padding-block: 2px;
|
||||
}
|
||||
|
||||
@media (-moz-proton) {
|
||||
:root:not([uidensity=compact]) .urlbarView-row:not([type=tip], [type=dynamic]) {
|
||||
- min-height: 32px;
|
||||
- padding-block: 4px;
|
||||
+ min-height: 0px; /* todo: check this */
|
||||
+ padding-block: 0px;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
.urlbarView-row-inner {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
@@ -288,16 +288,17 @@
|
||||
width: @urlbarViewFaviconWidth@;
|
||||
height: @urlbarViewFaviconWidth@;
|
||||
margin-inline-end: calc(@urlbarViewIconMarginEnd@);
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
object-fit: contain;
|
||||
flex-shrink: 0;
|
||||
-moz-context-properties: fill, fill-opacity;
|
||||
+ margin-inline-start: 20px;
|
||||
}
|
||||
|
||||
@media not (-moz-proton) {
|
||||
.urlbarView-favicon {
|
||||
/* 2px is from identity-block.inc.css */
|
||||
margin-inline-end: calc(var(--urlbar-icon-padding) / 2 + var(--identity-box-margin-inline) + 2px);
|
||||
}
|
||||
} /*** END !proton ***/
|
||||
@@ -321,20 +322,20 @@
|
||||
color: var(--urlbar-popup-url-color);
|
||||
-moz-context-properties: fill;
|
||||
}
|
||||
|
||||
/* Type icon */
|
||||
|
||||
.urlbarView-type-icon {
|
||||
position: absolute;
|
||||
- width: 12px;
|
||||
- height: 12px;
|
||||
- margin-bottom: -4px;
|
||||
- margin-inline-start: 8px;
|
||||
+ width: 16px;
|
||||
+ height: 16px;;
|
||||
+ margin-bottom: 0;
|
||||
+ margin-inline-start: 0;
|
||||
align-self: end;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
-moz-context-properties: fill, stroke;
|
||||
}
|
||||
|
||||
/* Favicon badges have this priority: pinned > bookmark. */
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
|
||||
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
|
||||
+++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html
|
||||
@@ -54,13 +54,10 @@
|
||||
<div class="info">
|
||||
<h1 id="info-title" data-l10n-id="about-private-browsing-info-title"></h1>
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="promo">
|
||||
- <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>
|
||||
</html>
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
|
||||
index 269dcb2..ed7c31d 100644
|
||||
--- a/browser/extensions/moz.build
|
||||
+++ b/browser/extensions/moz.build
|
||||
@@ -5,10 +5,7 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DIRS += [
|
||||
- "doh-rollout",
|
||||
"formautofill",
|
||||
"screenshots",
|
||||
- "webcompat",
|
||||
- "report-site-issue",
|
||||
"pictureinpicture",
|
||||
]
|
||||
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
|
||||
index 496379c..dd6f359 100644
|
||||
--- a/browser/locales/Makefile.in
|
||||
+++ b/browser/locales/Makefile.in
|
||||
@@ -61,7 +61,6 @@ l10n-%:
|
||||
ifneq (,$(wildcard ../extensions/formautofill/locales))
|
||||
@$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
endif
|
||||
- @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
|
||||
@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
||||
@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
|
||||
@$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
|
||||
@@ -82,7 +81,6 @@ endif
|
||||
@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
|
||||
@$(MAKE) chrome AB_CD=$*
|
||||
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
|
||||
- @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
|
||||
|
||||
package-win32-installer: $(SUBMAKEFILES)
|
||||
$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
|
||||
diff --git a/browser/locales/filter.py b/browser/locales/filter.py
|
||||
index bb2e992..7d7768e 100644
|
||||
--- a/browser/locales/filter.py
|
||||
+++ b/browser/locales/filter.py
|
||||
@@ -20,7 +20,6 @@ def test(mod, path, entity=None):
|
||||
"browser",
|
||||
"browser/extensions/formautofill",
|
||||
"browser/extensions/fxmonitor",
|
||||
- "browser/extensions/report-site-issue",
|
||||
"extensions/spellcheck",
|
||||
"other-licenses/branding/firefox",
|
||||
"browser/branding/official",
|
||||
diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini
|
||||
index f4cb7ca..4efac13 100644
|
||||
--- a/browser/locales/l10n.ini
|
||||
+++ b/browser/locales/l10n.ini
|
||||
@@ -14,7 +14,6 @@ dirs = browser
|
||||
devtools/startup
|
||||
browser/extensions/formautofill
|
||||
browser/extensions/fxmonitor
|
||||
- browser/extensions/report-site-issue
|
||||
|
||||
[includes]
|
||||
# non-central apps might want to use %(topsrcdir)s here, or other vars
|
||||
diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml
|
||||
index b9b18fe..af7c583 100644
|
||||
--- a/browser/locales/l10n.toml
|
||||
+++ b/browser/locales/l10n.toml
|
||||
@@ -133,10 +133,6 @@ locales = [
|
||||
reference = "browser/extensions/fxmonitor/locales/en-US/**"
|
||||
l10n = "{l}browser/extensions/fxmonitor/**"
|
||||
|
||||
-[[paths]]
|
||||
- reference = "browser/extensions/report-site-issue/locales/en-US/**"
|
||||
- l10n = "{l}browser/extensions/report-site-issue/**"
|
||||
-
|
||||
[[paths]]
|
||||
reference = "services/sync/locales/en-US/**"
|
||||
l10n = "{l}services/sync/**"
|
||||
Loading…
Reference in New Issue