diff --git a/application/basilisk/base/content/tabbrowser.css b/application/basilisk/base/content/tabbrowser.css
index 2d9b7dd903..9085304f6c 100644
--- a/application/basilisk/base/content/tabbrowser.css
+++ b/application/basilisk/base/content/tabbrowser.css
@@ -39,24 +39,12 @@
display: -moz-box;
}
-.tab-label {
- white-space: nowrap;
-}
-
-.tab-label-container {
- overflow: hidden;
-}
-
-.tab-label-container[pinned] {
+.tab-label[pinned] {
width: 0;
-}
-
-.tab-label-container[textoverflow]:not([pinned]) {
- mask-image: linear-gradient(to left, transparent, black 1em);
-}
-
-.tab-label-container[textoverflow]:not([pinned]):-moz-locale-dir(rtl) {
- mask-image: linear-gradient(to right, transparent, black 1em);
+ margin-left: 0 !important;
+ margin-right: 0 !important;
+ padding-left: 0 !important;
+ padding-right: 0 !important;
}
.tab-stack {
diff --git a/application/basilisk/base/content/tabbrowser.xml b/application/basilisk/base/content/tabbrowser.xml
index 9b4743a541..973415935c 100644
--- a/application/basilisk/base/content/tabbrowser.xml
+++ b/application/basilisk/base/content/tabbrowser.xml
@@ -1400,7 +1400,8 @@
@@ -1410,6 +1411,7 @@
-
-
-
+
.toolbarbutton-menu-dropmarker {
.tab-label {
margin-top: 1px;
margin-bottom: 0;
- -moz-box-flex: 1;
text-align: center;
}
@@ -2504,7 +2503,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
opacity: 0.9999;
}
-.tab-label-container:not([selected="true"]) {
+.tab-label:not([selected="true"]) {
opacity: .7;
}
@@ -2530,7 +2529,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
border-width: 0 11px;
}
-.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label-container:not([pinned]),
+.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label:not([pinned]),
.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-icon-image[pinned],
.tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-throbber[pinned] {
box-shadow: @focusRingShadow@;
diff --git a/application/basilisk/themes/shared/tabs.inc.css b/application/basilisk/themes/shared/tabs.inc.css
index a69e9f4d58..c505416e46 100644
--- a/application/basilisk/themes/shared/tabs.inc.css
+++ b/application/basilisk/themes/shared/tabs.inc.css
@@ -192,7 +192,7 @@
}
.tab-close-button {
- margin-inline-start: 2px;
+ margin-inline-start: 4px;
margin-inline-end: -2px;
padding: 0;
}
diff --git a/application/palemoon/branding/shared/branding.mozbuild b/application/palemoon/branding/shared/branding.mozbuild
index 17f07636e4..70da54d2b3 100644
--- a/application/palemoon/branding/shared/branding.mozbuild
+++ b/application/palemoon/branding/shared/branding.mozbuild
@@ -47,4 +47,4 @@ def ApplicationBranding():
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY']
DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U']
- DEFINES['MOZILLA_COMPATVERSION_U'] = "68.9"
+ DEFINES['MOZILLA_COMPATVERSION_U'] = "102.0"
diff --git a/application/palemoon/branding/shared/pref/uaoverrides.inc b/application/palemoon/branding/shared/pref/uaoverrides.inc
index ae541965e7..415a524fda 100644
--- a/application/palemoon/branding/shared/pref/uaoverrides.inc
+++ b/application/palemoon/branding/shared/pref/uaoverrides.inc
@@ -23,6 +23,7 @@ pref("@GUAO_PREF@.aol.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@
pref("@GUAO_PREF@.bing.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
pref("@GUAO_PREF@.chase.com","Mozilla/5.0 (%OS_SLICE% rv:79.0) @GK_SLICE@ Firefox/79.0");
pref("@GUAO_PREF@.dropbox.com","Mozilla/5.0 (%OS_SLICE% rv:68.9) @GK_SLICE@ Firefox/68.9 (Pale Moon)");
+pref("@GUAO_PREF@.instagram.com","Mozilla/5.0 (%OS_SLICE% rv:68.0) @GK_SLICE@ Firefox/68.0");
pref("@GUAO_PREF@.kroger.com","Mozilla/5.0 (%OS_SLICE% rv:86.0) @GK_SLICE@ Firefox/86.0 (Pale Moon)");
pref("@GUAO_PREF@.live.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
pref("@GUAO_PREF@.msn.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ (Pale Moon)");
diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp
index 338d21291e..26fa18df99 100644
--- a/dom/base/nsImageLoadingContent.cpp
+++ b/dom/base/nsImageLoadingContent.cpp
@@ -1431,13 +1431,15 @@ nsImageLoadingContent::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
bool aCompileEventHandlers)
{
// We may be getting connected and our image should be tracked.
- if (GetOurCurrentDoc()) {
- TrackImage(mCurrentRequest);
- TrackImage(mPendingRequest);
- }
+ nsCOMPtr doc = GetOurCurrentDoc();
+ if (!doc)
+ return;
+
+ TrackImage(mCurrentRequest);
+ TrackImage(mPendingRequest);
if (mCurrentRequestFlags & REQUEST_BLOCKS_ONLOAD)
- aDocument->BlockOnload();
+ doc->BlockOnload();
}
void