parent
240c297fb8
commit
f4f466962c
|
@ -36,50 +36,16 @@ index e80aaf6..6ec0961 100644
|
|||
%define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding))
|
||||
|
||||
:root {
|
||||
@@ -279,40 +279,40 @@
|
||||
}
|
||||
@@ -246,14 +246,14 @@
|
||||
|
||||
#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);
|
||||
+ width: 100;
|
||||
}
|
||||
|
||||
#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));
|
||||
|
@ -87,9 +53,9 @@ index e80aaf6..6ec0961 100644
|
|||
+ padding-block: 0;
|
||||
+ padding-inline: 0;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
@@ -331,7 +331,7 @@
|
||||
#urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button {
|
||||
@@ -271,7 +271,7 @@
|
||||
}
|
||||
|
||||
#urlbar[breakout][breakout-extend] > #urlbar-background {
|
||||
|
@ -102,7 +68,7 @@ diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/ur
|
|||
index d2bb269..0d47466 100644
|
||||
--- a/browser/themes/shared/urlbarView.inc.css
|
||||
+++ b/browser/themes/shared/urlbarView.inc.css
|
||||
@@ -73,16 +73,16 @@
|
||||
@@ -56,8 +56,8 @@
|
||||
display: block;
|
||||
text-shadow: none;
|
||||
overflow: clip;
|
||||
|
@ -113,43 +79,29 @@ index d2bb269..0d47466 100644
|
|||
/* 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. */
|
||||
@@ -112,7 +112,7 @@
|
||||
@@ -83,11 +83,11 @@
|
||||
.urlbarView-row {
|
||||
fill: currentColor;
|
||||
fill-opacity: var(--urlbar-icon-fill-opacity);
|
||||
- padding-block: 3px;
|
||||
+ padding-block: 0;
|
||||
- padding-block: 2px;
|
||||
+ padding-block: 0px;
|
||||
}
|
||||
|
||||
@media not (-moz-proton) {
|
||||
@@ -127,7 +127,7 @@
|
||||
}
|
||||
|
||||
|
||||
:root:not([uidensity=compact]) .urlbarView-row:not([type=tip], [type=dynamic]) {
|
||||
- min-height: 32px;
|
||||
+ min-height: 0;
|
||||
+ min-height: 0px;
|
||||
}
|
||||
} /*** END proton ***/
|
||||
|
||||
@@ -295,6 +295,7 @@
|
||||
:root[uidensity=touch] .urlbarView-row:not([type=tip], [type=dynamic]) {
|
||||
@@ -241,6 +241,7 @@
|
||||
object-fit: contain;
|
||||
flex-shrink: 0;
|
||||
-moz-context-properties: fill, fill-opacity;
|
||||
+ margin-inline-start: 20px;
|
||||
}
|
||||
|
||||
@media not (-moz-proton) {
|
||||
@@ -328,10 +329,10 @@
|
||||
|
||||
@@ -268,10 +269,10 @@
|
||||
|
||||
.urlbarView-type-icon {
|
||||
position: absolute;
|
||||
|
@ -159,8 +111,9 @@ index d2bb269..0d47466 100644
|
|||
- margin-inline-start: 8px;
|
||||
+ width: 16px;
|
||||
+ height: 16px;
|
||||
+ margin-bottom: 0;
|
||||
+ margin-inline-start: 0;
|
||||
+ margin-bottom: 0px;
|
||||
+ margin-inline-start: 0px;
|
||||
align-self: end;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ 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 @@
|
||||
@@ -5,11 +5,8 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DIRS += [
|
||||
|
@ -13,6 +13,7 @@ index 269dcb2..ed7c31d 100644
|
|||
- "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
|
||||
|
@ -37,10 +38,10 @@ 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):
|
||||
@@ -19,7 +19,6 @@
|
||||
"devtools/startup",
|
||||
"browser",
|
||||
"browser/extensions/formautofill",
|
||||
"browser/extensions/fxmonitor",
|
||||
- "browser/extensions/report-site-issue",
|
||||
"extensions/spellcheck",
|
||||
"other-licenses/branding/firefox",
|
||||
|
@ -49,10 +50,10 @@ 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
|
||||
@@ -13,7 +13,6 @@
|
||||
devtools/client
|
||||
devtools/startup
|
||||
browser/extensions/formautofill
|
||||
browser/extensions/fxmonitor
|
||||
- browser/extensions/report-site-issue
|
||||
|
||||
[includes]
|
||||
|
@ -61,14 +62,13 @@ 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/**"
|
||||
@@ -132,10 +132,6 @@
|
||||
l10n = "{l}browser/extensions/formautofill/**"
|
||||
|
||||
-[[paths]]
|
||||
[[paths]]
|
||||
- reference = "browser/extensions/report-site-issue/locales/en-US/**"
|
||||
- l10n = "{l}browser/extensions/report-site-issue/**"
|
||||
-
|
||||
[[paths]]
|
||||
-[[paths]]
|
||||
reference = "services/sync/locales/en-US/**"
|
||||
l10n = "{l}services/sync/**"
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -28,15 +28,15 @@ diff --git a/services/settings/Utils.jsm b/services/settings/Utils.jsm
|
|||
index 66df850904..1538a2ff0d 100644
|
||||
--- a/services/settings/Utils.jsm
|
||||
+++ b/services/settings/Utils.jsm
|
||||
@@ -60,7 +60,7 @@ var Utils = {
|
||||
);
|
||||
const isXpcshell = env.exists("XPCSHELL_TEST_PROFILE_DIR");
|
||||
return AppConstants.RELEASE_OR_BETA && !Cu.isInAutomation && !isXpcshell
|
||||
@@ -64,7 +64,7 @@
|
||||
!Cu.isInAutomation &&
|
||||
!isXpcshell &&
|
||||
isNotThunderbird
|
||||
- ? "https://firefox.settings.services.mozilla.com/v1"
|
||||
+ ? "https://f.s.s.m.c.qjz9zk/v1"
|
||||
: gServerURL;
|
||||
},
|
||||
|
||||
|
||||
diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm
|
||||
index 8a3c6acb84..7408b3fd2f 100644
|
||||
--- a/toolkit/components/search/SearchUtils.jsm
|
||||
|
|
Loading…
Reference in New Issue