This commit is contained in:
mauro 🤙
2024-09-05 11:48:33 +00:00
19 changed files with 241 additions and 345 deletions

View File

@@ -127,17 +127,20 @@ jobs:
p12-file-base64: ${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }}
p12-password: ${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }}
- name: Sign to .app 🖋️
- name: Decode .p12 file
id: decode_p12
run: |
ls engine
ls engine/obj-${{ matrix.arch == 'x64' && 'x86_64' || 'aarch64' }}-apple-darwin
ls engine/obj-${{ matrix.arch == 'x64' && 'x86_64' || 'aarch64' }}-apple-darwin/dist
chmod +x ./build/codesign/sign.bash
./build/codesign/sign.bash \
-a "./engine/obj-${{ matrix.arch == 'x64' && 'x86_64' || 'aarch64' }}-apple-darwin/dist/Zen Browser.app" \
-i "${{ secrets.macOS_AppleDeveloperId }}" \
-b "./build/codesign/browser.developer.entitlements.xml" \
-p "./build/codesign/plugin-container.developer.entitlements.xml"
echo "$P12_BASE64" | base64 --decode > certificate.p12
echo "$P12_PASSWORD" > certificate.p12.password
env:
P12_BASE64: ${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }}
P12_PASSWORD: ${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }}
- name: Install rcodesign
run: |
cargo install --git https://github.com/indygreg/apple-platform-rs --branch main --bin rcodesign apple-codesign
export PATH="$HOME/.cargo/bin:$PATH"
- name: Package
env:
@@ -149,6 +152,9 @@ jobs:
mv ./dist/*.dmg "zen.macos-${{ matrix.arch }}.dmg"
mv ./dist/output.mar macos-${{ matrix.arch }}.mar
rm -rf certificate.p12
rm -rf certificate.p12.password
- name: Sign to .dmg
run: |
codesign -s "${{ secrets.macOS_AppleDeveloperId }}" zen.macos-${{ matrix.arch }}.dmg

View File

@@ -13,6 +13,7 @@ Experience tranquillity while browsing the web without people tracking you!
* [Download](https://www.zen-browser.app/download)
* [Release Notes](https://www.zen-browser.app/release-notes/latest)
[![Downloads](https://img.shields.io/github/downloads/zen-browser/desktop/total.svg)](https://github.com/zen-browser/desktop/releases)
[![Crowdin](https://badges.crowdin.net/zen-browser/localized.svg)](https://crowdin.com/project/zen-browser)
[![Flathub](https://flathub.org/api/badge?locale=en)](https://flathub.org/apps/io.github.zen_browser.zen)

View File

@@ -1,155 +0,0 @@
#!/bin/bash
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at https://mozilla.org/MPL/2.0/.
#
# Runs codesign commands to codesign a Firefox .app bundle and enable macOS
# Hardened Runtime. Intended to be manually run by developers working on macOS
# 10.14+ who want to enable Hardened Runtime for manual testing. This is
# provided as a stop-gap until automated build tooling is available that signs
# binaries with a certificate generated during builds (bug 1522409). This
# script requires macOS 10.14 because Hardened Runtime is only available for
# applications running on 10.14 despite support for the codesign "-o runtime"
# option being available in 10.13.6 and newer.
#
# The script requires an identity string (-i option) from an Apple Developer
# ID certificate. This can be found in the macOS KeyChain after configuring an
# Apple Developer ID certificate.
#
# Example usage on macOS 10.14:
#
# $ ./mach build
# $ ./mach build package
# $ open </PATH/TO/DMG/FILE.dmg>
# <Drag Nightly.app to ~>
# $ ./security/mac/hardenedruntime/codesign.bash \
# -a ~/Nightly.app \
# -i <MY-IDENTITY-STRING> \
# -b security/mac/hardenedruntime/browser.developer.entitlements.xml
# -p security/mac/hardenedruntime/plugin-container.developer.entitlements.xml
# $ open ~/Nightly.app
#
set -x
usage ()
{
echo "Usage: $0 "
echo " -a <PATH-TO-BROWSER.app>"
echo " -i <IDENTITY>"
echo " -b <ENTITLEMENTS-FILE>"
echo " -p <CHILD-ENTITLEMENTS-FILE>"
echo " [-o <OUTPUT-DMG-FILE>]"
exit -1
}
# Make sure we are running on macOS with the sw_vers command available.
SWVERS=/usr/bin/sw_vers
if [ ! -x ${SWVERS} ]; then
echo "ERROR: macOS 10.14 or later is required"
exit -1
fi
# Require macOS 10.14 or newer.
OSVERSION=`${SWVERS} -productVersion|sed -En 's/[0-9]+\.([0-9]+)\.[0-9]+/\1/p'`;
if [ ${OSVERSION} \< 14 ]; then
echo "ERROR: macOS 10.14 or later is required"
exit -1
fi
while getopts "a:i:b:o:p:" opt; do
case ${opt} in
a ) BUNDLE=$OPTARG ;;
i ) IDENTITY=$OPTARG ;;
b ) BROWSER_ENTITLEMENTS_FILE=$OPTARG ;;
p ) PLUGINCONTAINER_ENTITLEMENTS_FILE=$OPTARG ;;
o ) OUTPUT_DMG_FILE=$OPTARG ;;
\? ) usage; exit -1 ;;
esac
done
if [ -z "${BUNDLE}" ] ||
[ -z "${IDENTITY}" ] ||
[ -z "${PLUGINCONTAINER_ENTITLEMENTS_FILE}" ] ||
[ -z "${BROWSER_ENTITLEMENTS_FILE}" ]; then
usage
exit -1
fi
if [ ! -d "${BUNDLE}" ]; then
echo "Invalid bundle. Bundle should be a .app directory"
usage
exit -1
fi
if [ ! -e "${PLUGINCONTAINER_ENTITLEMENTS_FILE}" ]; then
echo "Invalid entitlements file"
usage
exit -1
fi
if [ ! -e "${BROWSER_ENTITLEMENTS_FILE}" ]; then
echo "Invalid entitlements file"
usage
exit -1
fi
# DMG file output flag is optional
if [ ! -z "${OUTPUT_DMG_FILE}" ] &&
[ -e "${OUTPUT_DMG_FILE}" ]; then
echo "Output dmg file ${OUTPUT_DMG_FILE} exists. Please delete it first."
usage
exit -1
fi
echo "-------------------------------------------------------------------------"
echo "bundle: $BUNDLE"
echo "identity: $IDENTITY"
echo "browser entitlements file: $BROWSER_ENTITLEMENTS_FILE"
echo "plugin-container entitlements file: $PLUGINCONTAINER_ENTITLEMENTS_FILE"
echo "output dmg file (optional): $OUTPUT_DMG_FILE"
echo "-------------------------------------------------------------------------"
# Clear extended attributes which cause codesign to fail
xattr -cr "${BUNDLE}"
# Sign these binaries first. Signing of some binaries has an ordering
# requirement where other binaries must be signed first.
codesign --force -o runtime --verbose --sign "$IDENTITY" \
"${BUNDLE}/Contents/Library/LaunchServices/org.mozilla.updater" \
"${BUNDLE}/Contents/MacOS/XUL" \
"${BUNDLE}/Contents/MacOS/pingsender" \
"${BUNDLE}/Contents/MacOS/minidump-analyzer" \
"${BUNDLE}/Contents/MacOS/*.dylib" \
codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
"${BUNDLE}"/Contents/MacOS/crashreporter.app
codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
"${BUNDLE}"/Contents/MacOS/updater.app
# Sign zen main executable
codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
--entitlements ${BROWSER_ENTITLEMENTS_FILE} \
"${BUNDLE}"/Contents/MacOS/zen
# Sign Library/LaunchServices
codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
"${BUNDLE}"/Contents/Library/LaunchServices/org.mozilla.updater
# Sign gmp-clearkey files
find "${BUNDLE}"/Contents/Resources/gmp-clearkey -type f -exec \
codesign --force -o runtime --verbose --sign "$IDENTITY" {} \;
# Sign the main bundle
codesign --force -o runtime --verbose --sign "$IDENTITY" \
--entitlements ${BROWSER_ENTITLEMENTS_FILE} "${BUNDLE}"
# Sign the plugin-container bundle with deep
codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
--entitlements ${PLUGINCONTAINER_ENTITLEMENTS_FILE} \
"${BUNDLE}"/Contents/MacOS/plugin-container.app
# Validate
codesign -vvv --verbose=4 --deep "${BUNDLE}"

2
l10n

Submodule l10n updated: ce59592742...c4bb278c97

View File

@@ -27,6 +27,6 @@
},
"homepage": "https://github.com/zen-browser/core#readme",
"dependencies": {
"@zen-browser/surfer": "^1.3.6"
"@zen-browser/surfer": "^1.3.7"
}
}

10
pnpm-lock.yaml generated
View File

@@ -9,8 +9,8 @@ importers:
.:
dependencies:
'@zen-browser/surfer':
specifier: ^1.3.6
version: 1.3.6
specifier: ^1.3.7
version: 1.3.7
packages:
@@ -109,8 +109,8 @@ packages:
'@types/node@17.0.45':
resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
'@zen-browser/surfer@1.3.6':
resolution: {integrity: sha512-b+5GS9qMGoMB8lRaFYRA9C3EqntVf35sBx5dq7X3IuqlB9GmarYoS5E26EvXbmPJcfYkJG7ar05nHkkZyOrGuw==}
'@zen-browser/surfer@1.3.7':
resolution: {integrity: sha512-AZEk/xvmRhYUR6gpDPL/liv+b+BZ79mnGopP6cisrJ5Dl55m4EN3ZxAqVz6+IO2njLAfLBN99MxJlQ0ZPJTZpA==}
hasBin: true
ansi-regex@5.0.1:
@@ -786,7 +786,7 @@ snapshots:
'@types/node@17.0.45': {}
'@zen-browser/surfer@1.3.6':
'@zen-browser/surfer@1.3.7':
dependencies:
'@resvg/resvg-js': 1.4.0
async-icns: 1.0.2

View File

@@ -6,14 +6,10 @@ 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
cd ./l10n
git clone https://github.com/mozilla-l10n/firefox-l10n
cd $CURRENT_DIR
update_language() {
@@ -22,12 +18,8 @@ update_language() {
cd $langId
echo "Updating $langId"
rm -rf .git
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
# move the contents from ../firefox-l10n/$langId to ./l10n/$langId
rsync -av --progress ../firefox-l10n/$langId/ . --exclude .git
cd $CURRENT_DIR
}
@@ -55,3 +47,5 @@ for lang in $(cat ./l10n/supported-languages); do
# remove every file except if it starts with "zen"
find ./l10n/$lang -type f -not -name "zen*" -delete
done
rm -rf ./l10n/firefox-l10n

View File

@@ -56,8 +56,15 @@ var ZenStartup = {
tabs.style.maxHeight = '0px'; // reset to 0
const toolbarRect = toolbarItems.getBoundingClientRect();
// -5 for the controls padding
tabs.style.maxHeight = toolbarRect.height - 5 + "px";
console.info("ZenThemeModifier: set tabs max-height to", toolbarRect.height + "px");
let totalHeight = toolbarRect.height - 15;
// remove the height from other elements that aren't hidden
const otherElements = document.querySelectorAll("#tabbrowser-tabs > *:not([hidden=\"true\"])");
for (let tab of otherElements) {
if (tabs === tab) continue;
totalHeight -= tab.getBoundingClientRect().height;
}
tabs.style.maxHeight = totalHeight + "px";
console.info("ZenThemeModifier: set tabs max-height to", totalHeight + "px");
},
openWatermark() {

View File

@@ -8,6 +8,7 @@
#navigator-toolbox {
/* see issue #426 */
background: var(--zen-navigator-toolbox-background, transparent) !important;
--inactive-titlebar-opacity: 1;
}
#browser {

View File

@@ -20,7 +20,7 @@
transform: translateX(calc(-100% + (var(--zen-compact-toolbox-margin-single) / 2)));
opacity: 0;
line-height: 0;
z-index: 1;
z-index: 2;
height: 100%;
margin: 0;
padding: var(--zen-compact-toolbox-margin) !important;

View File

@@ -79,7 +79,7 @@
#zen-sidebar-web-panel {
border-radius: var(--zen-panel-radius);
overflow: hidden;
border: var(--zen-appcontent-border);
box-shadow: 0 0 0 1px var(--zen-colors-border);
background: var(--zen-colors-tertiary);
opacity: 0;
animation-delay: 0.1s;
@@ -140,7 +140,7 @@
}
#zen-sidebar-web-panel-wrapper {
margin: 0 10px 10px 0;
margin: 0 var(--zen-element-separation) var(--zen-element-separation) 1px;
}
#zen-sidebar-web-panel[pinned="true"] {

View File

@@ -6,6 +6,13 @@
#vertical-pinned-tabs-container {
padding-inline-end: 0 !important;
max-height: unset !important;
overflow: visible !important;
gap: 4px;
& .tabbrowser-tab:not(:hover):not([selected]):not([multiselected]) {
background: color-mix(in srgb, var(--zen-colors-secondary) 20%, transparent 80%);
}
}
#tabs-newtab-button {
@@ -22,7 +29,19 @@
--zen-sidebar-action-button-width: 35px;
& #vertical-tabs-newtab-button {
background: var(--button-hover-bgcolor);
background: color-mix(in srgb, var(--button-hover-bgcolor) 40%, transparent 60%);
}
&::before {
width: 70%;
height: 1.2px;
background: var(--zen-colors-border);
content: '';
position: absolute;
top: -1px;
left: 50%;
display: none;
transform: translateX(-50%);
}
&[showborder] {
@@ -31,14 +50,7 @@
padding-top: var(--space-small) !important;
&::before {
width: 70%;
height: 1.2px;
background: var(--zen-colors-border);
content: '';
position: absolute;
top: -3px;
left: 50%;
transform: translateX(-50%);
display: block;
}
}
}
@@ -71,6 +83,10 @@
-moz-window-dragging: no-drag;
--zen-sidebar-action-button-width: 38px;
padding-bottom: calc(5px + 5px); /* Taking into consideration the padding of the sidebar without being inlined */
:root[zen-sidebar-legacy="true"] & {
padding-top: 0 !important;
}
}
#TabsToolbar-customization-target {
@@ -117,7 +133,7 @@
}
.tabbrowser-tab {
--zen-browser-tab-icon-size: 18px;
--zen-browser-tab-icon-size: 16px;
--tab-min-width: 36px;
margin: 0 auto;
border-radius: 8px;
@@ -246,6 +262,8 @@
border: none;
height: 100%;
border-bottom: 0 !important;
padding-inline-start: 0 !important;
margin-inline-start: 0 !important;
@@ -299,16 +317,19 @@
}
#newtab-button-container {
margin: var(--zen-tabbrowser-padding);
margin-top: 0;
margin: calc(var(--zen-tabbrowser-padding) - 2px);
margin-bottom: 0;
margin-bottom: var(--space-small);
&[showborder] {
margin-top: var(--zen-tabbrowser-padding);
&::before {
width: 95%;
top: 0;
}
margin-top: 0;
padding-top: calc(var(--space-small) / 2) !important;
}
&::before {
width: 100%;
top: calc(100% + var(--space-small));
display: block;
}
}
@@ -344,6 +365,10 @@
align-items: center;
}
& #tabbrowser-arrowscrollbox .tabbrowser-tab:first-child:not([hidden]) {
margin-top: var(--space-small) !important;
}
& .tabbrowser-tab {
max-width: unset !important;

View File

@@ -1,6 +1,6 @@
#zen-workspaces-button {
--zen-workspaces-button-vmargin: 0.35rem;
--zen-workspaces-button-vmargin: 0.4rem;
border: 1px solid var(--zen-colors-border);
border-radius: 50px;
width: calc(var(--zen-sidebar-action-button-width) - 5px) !important;
@@ -10,6 +10,10 @@
justify-content: center;
align-items: center;
display: flex;
:root[zen-sidebar-legacy="true"] & {
margin-top: 0 !important;
}
}
#zen-workspaces-button .zen-workspace-sidebar-name {

View File

@@ -19,7 +19,7 @@ index 3affb19d1a243da4a5782c9a4a5588d165b4119f..837f078ff1f3a65a40877c1380c6d050
+ id="searchInput"
+ data-l10n-id="search-input-box2"
+ data-l10n-attrs="placeholder, style"
+ hidden="true"/>
+ />
+
<!-- category list -->
<richlistbox id="categories" data-l10n-id="category-list" data-l10n-attrs="aria-label">

View File

@@ -228,6 +228,26 @@ var gZenLooksAndFeel = {
this._initializeTabbarExpandForm();
gZenThemeBuilder.init();
gZenMarketplaceManager.init();
var onLegacyToolbarChange = this.onLegacyToolbarChange.bind(this);
Services.prefs.addObserver("zen.themes.tabs.legacy-location", onLegacyToolbarChange);
window.addEventListener("unload", () => {
Services.prefs.removeObserver("zen.themes.tabs.legacy-location", onLegacyToolbarChange);
});
},
async onLegacyToolbarChange(event) {
let buttonIndex = await confirmRestartPrompt(
true,
1,
true,
false
);
if (buttonIndex == CONFIRM_RESTART_PROMPT_RESTART_NOW) {
Services.startup.quit(
Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart
);
return;
}
},
_initializeTabbarExpandForm() {
@@ -294,7 +314,32 @@ var gZenLooksAndFeel = {
var gZenWorkspacesSettings = {
init() {
Services.prefs.addObserver("zen.workspaces.enabled", this);
window.addEventListener("unload", () => {
Services.prefs.removeObserver("zen.workspaces.enabled", this);
});
},
async observe(subject, topic, data) {
await this.onWorkspaceChange(Services.prefs.getBoolPref("zen.workspaces.enabled"));
},
async onWorkspaceChange(checked) {
if (checked) {
let buttonIndex = await confirmRestartPrompt(
true,
1,
true,
false
);
if (buttonIndex == CONFIRM_RESTART_PROMPT_RESTART_NOW) {
Services.startup.quit(
Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart
);
return;
}
}
}
};
var gZenCKSSettings = {

View File

@@ -65,7 +65,6 @@ groupbox:has(+ .subcategory) {
groupbox button {
border-radius: 5px !important;
padding: 5px 10px !important;
}
groupbox button,

View File

@@ -19,14 +19,23 @@
list-style-image: url("back.svg") !important;
}
#forward-button,
#zen-sidebar-web-panel-forward {
list-style-image: url("forward.svg") !important;
@media (max-width: 600px) {
display: none;
}
}
#reload-button,
#zen-sidebar-web-panel-reload {
list-style-image: url("reload.svg") !important;
@media (max-width: 650px) {
display: none;
}
}
#stop-button,
@@ -64,29 +73,25 @@
#appMenu-downloads-button,
#appMenu-library-downloads-button {
list-style-image: url("downloads.svg") !important;
@media (max-width: 650px) {
display: none;
}
}
#appMenu-translate-button {
list-style-image: url("translations.svg") !important;
}
#appMenu-zoom-controls {
list-style-image: url("plus.svg") !important;
}
#appMenu-passwords-button,
#password-notification-icon,
#PopupAutoComplete
> richlistbox
> richlistitem[originaltype="generatedPassword"]
> .two-line-wrapper
> .ac-site-icon,
#PopupAutoComplete
> richlistbox
> richlistitem[originaltype="loginWithOrigin"]
> .two-line-wrapper
> .ac-site-icon,
#PopupAutoComplete
> richlistbox
> richlistitem[originaltype="login"]
> .ac-site-icon {
#PopupAutoComplete>richlistbox>richlistitem[originaltype="generatedPassword"]>.two-line-wrapper>.ac-site-icon,
#PopupAutoComplete>richlistbox>richlistitem[originaltype="loginWithOrigin"]>.two-line-wrapper>.ac-site-icon,
#PopupAutoComplete>richlistbox>richlistitem[originaltype="login"]>.ac-site-icon {
list-style-image: url("passwords.svg") !important;
}
@@ -105,27 +110,18 @@
}
#sync-button,
.urlbarView-row[source="tabs"]
> .urlbarView-row-inner
> .urlbarView-no-wrap
> .urlbarView-favicon,
.urlbarView-row[source="tabs"]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-favicon,
#urlbar-engine-one-off-item-tabs {
list-style-image: url("tab.svg") !important;
}
#history-panelmenu,
.urlbarView-row[source="history"]
> .urlbarView-row-inner
> .urlbarView-no-wrap
> .urlbarView-favicon,
.urlbarView-row[source="history"]>.urlbarView-row-inner>.urlbarView-no-wrap>.urlbarView-favicon,
#urlbar-engine-one-off-item-history,
#appMenu-history-button,
#appMenu-library-history-button,
#sidebar-switcher-history,
#sidebar-box[sidebarcommand="viewHistorySidebar"]
> #sidebar-header
> #sidebar-switcher-target
> #sidebar-icon {
#sidebar-box[sidebarcommand="viewHistorySidebar"]>#sidebar-header>#sidebar-switcher-target>#sidebar-icon {
list-style-image: url("history.svg") !important;
}
@@ -206,15 +202,17 @@
}
#preferences-button,
.search-setting-button > .button-box > .button-icon,
.search-setting-button>.button-box>.button-icon,
#appMenu-settings-button,
#PanelUI-zen-profiles-managePrfs,
.unified-extensions-item-open-menu.subviewbutton {
list-style-image: url("settings.svg") !important;
}
#spell-check-enabled {
list-style-image: url("spell-check.svg") !important;
}
#panic-button {
list-style-image: url("forget.svg") !important;
}
@@ -232,7 +230,7 @@
list-style-image: url("pocket-outline.svg") !important;
}
#profiler-button-button > .toolbarbutton-icon,
#profiler-button-button>.toolbarbutton-icon,
.subviewbutton[label="Task Manager"] {
list-style-image: url("tool-profiler.svg") !important;
}
@@ -262,10 +260,7 @@
#appMenu-bookmarks-button,
#sidebar-switcher-bookmarks,
#appMenu-library-bookmarks-button,
#sidebar-box[sidebarcommand="viewBookmarksSidebar"]
> #sidebar-header
> #sidebar-switcher-target
> #sidebar-icon {
#sidebar-box[sidebarcommand="viewBookmarksSidebar"]>#sidebar-header>#sidebar-switcher-target>#sidebar-icon {
list-style-image: url("bookmark-star-on-tray.svg") !important;
}
@@ -291,17 +286,11 @@
list-style-image: url("page-portrait.svg") !important;
}
#urlbar:not(.searchButton)
> #urlbar-input-container
> #identity-box[pageproxystate="invalid"]
#identity-icon {
#urlbar:not(.searchButton)>#urlbar-input-container>#identity-box[pageproxystate="invalid"] #identity-icon {
list-style-image: url("search-glass.svg") !important;
}
#urlbar[actiontype="extension"]
> #urlbar-input-container
> #identity-box
#identity-icon,
#urlbar[actiontype="extension"]>#urlbar-input-container>#identity-box #identity-icon,
#identity-box[pageproxystate="valid"].extensionPage #identity-icon {
list-style-image: url("extension.svg") !important;
}
@@ -311,10 +300,7 @@
list-style-image: url("security.svg") !important;
}
#urlbar-input-container[pageproxystate="valid"]
> #tracking-protection-icon-container
> #tracking-protection-icon-box
> #tracking-protection-icon {
#urlbar-input-container[pageproxystate="valid"]>#tracking-protection-icon-container>#tracking-protection-icon-box>#tracking-protection-icon {
list-style-image: url("tracking-protection.svg") !important;
}
@@ -342,17 +328,13 @@
}
#identity-popup[ciphers="weak"] .identity-popup-security-connection,
#identity-popup[mixedcontent~="passive-loaded"][isbroken]
.identity-popup-security-connection,
#identity-popup[connection="secure-cert-user-overridden"]
.identity-popup-security-connection,
#identity-popup[connection="cert-error-page"]
.identity-popup-security-connection {
#identity-popup[mixedcontent~="passive-loaded"][isbroken] .identity-popup-security-connection,
#identity-popup[connection="secure-cert-user-overridden"] .identity-popup-security-connection,
#identity-popup[connection="cert-error-page"] .identity-popup-security-connection {
list-style-image: url("security-warning.svg") !important;
}
#identity-popup[connection="net-error-page"]
.identity-popup-security-connection {
#identity-popup[connection="net-error-page"] .identity-popup-security-connection {
list-style-image: url("info.svg") !important;
}
@@ -389,7 +371,7 @@
list-style-image: url("move-tab.svg") !important;
}
.panel-header > .subviewbutton-back {
.panel-header>.subviewbutton-back {
list-style-image: url("arrow-left.svg") !important;
}
@@ -413,38 +395,31 @@
}
#zen-split-views-button {
list-style-image: url("link.svg") !important;
list-style-image: url("link.svg") !important;
fill: var(--toolbarbutton-icon-fill-attention);
fill-opacity: 1;
fill-opacity: 1;
}
#sidebar-box[sidebarcommand="viewTabsSidebar"]
> #sidebar-header
> #sidebar-switcher-target
> #sidebar-icon,
#sidebar-box[sidebarcommand="viewTabsSidebar"]>#sidebar-header>#sidebar-switcher-target>#sidebar-icon,
#sidebar-switcher-tabs {
list-style-image: url("send-to-device.svg") !important;
}
/* tab icons */
.tab-icon-image[src="chrome://branding/content/icon32.png"],
.tab-icon-image[src="chrome://browser/skin/privatebrowsing/favicon.svg"]
{
.tab-icon-image[src="chrome://browser/skin/privatebrowsing/favicon.svg"] {
content: url("new-tab-image.svg") !important;
}
.tab-icon-image[src="chrome://global/skin/icons/settings.svg"]
{
.tab-icon-image[src="chrome://global/skin/icons/settings.svg"] {
content: url("settings.svg") !important;
}
.tab-icon-image[src="chrome://mozapps/skin/extensions/extension.svg"]
{
.tab-icon-image[src="chrome://mozapps/skin/extensions/extension.svg"] {
content: url("extension.svg") !important;
}
.tab-icon-image[src="chrome://browser/skin/customize.svg"]
{
.tab-icon-image[src="chrome://browser/skin/customize.svg"] {
content: url("customize.svg") !important;
}
@@ -566,31 +541,17 @@
}
/* reload/stop animation */
#stop-reload-button[animate]
> #reload-button[displaystop]
+ #stop-button
> .toolbarbutton-animatable-box
> .toolbarbutton-animatable-image,
#zen-sidebar-web-panel-reload[animate]
> #zen-sidebar-web-panel-reload-button[displaystop]
+ #zen-sidebar-web-panel-stop-button
> .toolbarbutton-animatable-box
> .toolbarbutton-animatable-image {
#stop-reload-button[animate]>#reload-button[displaystop]+#stop-button>.toolbarbutton-animatable-box>.toolbarbutton-animatable-image,
#zen-sidebar-web-panel-reload[animate]>#zen-sidebar-web-panel-reload-button[displaystop]+#zen-sidebar-web-panel-stop-button>.toolbarbutton-animatable-box>.toolbarbutton-animatable-image {
background-image: url("reload-to-stop.svg") !important;
}
#stop-reload-button[animate]
> #reload-button
> .toolbarbutton-animatable-box
> .toolbarbutton-animatable-image,
#zen-sidebar-web-panel-reload[animate]
> #zen-sidebar-web-panel-reload-button
> .toolbarbutton-animatable-box
> .toolbarbutton-animatable-image {
#stop-reload-button[animate]>#reload-button>.toolbarbutton-animatable-box>.toolbarbutton-animatable-image,
#zen-sidebar-web-panel-reload[animate]>#zen-sidebar-web-panel-reload-button>.toolbarbutton-animatable-box>.toolbarbutton-animatable-image {
background-image: url("stop-to-reload.svg") !important;
}
#reader-mode-button > .urlbar-icon {
#reader-mode-button>.urlbar-icon {
list-style-image: url("reader-mode.svg") !important;
}
@@ -599,7 +560,7 @@
}
/* Context Menu Icons */
menupopup > menuitem:is([checked="true"], [selected="true"]) .menu-iconic-icon {
menupopup>menuitem:is([checked="true"], [selected="true"]) .menu-iconic-icon {
list-style-image: url("checkmark.svg") !important;
}
@@ -611,28 +572,21 @@ menupopup > menuitem:is([checked="true"], [selected="true"]) .menu-iconic-icon {
list-style-image: url("media-loop.svg") !important;
}
:not(:not(menubar) > menu, #ContentSelectDropdown)
> menupopup
> menuitem:not(
.menuitem-iconic,
[type="checkbox"],
[type="radio"],
.in-menulist,
.in-menulist menuitem,
.unified-nav-current
),
:not(:not(menubar) > menu, #ContentSelectDropdown)
> menupopup
> menu:not(
.menu-iconic,
[type="checkbox"],
[type="radio"],
.in-menulist,
.in-menulist menu,
.unified-nav-current
),#toggle_toolbar-menubar,
#PanelUI-history toolbarbutton,
#unified-extensions-context-menu menuitem{
:not(:not(menubar) > menu, #ContentSelectDropdown)>menupopup>menuitem:not(.menuitem-iconic,
[type="checkbox"],
[type="radio"],
.in-menulist,
.in-menulist menuitem,
.unified-nav-current),
:not(:not(menubar) > menu, #ContentSelectDropdown)>menupopup>menu:not(.menu-iconic,
[type="checkbox"],
[type="radio"],
.in-menulist,
.in-menulist menu,
.unified-nav-current),
#toggle_toolbar-menubar,
#PanelUI-history toolbarbutton,
#unified-extensions-context-menu menuitem {
background-image: var(--menu-image) !important;
background-size: 16px !important;
background-position: var(--fp-contextmenu-menuitem-padding-inline) center !important;
@@ -643,8 +597,9 @@ menupopup > menuitem:is([checked="true"], [selected="true"]) .menu-iconic-icon {
menu>.menu-iconic-text,
menuitem>.menu-iconic-text {
padding-inline-start: var(--fp-contextmenu-menuicon-margin-inline) !important;
padding-inline-start: var(--fp-contextmenu-menuicon-margin-inline) !important;
}
#context-savepage {
--menu-image: url("save.svg");
}
@@ -662,7 +617,8 @@ menuitem>.menu-iconic-text {
#toolbar-context-undoCloseTab {
--menu-image: url("edit-undo.svg");
}
#toggle_toolbar-menubar{
#toggle_toolbar-menubar {
--menu-image: url("menu-bar.svg");
}
@@ -735,9 +691,11 @@ menuitem[id="placesContext_deleteHost"],
#context-viewimage {
--menu-image: url("image-open.svg");
}
#context-viewimageinfo {
--menu-image: url("info.svg");
}
#context-saveimage,
#context-video-saveimage {
--menu-image: url("image-save.svg");
@@ -767,8 +725,8 @@ menuitem[id="placesContext_deleteHost"],
#context-pdfjs-copy {
--menu-image: url("link.svg");
}
#context-openlinkincurrent
{
#context-openlinkincurrent {
--menu-image: url("ext-link.svg");
}
@@ -894,6 +852,7 @@ menuitem[contexttype="fullscreen"][label*="Exit"] {
.customize-context-moveToPanel {
--menu-image: url("pin.svg");
}
.customize-context-removeFromToolbar {
--menu-image: url("unpin.svg");
}
@@ -933,28 +892,35 @@ menuitem[id="placesContext_showAllBookmarks"],
.unified-extensions-context-menu-manage-extension {
--menu-image: url("manage.svg");
}
#BMB_viewBookmarksSidebar {
--menu-image: url("sidebars.svg");
}
#BMB_searchBookmarks {
--menu-image: url("search-page.svg");
}
#appMenuRecentlyClosedTabs {
#appMenuRecentlyClosedTabs {
--menu-image: url("container-tab.svg");
}
#appMenuClearRecentHistory {
--menu-image: url("edit-delete.svg")
}
#appMenuRecentlyClosedWindows {
--menu-image: url("window.svg");
}
#appMenuSearchHistory {
--menu-image: url("search-glass.svg");
}
#PanelUI-historyMore {
--menu-image: url("manage.svg");
}
menuitem[id="placesContext_new:bookmark"],
menuitem[id="placesContext_new:folder"],
@@ -982,26 +948,29 @@ menuitem[id="placesContext_new:separator"] {
#context_closeTab {
--menu-image: url("close.svg");
}
#context_closeTabOptions {
--menu-image: url("close-all.svg");
}
.customize-context-reportExtension,
.unified-extensions-context-menu-report-extension {
--menu-image: url("report.svg");
}
/* FIX header icons for the app menu sub menus (eg. fx account, history...) */
.panel-header > h1 {
.panel-header>h1 {
text-align: left;
margin-left: 8px !important;
}
.wordmark::after {
content: "Plus" !important;
}
}
/* header icons for the app menu sub menus (eg. fx account, history...) */
.panel-header > h1 > span::before {
.panel-header>h1>span::before {
content: "";
background: var(--header-image, none) center / 16px no-repeat;
-moz-context-properties: fill, fill-opacity;
@@ -1010,7 +979,7 @@ menuitem[id="placesContext_new:separator"] {
margin-inline-end: calc(var(--fp-enabled, 0) * 8px);
}
#PanelUI-fxa .panel-header > h1 > span::before {
#PanelUI-fxa .panel-header>h1>span::before {
--header-image: var(--avatar-image-url);
--fp-enabled: 1;
transform: scale(1.25);
@@ -1019,45 +988,45 @@ menuitem[id="placesContext_new:separator"] {
height: 16px;
}
#PanelUI-bookmarks .panel-header > h1 > span::before {
#PanelUI-bookmarks .panel-header>h1>span::before {
--header-image: url("bookmark-star-on-tray.svg");
--fp-enabled: 1;
}
#PanelUI-history .panel-header > h1 > span::before {
#PanelUI-history .panel-header>h1>span::before {
--header-image: url("history.svg");
--fp-enabled: 1;
}
#PanelUI-helpView .panel-header > h1 > span::before {
#PanelUI-helpView .panel-header>h1>span::before {
--header-image: url("help.svg");
--fp-enabled: 1;
}
#appMenu-libraryView .panel-header > h1 > span::before {
#appMenu-libraryView .panel-header>h1>span::before {
--header-image: url("library.svg");
--fp-enabled: 1;
}
#unified-extensions-panel .panel-header > h1 > span::before {
#unified-extensions-panel .panel-header>h1>span::before {
--header-image: url("extension.svg");
--fp-enabled: 1;
}
.unified-extensions-context-menu-pin-to-toolbar {
--menu-image: url("pin.svg");
}
.unified-extensions-context-menu-move-widget-down {
--menu-image: url("arrow-down.svg");
}
.unified-extensions-context-menu-move-widget-up {
--menu-image: url("arrow-up.svg");
}
:not(:not(menubar)>menu, #ContentSelectDropdown)>menupopup>menuitem:not(.menuitem-iconic, [type="checkbox"], [type="radio"], .in-menulist, .in-menulist menuitem, .unified-nav-current),
:not(:not(menubar)>menu, #ContentSelectDropdown)>menupopup>menu:not(.menu-iconic, [type="checkbox"], [type="radio"], .in-menulist, .in-menulist menu, .unified-nav-current),
:not(:not(menubar)>menu, #ContentSelectDropdown)>menupopup>menucaption
{
padding-inline-start: calc(var(--fp-contextmenu-menuitem-padding-inline) + 16px + var(--fp-contextmenu-menuicon-margin-inline)) !important;
}
:not(:not(menubar)>menu, #ContentSelectDropdown)>menupopup>menu:not(.menu-iconic, [type="checkbox"], [type="radio"], .in-menulist, .in-menulist menu, .unified-nav-current),
:not(:not(menubar)>menu, #ContentSelectDropdown)>menupopup>menucaption {
padding-inline-start: calc(var(--fp-contextmenu-menuitem-padding-inline) + 16px + var(--fp-contextmenu-menuicon-margin-inline)) !important;
}

View File

@@ -18,7 +18,7 @@
"brandShortName": "Zen Browser",
"brandFullName": "Zen Browser",
"release": {
"displayVersion": "1.0.0-a.35",
"displayVersion": "1.0.0-a.37",
"github": {
"repo": "zen-browser/desktop"
},