From 15e3a38b55a8f7fe39c5c36fdf7f7d85d84fa77b Mon Sep 17 00:00:00 2001 From: roytam1 Date: Wed, 8 Mar 2023 07:04:59 +0800 Subject: [PATCH 1/4] Revert "[Basilisk] Fade out tab label on overflow instead of ellipsis" This reverts commit 89dd425fd22a6cbbbbef2d2b47e2a4bc9fc14fc3. upstream reverted this commit. --- .../basilisk/base/content/tabbrowser.css | 22 +++--------- .../basilisk/base/content/tabbrowser.xml | 36 +++++++++---------- application/basilisk/themes/osx/browser.css | 5 ++- .../basilisk/themes/shared/tabs.inc.css | 2 +- 4 files changed, 25 insertions(+), 40 deletions(-) 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 bce2c06d8f..fec7c9ecca 100644 --- a/application/basilisk/base/content/tabbrowser.xml +++ b/application/basilisk/base/content/tabbrowser.xml @@ -1397,7 +1397,8 @@ @@ -1407,6 +1408,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; } From cfef3fa48769007c86a0e19248aacf72c27f146f Mon Sep 17 00:00:00 2001 From: FranklinDM Date: Wed, 8 Mar 2023 12:08:39 +0800 Subject: [PATCH 2/4] Issue #2135 - Follow-up: Ensure document is not null in nsImageLoadingContent::BindToTree --- dom/base/nsImageLoadingContent.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 From 5a627b6ce44d231c7a1f050de9f9083b366d7755 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 2 Mar 2023 11:44:12 +0100 Subject: [PATCH 3/4] [Pale-Moon] Set compatversion for hardcoded overrides to 102.0 --- application/palemoon/branding/shared/branding.mozbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/palemoon/branding/shared/branding.mozbuild b/application/palemoon/branding/shared/branding.mozbuild index e253620d27..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'] = "52.9" + DEFINES['MOZILLA_COMPATVERSION_U'] = "102.0" From c8488397e92ed19e4653da2b43aded9500f9ed38 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 2 Mar 2023 13:35:24 +0100 Subject: [PATCH 4/4] [Pale-Moon] Issue #1915 - [SSUAO] Add override for Instagram Resolves #1915 --- application/palemoon/branding/shared/pref/uaoverrides.inc | 1 + 1 file changed, 1 insertion(+) 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)");