diff --git a/configs/common/mozconfig b/configs/common/mozconfig index eecd57555..e0c2d039e 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -4,7 +4,7 @@ ac_add_options --with-app-basename=Zen ac_add_options --enable-official-branding # Multi-locale -ac_add_options --with-l10n-base="$PWD/l10n" +ac_add_options --with-l10n-base="$PWD/../l10n" export MOZ_USER_DIR="${name}" export MOZ_APP_BASENAME=Zen diff --git a/l10n b/l10n index 5d35c55e3..cf95cf658 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit 5d35c55e34b835984369206a60d8bf31ce15b34d +Subproject commit cf95cf658aefe54917246058ba36aabaaef13b2f diff --git a/package.json b/package.json index 5b193bc38..be1471ad9 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,6 @@ }, "homepage": "https://github.com/zen-browser/core#readme", "dependencies": { - "@zen-browser/surfer": "^1.2.18" + "@zen-browser/surfer": "^1.3.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 767d02c00..216f5b429 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@zen-browser/surfer': - specifier: ^1.2.18 - version: 1.2.18 + specifier: ^1.3.0 + version: 1.3.0 packages: @@ -109,8 +109,8 @@ packages: '@types/node@17.0.45': resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} - '@zen-browser/surfer@1.2.18': - resolution: {integrity: sha512-D20+E9iiVtG/TrIKPznVgUdrRyLlT6fYCbWcOQWaKDbc58ynuI7GSZt8NXJrRrtjqGnh4mYiuh9HnnThfGWt+w==} + '@zen-browser/surfer@1.3.0': + resolution: {integrity: sha512-emRtG9HdDn09r5iZLQcjDB8k0wv2Mc56lnofHbkNGHwGa/FiAONFc8w/LcRf5Wqmvqgbys8ZDM3wkQ/MLDinhA==} hasBin: true ansi-regex@5.0.1: @@ -786,7 +786,7 @@ snapshots: '@types/node@17.0.45': {} - '@zen-browser/surfer@1.2.18': + '@zen-browser/surfer@1.3.0': dependencies: '@resvg/resvg-js': 1.4.0 async-icns: 1.0.2 diff --git a/scripts/download-language-packs.sh b/scripts/download-language-packs.sh new file mode 100644 index 000000000..34e2bc0a5 --- /dev/null +++ b/scripts/download-language-packs.sh @@ -0,0 +1,40 @@ + +CURRENT_DIR=$(pwd) + +git config --global init.defaultBranch main +git config --global fetch.prune true + +mkdir ~/tools +cd ~/tools +git clone https://github.com/glandium/git-cinnabar.git +cd git-cinnabar +git checkout 0.5.11 +export PATH=~/tools/git-cinnabar:$PATH +cd ~ +git cinnabar download +cd $CURRENT_DIR + +update_language() { + langId=$1 + cd l10n + cd $langId + + echo "Updating $langId" + + git init + git remote add upstream hg://hg.mozilla.org/l10n-central/$langId + git remote set-url upstream hg://hg.mozilla.org/l10n-central/$langId + git pull upstream branches/default/tip + + cd $CURRENT_DIR +} + +export PATH=~/tools/git-cinnabar:$PATH +for lang in $(cat ./l10n/supported-languages); do + update_language $lang +done +cd $CURRENT_DIR + +echo "Cleaning up" +rm -rf ~/tools +rm -rf ~/.git-cinnabar diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components index 5d5a70608..bbc9e79c2 160000 --- a/src/browser/base/content/zen-components +++ b/src/browser/base/content/zen-components @@ -1 +1 @@ -Subproject commit 5d5a706087f1c61ddfdc577250bd43cda83bd526 +Subproject commit bbc9e79c2afa97f833762b1eb8ba61ca1fa19aac diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css index e8738667b..dc70ab2a0 100644 --- a/src/browser/base/content/zen-styles/zen-compact-mode.css +++ b/src/browser/base/content/zen-styles/zen-compact-mode.css @@ -17,7 +17,7 @@ position: absolute; display: block; transition: 200ms ease-in-out !important; - transform: translateX(calc(-100% + var(--zen-compact-toolbox-margin-single) + 2px)); + transform: translateX(calc(-100% + (var(--zen-compact-toolbox-margin-single) / 2))); opacity: 0; line-height: 0; z-index: 1;