diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index b681f923d..348cc7959 100644 --- a/.github/workflows/alpha.yml +++ b/.github/workflows/alpha.yml @@ -288,7 +288,6 @@ jobs: sudo apt install -y msitools python3-pip ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022 - chmod -R +x "$(echo ~)/win-cross/vs2022" || true cat ../.github/workflows/src/windows_mozconfig >> ../configs/common/mozconfig @@ -303,7 +302,6 @@ jobs: cat ../configs/common/mozconfig ls ~/win-cross/wine || true - ls ~/win-cross/vs2022 || true - name: setup Rust run: | @@ -322,6 +320,14 @@ jobs: - name: Import run: pnpm surfer import --verbose + - name: Setup vs2022 and PGO + run: | + cd engine/ + export GEN_PGO=1 + ./mach python --virtualenv build ./taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml $HOME/win-cross + ls ~/win-cross/vs2022 || true + chmod -R +x "$(echo ~)/win-cross/vs2022" || true + - name: Build run: | unset SURFER_PLATFORM diff --git a/.github/workflows/src/alpha-build.sh b/.github/workflows/src/alpha-build.sh index e0c6a20f9..d9f09a335 100644 --- a/.github/workflows/src/alpha-build.sh +++ b/.github/workflows/src/alpha-build.sh @@ -6,6 +6,7 @@ then echo "xvfb-run could not be found, running without it" pnpm build else + export LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata export DISPLAY=:2 xvfb-run -s "-screen 0 1920x1080x24 -nolisten local" pnpm build fi diff --git a/.github/workflows/src/windows_mozconfig b/.github/workflows/src/windows_mozconfig index 968f34933..c73d94694 100644 --- a/.github/workflows/src/windows_mozconfig +++ b/.github/workflows/src/windows_mozconfig @@ -21,6 +21,8 @@ export MOZ_INCLUDE_SOURCE_INFO=1 export MOZ_STUB_INSTALLER=1 export WINEDEBUG=-all export WINE="$TOOLS/wine/bin/wine64" +export WIN32_REDIST_DIR="$TOOLS"/VC/Redist/MSVC/14.34.31931/x64/Microsoft.VC143.CRT +export WIN_UCRT_REDIST_DIR="$TOOLS/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/x64" export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64" diff --git a/src/browser/themes/shared/identity-block/identity-block-css.patch b/src/browser/themes/shared/identity-block/identity-block-css.patch index 065a3df50..ad53cd32a 100644 --- a/src/browser/themes/shared/identity-block/identity-block-css.patch +++ b/src/browser/themes/shared/identity-block/identity-block-css.patch @@ -1,5 +1,5 @@ diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css -index 39ae2b00791a7bfd875961de60736612f08892ae..03fe5e42f34ad985f0e04ef46b834a9d223585ee 100644 +index 39ae2b00791a7bfd875961de60736612f08892ae..5d950d855a5625ebfb20f6f49a65f3e1e2eb4a6e 100644 --- a/browser/themes/shared/identity-block/identity-block.css +++ b/browser/themes/shared/identity-block/identity-block.css @@ -64,8 +64,9 @@ @@ -9,7 +9,7 @@ index 39ae2b00791a7bfd875961de60736612f08892ae..03fe5e42f34ad985f0e04ef46b834a9d +#identity-box[pageproxystate="valid"] > .identity-box-button, #urlbar-label-box { - background-color: var(--urlbar-box-bgcolor); -+ background-color: light-dark(white, rgb(66, 65, 77)); ++ background-color: light-dark(#cecece, rgb(66, 65, 77)); color: var(--urlbar-box-text-color); padding-inline: 8px; border-radius: var(--urlbar-icon-border-radius); diff --git a/src/toolkit/content/zen-xul.css b/src/toolkit/content/zen-xul.css index fcebf6ad5..a1a0928e2 100644 --- a/src/toolkit/content/zen-xul.css +++ b/src/toolkit/content/zen-xul.css @@ -45,6 +45,10 @@ panel[type="arrow"][animate][animate="open"] { animation: zen-jello-animation 0.2s ease-in-out; } +panel[type="arrow"][animate][animate="cancel"] { + animation: zen-jello-out-animation 0.2s ease-in-out; +} + @keyframes zen-jello-animation { 0% { transform: scale3d(0.8, 0.8, 0.8); diff --git a/src/toolkit/themes/shared/in-content/zen-common-shared.css b/src/toolkit/themes/shared/in-content/zen-common-shared.css index c598b71cd..45a0515da 100644 --- a/src/toolkit/themes/shared/in-content/zen-common-shared.css +++ b/src/toolkit/themes/shared/in-content/zen-common-shared.css @@ -25,7 +25,7 @@ --zen-colors-hover-bg: color-mix(in srgb, var(--zen-primary-color) 90%, white 10%); --zen-colors-primary-foreground: color-mix(in srgb, var(--zen-primary-color) 80%, black 20%); - --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 70%, black 30%); + --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 90%, black 10%); --zen-colors-input-bg: color-mix(in srgb, var(--zen-primary-color) 10%, white 80%); @@ -74,7 +74,7 @@ --in-content-page-background: var(--zen-colors-tertiary) !important; --zen-in-content-dialog-background: var(--zen-colors-tertiary); - --zen-button-border-radius: 6px; + --zen-button-border-radius: 8px; --zen-button-padding: .6rem 1.2rem; /* Other colors */