mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-10-04 17:06:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Edited and fixed UI

Browse Source
This commit is contained in:
mauro-balades
2024-03-29 18:53:01 +01:00
parent 73fea7b003
commit b73e15a172
20 changed files with 746 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gluon/patchCount
View File

@@ -1 +1 @@
8
17

10
src/browser/app/profile/firefox-js.patch Normal file
View File

@@ -0,0 +1,10 @@
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 5964d40ca3a3654f8fdc62d87deb0ac51c9a55ab..fdaa15ecaff403d61ec6d4f068678b56442dd28a 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -3022,3 +3022,5 @@ pref("browser.mailto.dualPrompt.os", false);
// When visiting a site which uses registerProtocolHandler: Ask the user to set Firefox as
// default mailto handler.
pref("browser.mailto.prompt.os", true);
+
+#include zen-browser.js

12
src/browser/app/profile/zen-browser.js Normal file
View File

@@ -0,0 +1,12 @@
// 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 http://mozilla.org/MPL/2.0/.
pref("browser.tabs.cardPreview.enabled", true);
pref("browser.tabs.cardPreview.delayMs", 500);
pref("browser.urlbar.suggest.calculator", true);
#ifdef MOZ_UPDATE_CHANNEL
pref("devtools.debugger.prompt-connection", false);
#endif

471
src/browser/base/content/browser-box-inc-xhtml.patch
View File

@@ -1,478 +1,13 @@
diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
index d445abe7e743b2ec5d46d42f8f149c000e3c7997..67eba2cf4c4d81ab80713f636c33717eb1f8e92e 100644
index d445abe7e743b2ec5d46d42f8f149c000e3c7997..80226e0504cc9c3c052a4cce17a6b4f5e6f2d91f 100644
--- a/browser/base/content/browser-box.inc.xhtml
+++ b/browser/base/content/browser-box.inc.xhtml
@@ -18,6 +18,474 @@
@@ -18,6 +18,9 @@
</vbox>
<splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
<vbox id="appcontent" flex="1">
+
+ <!-- ZEN UI -->
+ <toolbar id="nav-bar"
+ class="browser-toolbar"
+ data-l10n-id="navbar-accessible"
+ fullscreentoolbar="true" mode="icons" customizable="true"
+ customizationtarget="nav-bar-customization-target"
+ overflowable="true"
+ default-overflowbutton="nav-bar-overflow-button"
+ default-overflowtarget="widget-overflow-list"
+ default-overflowpanel="widget-overflow"
+ addon-webext-overflowbutton="unified-extensions-button"
+ addon-webext-overflowtarget="overflowed-extensions-list"
+ context="toolbar-context-menu">
+ <toolbartabstop/>
+
+ <hbox id="nav-bar-customization-target" flex="1">
+ <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ data-l10n-id="toolbar-button-back-2"
+ removable="false" overflows="false"
+ keepbroadcastattributeswhencustomizing="true"
+ command="Browser:BackOrBackDuplicate"
+ onclick="checkForMiddleClick(this, event);"
+ tooltip="back-button-tooltip"
+ context="backForwardMenu"/>
+ <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ data-l10n-id="toolbar-button-forward-2"
+ removable="false" overflows="false"
+ keepbroadcastattributeswhencustomizing="true"
+ command="Browser:ForwardOrForwardDuplicate"
+ onclick="checkForMiddleClick(this, event);"
+ tooltip="forward-button-tooltip"
+ context="backForwardMenu"/>
+ <toolbaritem id="stop-reload-button" class="chromeclass-toolbar-additional"
+ data-l10n-id="toolbar-button-stop-reload"
+ removable="true" overflows="false">
+ <toolbarbutton id="reload-button" class="toolbarbutton-1"
+ data-l10n-id="toolbar-button-reload"
+ command="Browser:ReloadOrDuplicate"
+ onclick="checkForMiddleClick(this, event);"
+ tooltip="dynamic-shortcut-tooltip">
+ <box class="toolbarbutton-animatable-box">
+ <image class="toolbarbutton-animatable-image"/>
+ </box>
+ </toolbarbutton>
+ <toolbarbutton id="stop-button" class="toolbarbutton-1"
+ data-l10n-id="toolbar-button-stop"
+ command="Browser:Stop"
+ tooltip="dynamic-shortcut-tooltip">
+ <box class="toolbarbutton-animatable-box">
+ <image class="toolbarbutton-animatable-image"/>
+ </box>
+ </toolbarbutton>
+ </toolbaritem>
+ <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
+ <toolbaritem id="urlbar-container"
+ removable="false"
+ class="chromeclass-location" overflows="false">
+ <toolbartabstop/>
+ <hbox id="urlbar" flex="1"
+ context=""
+ focused="true"
+ pageproxystate="invalid">
+ <hbox id="urlbar-background"/>
+ <hbox id="urlbar-input-container"
+ flex="1"
+ pageproxystate="invalid">
+ <box id="remote-control-box"
+ align="center"
+ collapsed="true">
+ <image id="remote-control-icon"/>
+ </box>
+ <box id="urlbar-search-button"
+ class="chromeclass-toolbar-additional"/>
+ <!-- Use onclick instead of normal popup= syntax since the popup
+ code fires onmousedown, and hence eats our favicon drag events. -->
+ <box id="tracking-protection-icon-container" align="center"
+ role="button"
+ onclick="gProtectionsHandler.handleProtectionsButtonEvent(event);"
+ onkeypress="gProtectionsHandler.handleProtectionsButtonEvent(event);"
+ onmouseover="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
+ onfocus="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
+ tooltip="tracking-protection-icon-tooltip">
+ <box id="tracking-protection-icon-box">
+ <image id="tracking-protection-icon"/>
+ </box>
+ <tooltip id="tracking-protection-icon-tooltip">
+ <description id="tracking-protection-icon-tooltip-label" class="tooltip-label"/>
+ </tooltip>
+ </box>
+ <box id="identity-box"
+ pageproxystate="invalid"
+ ondragstart="gIdentityHandler.onDragStart(event);">
+ <box id="identity-icon-box"
+ role="button"
+ align="center"
+ data-l10n-id="urlbar-identity-button"
+ class="identity-box-button"
+ onclick="gIdentityHandler.handleIdentityButtonEvent(event); PageProxyClickHandler(event);"
+ onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);">
+ <image id="identity-icon"/>
+ <label id="identity-icon-label" class="plain" crop="center" flex="1"/>
+ </box>
+ <box id="identity-permission-box"
+ data-l10n-id="urlbar-permissions-granted"
+ role="button"
+ align="center"
+ class="identity-box-button"
+ onclick="gPermissionPanel.handleIdentityButtonEvent(event); PageProxyClickHandler(event);"
+ onkeypress="gPermissionPanel.handleIdentityButtonEvent(event);">
+ <image id="permissions-granted-icon"/>
+ <box style="pointer-events: none;">
+ <image class="sharing-icon" id="webrtc-sharing-icon"/>
+ <image class="sharing-icon geo-icon" id="geo-sharing-icon"/>
+ <image class="sharing-icon xr-icon" id="xr-sharing-icon"/>
+ </box>
+ <box id="blocked-permissions-container" align="center">
+ <image data-permission-id="geo" class="blocked-permission-icon geo-icon" role="button"
+ data-l10n-id="urlbar-geolocation-blocked"/>
+ <image data-permission-id="xr" class="blocked-permission-icon xr-icon" role="button"
+ data-l10n-id="urlbar-xr-blocked"/>
+ <image data-permission-id="desktop-notification" class="blocked-permission-icon desktop-notification-icon" role="button"
+ data-l10n-id="urlbar-web-notifications-blocked"/>
+ <image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button"
+ data-l10n-id="urlbar-camera-blocked"/>
+ <image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button"
+ data-l10n-id="urlbar-microphone-blocked"/>
+ <image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button"
+ data-l10n-id="urlbar-screen-blocked"/>
+ <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button"
+ data-l10n-id="urlbar-persistent-storage-blocked"/>
+ <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
+ data-l10n-id="urlbar-popup-blocked"/>
+ <image data-permission-id="autoplay-media" class="blocked-permission-icon autoplay-media-icon" role="button"
+ data-l10n-id="urlbar-autoplay-media-blocked"/>
+ <image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button"
+ data-l10n-id="urlbar-canvas-blocked"/>
+ <image data-permission-id="midi" class="blocked-permission-icon midi-icon" role="button"
+ data-l10n-id="urlbar-midi-blocked"/>
+ <image data-permission-id="install" class="blocked-permission-icon install-icon" role="button"
+ data-l10n-id="urlbar-install-blocked"/>
+ <!-- A speaker icon for blocked speaker selection is not
+ shown because, without text, this may be interpreted as
+ active or blocked audio. -->
+ </box>
+ </box>
+ <box id="notification-popup-box"
+ class="anchor-root"
+ hidden="true"
+ align="center">
+ <image id="default-notification-icon" class="notification-anchor-icon" role="button"
+ data-l10n-id="urlbar-default-notification-anchor"/>
+ <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
+ data-l10n-id="urlbar-geolocation-notification-anchor"/>
+ <image id="xr-notification-icon" class="notification-anchor-icon xr-icon" role="button"
+ data-l10n-id="urlbar-xr-notification-anchor"/>
+ <image id="autoplay-media-notification-icon" class="notification-anchor-icon autoplay-media-icon" role="button"
+ data-l10n-id="urlbar-autoplay-notification-anchor"/>
+ <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
+ data-l10n-id="urlbar-addons-notification-anchor"/>
+ <image id="canvas-notification-icon" class="notification-anchor-icon" role="button"
+ data-l10n-id="urlbar-canvas-notification-anchor"/>
+ <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
+ data-l10n-id="urlbar-indexed-db-notification-anchor"/>
+ <image id="password-notification-icon" class="notification-anchor-icon" role="button"
+ data-l10n-id="urlbar-password-notification-anchor"/>
+ <image id="web-notifications-notification-icon" class="notification-anchor-icon desktop-notification-icon" role="button"
+ data-l10n-id="urlbar-web-notification-anchor"/>
+ <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button"
+ data-l10n-id="urlbar-web-rtc-share-devices-notification-anchor"/>
+ <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button"
+ data-l10n-id="urlbar-web-rtc-share-microphone-notification-anchor"/>
+ <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button"
+ data-l10n-id="urlbar-web-rtc-share-screen-notification-anchor"/>
+ <image id="webRTC-shareSpeaker-notification-icon" class="notification-anchor-icon speaker-icon" role="button"
+ data-l10n-id="urlbar-web-rtc-share-speaker-notification-anchor"/>
+ <image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button"
+ data-l10n-id="urlbar-services-notification-anchor"/>
+ <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button"
+ data-l10n-id="urlbar-eme-notification-anchor"/>
+ <image id="persistent-storage-notification-icon" class="notification-anchor-icon persistent-storage-icon" role="button"
+ data-l10n-id="urlbar-persistent-storage-notification-anchor"/>
+ <image id="midi-notification-icon" class="notification-anchor-icon midi-icon" role="button"
+ data-l10n-id="urlbar-midi-notification-anchor"/>
+ <image id="webauthn-notification-icon" class="notification-anchor-icon" role="button"
+ data-l10n-id="urlbar-web-authn-anchor"/>
+ <image id="identity-credential-notification-icon" class="notification-anchor-icon" role="button"
+ data-l10n-id="identity-credential-urlbar-anchor"/>
+ <image id="storage-access-notification-icon" class="notification-anchor-icon storage-access-icon" role="button"
+ data-l10n-id="urlbar-storage-access-anchor"/>
+ </box>
+ </box>
+ <box id="urlbar-label-box" align="center">
+ <label id="urlbar-label-switchtab" class="urlbar-label" data-l10n-id="urlbar-switch-to-tab"/>
+ <label id="urlbar-label-extension" class="urlbar-label" data-l10n-id="urlbar-extension"/>
+ <label id="urlbar-label-search-mode" class="urlbar-label"/>
+ </box>
+ <html:div id="urlbar-search-mode-indicator">
+ <html:span id="urlbar-search-mode-indicator-title"/>
+ <html:div id="urlbar-search-mode-indicator-close"
+ class="close-button"
+ role="button"
+ aria-labelledby="urlbar-search-mode-indicator-close urlbar-search-mode-indicator-title"
+ data-l10n-id="urlbar-search-mode-indicator-close"/>
+ </html:div>
+ <moz-input-box tooltip="aHTMLTooltip"
+ class="urlbar-input-box"
+ flex="1"
+ role="combobox"
+ aria-owns="urlbar-results">
+ <html:input id="urlbar-scheme"
+ required="required"/>
+ <html:input id="urlbar-input"
+ anonid="input"
+ aria-controls="urlbar-results"
+ aria-autocomplete="both"
+ inputmode="mozAwesomebar"
+ data-l10n-id="urlbar-placeholder"
+ data-l10n-attrs="placeholder"/>
+ </moz-input-box>
+ <image id="urlbar-go-button"
+ class="urlbar-icon"
+ role="button"
+ keyNav="false"
+ onclick="gURLBar.handleCommand(event);"
+ data-l10n-id="urlbar-go-button"/>
+ <hbox id="page-action-buttons" context="pageActionContextMenu" align="center">
+ <toolbartabstop/>
+ <hbox id="contextual-feature-recommendation" role="button" hidden="true">
+ <hbox id="cfr-label-container">
+ <label id="cfr-label"/>
+ </hbox>
+ <hbox id="cfr-button"
+ role="presentation"
+ class="urlbar-page-action">
+ <image class="urlbar-icon"/>
+ </hbox>
+ </hbox>
+ <hbox id="userContext-icons" hidden="true">
+ <label id="userContext-label"/>
+ <image id="userContext-indicator"/>
+ </hbox>
+ <hbox id="reader-mode-button"
+ class="urlbar-page-action"
+ role="button"
+ data-l10n-id="reader-view-enter-button"
+ hidden="true"
+ tooltip="dynamic-shortcut-tooltip"
+ onclick="AboutReaderParent.buttonClick(event);">
+ <image id="reader-mode-button-icon"
+ class="urlbar-icon"/>
+ </hbox>
+ <hbox id="picture-in-picture-button"
+ class="urlbar-page-action"
+ role="button"
+ hidden="true"
+ onclick="PictureInPicture.toggleUrlbar(event)">
+ <image id="picture-in-picture-button-icon"
+ class="urlbar-icon"/>
+ </hbox>
+ <hbox id="translations-button"
+ class="urlbar-page-action"
+ role="button"
+ data-l10n-id="urlbar-translations-button2"
+ hidden="true"
+ onclick="TranslationsPanel.open(event);"
+ onkeypress="TranslationsPanel.open(event);">
+ <image class="urlbar-icon" id="translations-button-icon" />
+ <image class="urlbar-icon" id="translations-button-circle-arrows" />
+ <html:span id="translations-button-locale" aria-hidden="true" />
+ </hbox>
+ <hbox id="shopping-sidebar-button"
+ class="urlbar-page-action"
+ role="button"
+ data-l10n-id="shopping-sidebar-open-button2"
+ hidden="true"
+ onclick="ShoppingSidebarParent.urlbarButtonClick(event);">
+ <image id="shopping-sidebar-button-icon"
+ class="urlbar-icon"/>
+ </hbox>
+ <toolbarbutton id="urlbar-zoom-button"
+ onclick="FullZoom.resetFromURLBar(event);"
+ tooltip="dynamic-shortcut-tooltip"
+ hidden="true"/>
+ <hbox id="pageActionButton"
+ class="urlbar-page-action"
+ role="button"
+ data-l10n-id="urlbar-page-action-button"
+ onmousedown="BrowserPageActions.mainButtonClicked(event);"
+ onkeypress="BrowserPageActions.mainButtonClicked(event);">
+ <image class="urlbar-icon"/>
+ </hbox>
+ <hbox id="star-button-box"
+ hidden="true"
+ role="button"
+ class="urlbar-page-action"
+ onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);">
+ <image id="star-button"
+ class="urlbar-icon"/>
+ </hbox>
+ </hbox>
+ </hbox>
+ </hbox>
+ <toolbartabstop/>
+ </toolbaritem>
+
+ <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
+
+ <toolbarbutton id="downloads-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
+ delegatesanchor="true"
+ badged="true"
+ key="key_openDownloads"
+ onmousedown="DownloadsIndicatorView.onCommand(event);"
+ onkeypress="DownloadsIndicatorView.onCommand(event);"
+ ondrop="DownloadsIndicatorView.onDrop(event);"
+ ondragover="DownloadsIndicatorView.onDragOver(event);"
+ ondragenter="DownloadsIndicatorView.onDragOver(event);"
+ data-l10n-id="navbar-downloads"
+ removable="true"
+ overflows="false"
+ cui-areatype="toolbar"
+ hidden="true"
+ tooltip="dynamic-shortcut-tooltip">
+ <box id="downloads-indicator-anchor"
+ consumeanchor="downloads-button">
+ <image id="downloads-indicator-icon"/>
+ </box>
+ <box class="toolbarbutton-animatable-box" id="downloads-indicator-progress-outer">
+ <box id="downloads-indicator-progress-inner"/>
+ </box>
+ <box class="toolbarbutton-animatable-box" id="downloads-indicator-start-box">
+ <image class="toolbarbutton-animatable-image" id="downloads-indicator-start-image"/>
+ </box>
+ <box class="toolbarbutton-animatable-box" id="downloads-indicator-finish-box">
+ <image class="toolbarbutton-animatable-image" id="downloads-indicator-finish-image"/>
+ </box>
+ </toolbarbutton>
+
+ <toolbarbutton id="fxa-toolbar-menu-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
+ badged="true"
+ delegatesanchor="true"
+ onmousedown="gSync.toggleAccountPanel(this, event)"
+ onkeypress="gSync.toggleAccountPanel(this, event)"
+ consumeanchor="fxa-toolbar-menu-button"
+ closemenu="none"
+ data-l10n-id="toolbar-button-account"
+ cui-areatype="toolbar"
+ removable="true">
+ <vbox>
+ <image id="fxa-avatar-image"/>
+ </vbox>
+ </toolbarbutton>
+
+ <toolbarbutton id="unified-extensions-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
+ delegatesanchor="true"
+ data-l10n-id="unified-extensions-button"
+ hidden="true"
+ onkeypress="gUnifiedExtensions.togglePanel(event)"
+ onmousedown="gUnifiedExtensions.togglePanel(event)"
+ overflows="false"
+ removable="false"/>
+ </hbox>
+
+ <toolbarbutton id="nav-bar-overflow-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
+ delegatesanchor="true"
+ skipintoolbarset="true"
+ data-l10n-id="navbar-overflow">
+ <box class="toolbarbutton-animatable-box">
+ <image class="toolbarbutton-animatable-image"/>
+ </box>
+ </toolbarbutton>
+
+ <toolbaritem id="PanelUI-button"
+ removable="false">
+ <toolbarbutton id="ion-button"
+ class="toolbarbutton-1"
+ delegatesanchor="true"
+ hidden="true"
+ badged="true"
+ tooltiptext="Ion"
+ onmousedown="switchToTabHavingURI('about:ion', true);"
+ onkeypress="switchToTabHavingURI('about:ion', true);"/>
+ <toolbarbutton id="whats-new-menu-button"
+ class="toolbarbutton-1"
+ delegatesanchor="true"
+ hidden="true"
+ badged="true"
+ onmousedown="PanelUI.showSubView('PanelUI-whatsNew', this, event);"
+ onkeypress="PanelUI.showSubView('PanelUI-whatsNew', this, event);"/>
+ <toolbarbutton id="PanelUI-menu-button"
+ class="toolbarbutton-1"
+ delegatesanchor="true"
+ badged="true"
+ consumeanchor="PanelUI-button"
+ data-l10n-id="appmenu-menu-button-closed2"/>
+ </toolbaritem>
+ </toolbar>
+
+ <toolbar id="PersonalToolbar"
+ mode="icons"
+ class="browser-toolbar chromeclass-directories"
+ context="toolbar-context-menu"
+ data-l10n-id="bookmarks-toolbar"
+ data-l10n-attrs="toolbarname"
+ customizable="true">
+ <toolbartabstop skipintoolbarset="true"/>
+
+ <hbox id="personal-toolbar-empty" skipintoolbarset="true" removable="false" hidden="true">
+ <description id="personal-toolbar-empty-description"
+ data-l10n-id="bookmarks-toolbar-empty-message"
+ onclick="BookmarkingUI.openLibraryIfLinkClicked(event);"
+ onkeydown="BookmarkingUI.openLibraryIfLinkClicked(event);">
+ <html:a data-l10n-name="manage-bookmarks" class="text-link" tabindex="0"/>
+ </description>
+ </hbox>
+
+ <toolbaritem id="personal-bookmarks"
+ data-l10n-id="bookmarks-toolbar-placeholder"
+ cui-areatype="toolbar"
+ removable="true">
+ <toolbarbutton id="bookmarks-toolbar-placeholder"
+ class="bookmark-item"
+ data-l10n-id="bookmarks-toolbar-placeholder-button"/>
+ <toolbarbutton id="bookmarks-toolbar-button"
+ class="toolbarbutton-1"
+ delegatesanchor="true"
+ flex="1"
+ data-l10n-id="bookmarks-toolbar-placeholder-button"
+ oncommand="PlacesToolbarHelper.onPlaceholderCommand();"/>
+ <hbox flex="1"
+ id="PlacesToolbar"
+ context="placesContext"
+ onmouseup="BookmarksEventHandler.onMouseUp(event);"
+ onclick="BookmarksEventHandler.onClick(event, this._placesView);"
+ oncommand="BookmarksEventHandler.onCommand(event);"
+ tooltip="bhTooltip"
+ popupsinherittooltip="true">
+ <hbox id="PlacesToolbarDropIndicatorHolder" align="center" collapsed="true">
+ <image id="PlacesToolbarDropIndicator"
+ collapsed="true"/>
+ </hbox>
+ <scrollbox orient="horizontal"
+ id="PlacesToolbarItems"
+ flex="1"/>
+ <toolbarbutton type="menu"
+ id="PlacesChevron"
+ class="toolbarbutton-1"
+ delegatesanchor="true"
+ collapsed="true"
+ data-l10n-id="bookmarks-toolbar-chevron">
+ <menupopup id="PlacesChevronPopup"
+ is="places-popup"
+ placespopup="true"
+ class="toolbar-menupopup"
+ tooltip="bhTooltip" popupsinherittooltip="true"
+ context="placesContext"
+ onpopupshowing="document.getElementById('PlacesToolbar')
+ ._placesView._onChevronPopupShowing(event);"/>
+ </toolbarbutton>
+ </hbox>
+ </toolbaritem>
+ </toolbar>
+
+ <!-- /ZEN UI -->
+#include zen-browser-box-ui.inc.xhtml
+
<!-- gNotificationBox will be added here lazily. -->
<tabbox id="tabbrowser-tabbox"

33
src/browser/base/content/browser-css.patch Normal file
View File

@@ -0,0 +1,33 @@
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 8a2a20280954eb9db144a723f477e7afc603fda3..0536187962cd2f276c5d7f80d78433b3711a2995 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -2,6 +2,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+@import url("chrome://global/skin/zen-global-shared.css");
+
@namespace html url("http://www.w3.org/1999/xhtml");
:root,
@@ -1526,3 +1528,19 @@ toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
/**
* End Dialogs
*/
+
+/**
+ *
+ * ZEN OVERRIDES
+ */
+
+.content-prompt-dialog > .dialogOverlay {
+ align-content: start;
+}
+
+.dialogBox:not(.spotlightBox) {
+ border: 2px solid var(--zen-dialog-border-color);
+ border-radius: 5px;
+
+ transform: translateY(-8px);
+}

15
src/browser/base/content/navigator-toolbox-inc-xhtml.patch
View File

@@ -1,8 +1,8 @@
diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
index dce7bacdb3678a95dc97085390a7e6102090ffb2..dc1faa983ba7de831026794699a7d90b8dea9d69 100644
index dce7bacdb3678a95dc97085390a7e6102090ffb2..95fe3eeebb13f3804049bb080576572f5df17c09 100644
--- a/browser/base/content/navigator-toolbox.inc.xhtml
+++ b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -107,471 +107,6 @@
@@ -107,476 +107,6 @@
</vbox>
@@ -471,6 +471,11 @@ index dce7bacdb3678a95dc97085390a7e6102090ffb2..dc1faa983ba7de831026794699a7d90b
- </toolbaritem>
- </toolbar>
-
<html:template id="tab-notification-deck-template">
<html:named-deck id="tab-notification-deck"></html:named-deck>
</html:template>
- <html:template id="tab-notification-deck-template">
- <html:named-deck id="tab-notification-deck"></html:named-deck>
- </html:template>
-
-
<html:template id="BrowserToolbarPalette">
<toolbarbutton id="import-button"
class="toolbarbutton-1 chromeclass-toolbar-additional"

468
src/browser/base/content/zen-browser-box-ui.inc.xhtml Normal file
View File

@@ -0,0 +1,468 @@
<toolbar id="nav-bar"
class="browser-toolbar"
data-l10n-id="navbar-accessible"
fullscreentoolbar="true" mode="icons" customizable="true"
customizationtarget="nav-bar-customization-target"
overflowable="true"
default-overflowbutton="nav-bar-overflow-button"
default-overflowtarget="widget-overflow-list"
default-overflowpanel="widget-overflow"
addon-webext-overflowbutton="unified-extensions-button"
addon-webext-overflowtarget="overflowed-extensions-list"
context="toolbar-context-menu">
<toolbartabstop/>
<hbox id="nav-bar-customization-target" flex="1">
<toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
data-l10n-id="toolbar-button-back-2"
removable="false" overflows="false"
keepbroadcastattributeswhencustomizing="true"
command="Browser:BackOrBackDuplicate"
onclick="checkForMiddleClick(this, event);"
tooltip="back-button-tooltip"
context="backForwardMenu"/>
<toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
data-l10n-id="toolbar-button-forward-2"
removable="false" overflows="false"
keepbroadcastattributeswhencustomizing="true"
command="Browser:ForwardOrForwardDuplicate"
onclick="checkForMiddleClick(this, event);"
tooltip="forward-button-tooltip"
context="backForwardMenu"/>
<toolbaritem id="stop-reload-button" class="chromeclass-toolbar-additional"
data-l10n-id="toolbar-button-stop-reload"
removable="true" overflows="false">
<toolbarbutton id="reload-button" class="toolbarbutton-1"
data-l10n-id="toolbar-button-reload"
command="Browser:ReloadOrDuplicate"
onclick="checkForMiddleClick(this, event);"
tooltip="dynamic-shortcut-tooltip">
<box class="toolbarbutton-animatable-box">
<image class="toolbarbutton-animatable-image"/>
</box>
</toolbarbutton>
<toolbarbutton id="stop-button" class="toolbarbutton-1"
data-l10n-id="toolbar-button-stop"
command="Browser:Stop"
tooltip="dynamic-shortcut-tooltip">
<box class="toolbarbutton-animatable-box">
<image class="toolbarbutton-animatable-image"/>
</box>
</toolbarbutton>
</toolbaritem>
<toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
<toolbaritem id="urlbar-container"
removable="false"
class="chromeclass-location" overflows="false">
<toolbartabstop/>
<hbox id="urlbar" flex="1"
context=""
focused="true"
pageproxystate="invalid">
<hbox id="urlbar-background"/>
<hbox id="urlbar-input-container"
flex="1"
pageproxystate="invalid">
<box id="remote-control-box"
align="center"
collapsed="true">
<image id="remote-control-icon"/>
</box>
<box id="urlbar-search-button"
class="chromeclass-toolbar-additional"/>
<!-- Use onclick instead of normal popup= syntax since the popup
code fires onmousedown, and hence eats our favicon drag events. -->
<box id="tracking-protection-icon-container" align="center"
role="button"
onclick="gProtectionsHandler.handleProtectionsButtonEvent(event);"
onkeypress="gProtectionsHandler.handleProtectionsButtonEvent(event);"
onmouseover="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
onfocus="gProtectionsHandler.onTrackingProtectionIconHoveredOrFocused();"
tooltip="tracking-protection-icon-tooltip">
<box id="tracking-protection-icon-box">
<image id="tracking-protection-icon"/>
</box>
<tooltip id="tracking-protection-icon-tooltip">
<description id="tracking-protection-icon-tooltip-label" class="tooltip-label"/>
</tooltip>
</box>
<box id="identity-box"
pageproxystate="invalid"
ondragstart="gIdentityHandler.onDragStart(event);">
<box id="identity-icon-box"
role="button"
align="center"
data-l10n-id="urlbar-identity-button"
class="identity-box-button"
onclick="gIdentityHandler.handleIdentityButtonEvent(event); PageProxyClickHandler(event);"
onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);">
<image id="identity-icon"/>
<label id="identity-icon-label" class="plain" crop="center" flex="1"/>
</box>
<box id="identity-permission-box"
data-l10n-id="urlbar-permissions-granted"
role="button"
align="center"
class="identity-box-button"
onclick="gPermissionPanel.handleIdentityButtonEvent(event); PageProxyClickHandler(event);"
onkeypress="gPermissionPanel.handleIdentityButtonEvent(event);">
<image id="permissions-granted-icon"/>
<box style="pointer-events: none;">
<image class="sharing-icon" id="webrtc-sharing-icon"/>
<image class="sharing-icon geo-icon" id="geo-sharing-icon"/>
<image class="sharing-icon xr-icon" id="xr-sharing-icon"/>
</box>
<box id="blocked-permissions-container" align="center">
<image data-permission-id="geo" class="blocked-permission-icon geo-icon" role="button"
data-l10n-id="urlbar-geolocation-blocked"/>
<image data-permission-id="xr" class="blocked-permission-icon xr-icon" role="button"
data-l10n-id="urlbar-xr-blocked"/>
<image data-permission-id="desktop-notification" class="blocked-permission-icon desktop-notification-icon" role="button"
data-l10n-id="urlbar-web-notifications-blocked"/>
<image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button"
data-l10n-id="urlbar-camera-blocked"/>
<image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button"
data-l10n-id="urlbar-microphone-blocked"/>
<image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button"
data-l10n-id="urlbar-screen-blocked"/>
<image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button"
data-l10n-id="urlbar-persistent-storage-blocked"/>
<image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
data-l10n-id="urlbar-popup-blocked"/>
<image data-permission-id="autoplay-media" class="blocked-permission-icon autoplay-media-icon" role="button"
data-l10n-id="urlbar-autoplay-media-blocked"/>
<image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button"
data-l10n-id="urlbar-canvas-blocked"/>
<image data-permission-id="midi" class="blocked-permission-icon midi-icon" role="button"
data-l10n-id="urlbar-midi-blocked"/>
<image data-permission-id="install" class="blocked-permission-icon install-icon" role="button"
data-l10n-id="urlbar-install-blocked"/>
<!-- A speaker icon for blocked speaker selection is not
shown because, without text, this may be interpreted as
active or blocked audio. -->
</box>
</box>
<box id="notification-popup-box"
class="anchor-root"
hidden="true"
align="center">
<image id="default-notification-icon" class="notification-anchor-icon" role="button"
data-l10n-id="urlbar-default-notification-anchor"/>
<image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
data-l10n-id="urlbar-geolocation-notification-anchor"/>
<image id="xr-notification-icon" class="notification-anchor-icon xr-icon" role="button"
data-l10n-id="urlbar-xr-notification-anchor"/>
<image id="autoplay-media-notification-icon" class="notification-anchor-icon autoplay-media-icon" role="button"
data-l10n-id="urlbar-autoplay-notification-anchor"/>
<image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
data-l10n-id="urlbar-addons-notification-anchor"/>
<image id="canvas-notification-icon" class="notification-anchor-icon" role="button"
data-l10n-id="urlbar-canvas-notification-anchor"/>
<image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
data-l10n-id="urlbar-indexed-db-notification-anchor"/>
<image id="password-notification-icon" class="notification-anchor-icon" role="button"
data-l10n-id="urlbar-password-notification-anchor"/>
<image id="web-notifications-notification-icon" class="notification-anchor-icon desktop-notification-icon" role="button"
data-l10n-id="urlbar-web-notification-anchor"/>
<image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button"
data-l10n-id="urlbar-web-rtc-share-devices-notification-anchor"/>
<image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button"
data-l10n-id="urlbar-web-rtc-share-microphone-notification-anchor"/>
<image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button"
data-l10n-id="urlbar-web-rtc-share-screen-notification-anchor"/>
<image id="webRTC-shareSpeaker-notification-icon" class="notification-anchor-icon speaker-icon" role="button"
data-l10n-id="urlbar-web-rtc-share-speaker-notification-anchor"/>
<image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button"
data-l10n-id="urlbar-services-notification-anchor"/>
<image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button"
data-l10n-id="urlbar-eme-notification-anchor"/>
<image id="persistent-storage-notification-icon" class="notification-anchor-icon persistent-storage-icon" role="button"
data-l10n-id="urlbar-persistent-storage-notification-anchor"/>
<image id="midi-notification-icon" class="notification-anchor-icon midi-icon" role="button"
data-l10n-id="urlbar-midi-notification-anchor"/>
<image id="webauthn-notification-icon" class="notification-anchor-icon" role="button"
data-l10n-id="urlbar-web-authn-anchor"/>
<image id="identity-credential-notification-icon" class="notification-anchor-icon" role="button"
data-l10n-id="identity-credential-urlbar-anchor"/>
<image id="storage-access-notification-icon" class="notification-anchor-icon storage-access-icon" role="button"
data-l10n-id="urlbar-storage-access-anchor"/>
</box>
</box>
<box id="urlbar-label-box" align="center">
<label id="urlbar-label-switchtab" class="urlbar-label" data-l10n-id="urlbar-switch-to-tab"/>
<label id="urlbar-label-extension" class="urlbar-label" data-l10n-id="urlbar-extension"/>
<label id="urlbar-label-search-mode" class="urlbar-label"/>
</box>
<html:div id="urlbar-search-mode-indicator">
<html:span id="urlbar-search-mode-indicator-title"/>
<html:div id="urlbar-search-mode-indicator-close"
class="close-button"
role="button"
aria-labelledby="urlbar-search-mode-indicator-close urlbar-search-mode-indicator-title"
data-l10n-id="urlbar-search-mode-indicator-close"/>
</html:div>
<moz-input-box tooltip="aHTMLTooltip"
class="urlbar-input-box"
flex="1"
role="combobox"
aria-owns="urlbar-results">
<html:input id="urlbar-scheme"
required="required"/>
<html:input id="urlbar-input"
anonid="input"
aria-controls="urlbar-results"
aria-autocomplete="both"
inputmode="mozAwesomebar"
data-l10n-id="urlbar-placeholder"
data-l10n-attrs="placeholder"/>
</moz-input-box>
<image id="urlbar-go-button"
class="urlbar-icon"
role="button"
keyNav="false"
onclick="gURLBar.handleCommand(event);"
data-l10n-id="urlbar-go-button"/>
<hbox id="page-action-buttons" context="pageActionContextMenu" align="center">
<toolbartabstop/>
<hbox id="contextual-feature-recommendation" role="button" hidden="true">
<hbox id="cfr-label-container">
<label id="cfr-label"/>
</hbox>
<hbox id="cfr-button"
role="presentation"
class="urlbar-page-action">
<image class="urlbar-icon"/>
</hbox>
</hbox>
<hbox id="userContext-icons" hidden="true">
<label id="userContext-label"/>
<image id="userContext-indicator"/>
</hbox>
<hbox id="reader-mode-button"
class="urlbar-page-action"
role="button"
data-l10n-id="reader-view-enter-button"
hidden="true"
tooltip="dynamic-shortcut-tooltip"
onclick="AboutReaderParent.buttonClick(event);">
<image id="reader-mode-button-icon"
class="urlbar-icon"/>
</hbox>
<hbox id="picture-in-picture-button"
class="urlbar-page-action"
role="button"
hidden="true"
onclick="PictureInPicture.toggleUrlbar(event)">
<image id="picture-in-picture-button-icon"
class="urlbar-icon"/>
</hbox>
<hbox id="translations-button"
class="urlbar-page-action"
role="button"
data-l10n-id="urlbar-translations-button2"
hidden="true"
onclick="TranslationsPanel.open(event);"
onkeypress="TranslationsPanel.open(event);">
<image class="urlbar-icon" id="translations-button-icon" />
<image class="urlbar-icon" id="translations-button-circle-arrows" />
<html:span id="translations-button-locale" aria-hidden="true" />
</hbox>
<hbox id="shopping-sidebar-button"
class="urlbar-page-action"
role="button"
data-l10n-id="shopping-sidebar-open-button2"
hidden="true"
onclick="ShoppingSidebarParent.urlbarButtonClick(event);">
<image id="shopping-sidebar-button-icon"
class="urlbar-icon"/>
</hbox>
<toolbarbutton id="urlbar-zoom-button"
onclick="FullZoom.resetFromURLBar(event);"
tooltip="dynamic-shortcut-tooltip"
hidden="true"/>
<hbox id="pageActionButton"
class="urlbar-page-action"
role="button"
data-l10n-id="urlbar-page-action-button"
onmousedown="BrowserPageActions.mainButtonClicked(event);"
onkeypress="BrowserPageActions.mainButtonClicked(event);">
<image class="urlbar-icon"/>
</hbox>
<hbox id="star-button-box"
hidden="true"
role="button"
class="urlbar-page-action"
onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);">
<image id="star-button"
class="urlbar-icon"/>
</hbox>
</hbox>
</hbox>
</hbox>
<toolbartabstop/>
</toolbaritem>
<toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
<toolbarbutton id="downloads-button"
class="toolbarbutton-1 chromeclass-toolbar-additional"
delegatesanchor="true"
badged="true"
key="key_openDownloads"
onmousedown="DownloadsIndicatorView.onCommand(event);"
onkeypress="DownloadsIndicatorView.onCommand(event);"
ondrop="DownloadsIndicatorView.onDrop(event);"
ondragover="DownloadsIndicatorView.onDragOver(event);"
ondragenter="DownloadsIndicatorView.onDragOver(event);"
data-l10n-id="navbar-downloads"
removable="true"
overflows="false"
cui-areatype="toolbar"
hidden="true"
tooltip="dynamic-shortcut-tooltip">
<box id="downloads-indicator-anchor"
consumeanchor="downloads-button">
<image id="downloads-indicator-icon"/>
</box>
<box class="toolbarbutton-animatable-box" id="downloads-indicator-progress-outer">
<box id="downloads-indicator-progress-inner"/>
</box>
<box class="toolbarbutton-animatable-box" id="downloads-indicator-start-box">
<image class="toolbarbutton-animatable-image" id="downloads-indicator-start-image"/>
</box>
<box class="toolbarbutton-animatable-box" id="downloads-indicator-finish-box">
<image class="toolbarbutton-animatable-image" id="downloads-indicator-finish-image"/>
</box>
</toolbarbutton>
<toolbarbutton id="fxa-toolbar-menu-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
badged="true"
delegatesanchor="true"
onmousedown="gSync.toggleAccountPanel(this, event)"
onkeypress="gSync.toggleAccountPanel(this, event)"
consumeanchor="fxa-toolbar-menu-button"
closemenu="none"
data-l10n-id="toolbar-button-account"
cui-areatype="toolbar"
removable="true">
<vbox>
<image id="fxa-avatar-image"/>
</vbox>
</toolbarbutton>
<toolbarbutton id="unified-extensions-button"
class="toolbarbutton-1 chromeclass-toolbar-additional"
delegatesanchor="true"
data-l10n-id="unified-extensions-button"
hidden="true"
onkeypress="gUnifiedExtensions.togglePanel(event)"
onmousedown="gUnifiedExtensions.togglePanel(event)"
overflows="false"
removable="false"/>
</hbox>
<toolbarbutton id="nav-bar-overflow-button"
class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
delegatesanchor="true"
skipintoolbarset="true"
data-l10n-id="navbar-overflow">
<box class="toolbarbutton-animatable-box">
<image class="toolbarbutton-animatable-image"/>
</box>
</toolbarbutton>
<toolbaritem id="PanelUI-button"
removable="false">
<toolbarbutton id="ion-button"
class="toolbarbutton-1"
delegatesanchor="true"
hidden="true"
badged="true"
tooltiptext="Ion"
onmousedown="switchToTabHavingURI('about:ion', true);"
onkeypress="switchToTabHavingURI('about:ion', true);"/>
<toolbarbutton id="whats-new-menu-button"
class="toolbarbutton-1"
delegatesanchor="true"
hidden="true"
badged="true"
onmousedown="PanelUI.showSubView('PanelUI-whatsNew', this, event);"
onkeypress="PanelUI.showSubView('PanelUI-whatsNew', this, event);"/>
<toolbarbutton id="PanelUI-menu-button"
class="toolbarbutton-1"
delegatesanchor="true"
badged="true"
consumeanchor="PanelUI-button"
data-l10n-id="appmenu-menu-button-closed2"/>
</toolbaritem>
</toolbar>
<toolbar id="PersonalToolbar"
mode="icons"
class="browser-toolbar chromeclass-directories"
context="toolbar-context-menu"
data-l10n-id="bookmarks-toolbar"
data-l10n-attrs="toolbarname"
customizable="true">
<toolbartabstop skipintoolbarset="true"/>
<hbox id="personal-toolbar-empty" skipintoolbarset="true" removable="false" hidden="true">
<description id="personal-toolbar-empty-description"
data-l10n-id="bookmarks-toolbar-empty-message"
onclick="BookmarkingUI.openLibraryIfLinkClicked(event);"
onkeydown="BookmarkingUI.openLibraryIfLinkClicked(event);">
<html:a data-l10n-name="manage-bookmarks" class="text-link" tabindex="0"/>
</description>
</hbox>
<toolbaritem id="personal-bookmarks"
data-l10n-id="bookmarks-toolbar-placeholder"
cui-areatype="toolbar"
removable="true">
<toolbarbutton id="bookmarks-toolbar-placeholder"
class="bookmark-item"
data-l10n-id="bookmarks-toolbar-placeholder-button"/>
<toolbarbutton id="bookmarks-toolbar-button"
class="toolbarbutton-1"
delegatesanchor="true"
flex="1"
data-l10n-id="bookmarks-toolbar-placeholder-button"
oncommand="PlacesToolbarHelper.onPlaceholderCommand();"/>
<hbox flex="1"
id="PlacesToolbar"
context="placesContext"
onmouseup="BookmarksEventHandler.onMouseUp(event);"
onclick="BookmarksEventHandler.onClick(event, this._placesView);"
oncommand="BookmarksEventHandler.onCommand(event);"
tooltip="bhTooltip"
popupsinherittooltip="true">
<hbox id="PlacesToolbarDropIndicatorHolder" align="center" collapsed="true">
<image id="PlacesToolbarDropIndicator"
collapsed="true"/>
</hbox>
<scrollbox orient="horizontal"
id="PlacesToolbarItems"
flex="1"/>
<toolbarbutton type="menu"
id="PlacesChevron"
class="toolbarbutton-1"
delegatesanchor="true"
collapsed="true"
data-l10n-id="bookmarks-toolbar-chevron">
<menupopup id="PlacesChevronPopup"
is="places-popup"
placespopup="true"
class="toolbar-menupopup"
tooltip="bhTooltip" popupsinherittooltip="true"
context="placesContext"
onpopupshowing="document.getElementById('PlacesToolbar')
._placesView._onChevronPopupShowing(event);"/>
</toolbarbutton>
</hbox>
</toolbaritem>
</toolbar>
<html:template id="tab-notification-deck-template">
<html:named-deck id="tab-notification-deck"></html:named-deck>
</html:template>

12
src/browser/components/controlcenter/content/protectionsPanel-inc-xhtml.patch Normal file
View File

@@ -0,0 +1,12 @@
diff --git a/browser/components/controlcenter/content/protectionsPanel.inc.xhtml b/browser/components/controlcenter/content/protectionsPanel.inc.xhtml
index 29927139181e40fa9779038f996a08a2afc6f76b..60189b023e12fdbfe17bea5a28c34de6e54a3b7d 100644
--- a/browser/components/controlcenter/content/protectionsPanel.inc.xhtml
+++ b/browser/components/controlcenter/content/protectionsPanel.inc.xhtml
@@ -8,6 +8,7 @@
type="arrow"
role="alertdialog"
noautofocus="true"
+ infoMessageShowing=""
aria-labelledby="protections-popup-main-header-label"
onpopupshown="gProtectionsHandler.onPopupShown(event);ReportBrokenSite.updateParentMenu(event)"
onpopuphidden="gProtectionsHandler.onPopupHidden(event);"

15
src/browser/components/customizableui/CustomizableUI-sys-mjs.patch Normal file
View File

@@ -0,0 +1,15 @@
diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
index d748b93a92455f6349b8199d2f27381f53fee01d..4183758ae427e7f1c8500ad064fecbacdf2b81ac 100644
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
@@ -249,10 +249,7 @@ var CustomizableUIInternal = {
Services.policies.isAllowed("removeHomeButtonByDefault")
? null
: "home-button",
- "spring",
"urlbar-container",
- "spring",
- "save-to-pocket-button",
"downloads-button",
AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
"fxa-toolbar-menu-button",

35
src/browser/themes/addons/dark/manifest-json.patch Normal file
View File

@@ -0,0 +1,35 @@
diff --git a/browser/themes/addons/dark/manifest.json b/browser/themes/addons/dark/manifest.json
index 544986d5e93c033f944cf301af79e0750864a32c..8dde35169cf6bcdce24ea1e656da1a428d68012c 100644
--- a/browser/themes/addons/dark/manifest.json
+++ b/browser/themes/addons/dark/manifest.json
@@ -7,9 +7,9 @@
}
},
- "name": "Dark",
+ "name": "Zen Dark",
"description": "A theme with a dark color scheme.",
- "author": "Mozilla",
+ "author": "Zen",
"version": "1.2",
"icons": { "32": "icon.svg" },
@@ -44,13 +44,13 @@
"button": "rgba(0, 0, 0, .33)",
"button_hover": "rgba(207, 207, 216, .20)",
"button_active": "rgba(207, 207, 216, .40)",
- "button_primary": "rgb(0, 221, 255)",
- "button_primary_hover": "rgb(128, 235, 255)",
- "button_primary_active": "rgb(170, 242, 255)",
- "button_primary_color": "rgb(43, 42, 51)",
+ "button_primary": "#fff",
+ "button_primary_hover": "rgb(207, 207, 216)",
+ "button_primary_active": "rgb(207, 207, 216)",
+ "button_primary_color": "#000",
"input_background": "#42414D",
"input_color": "rgb(251,251,254)",
- "input_border": "#8f8f9d",
+ "input_border": "#fff",
"urlbar_popup_separator": "rgb(82,82,94)",
"appmenu_update_icon_color": "#54FFBD",
"appmenu_info_icon_color": "#80EBFF",

40
src/browser/themes/addons/light/manifest-json.patch Normal file
View File

@@ -0,0 +1,40 @@
diff --git a/browser/themes/addons/light/manifest.json b/browser/themes/addons/light/manifest.json
index 7385970fa8e3ff9659b72cfb238003958220fb0d..0b3139f6c7d50a6d19083d385c701a0e338fd3be 100644
--- a/browser/themes/addons/light/manifest.json
+++ b/browser/themes/addons/light/manifest.json
@@ -7,7 +7,7 @@
}
},
- "name": "Light",
+ "name": "Zen Light",
"description": "A theme with a light color scheme.",
"author": "Mozilla",
"version": "1.2",
@@ -42,12 +42,12 @@
"button": "rgba(207,207,216,.33)",
"button_hover": "rgba(207,207,216,.66)",
"button_active": "rgb(207,207,216)",
- "button_primary": "rgb(0, 97, 224)",
- "button_primary_hover": "rgb(2, 80, 187)",
- "button_primary_active": "rgb(5, 62, 148)",
- "button_primary_color": "rgb(251, 251, 254)",
+ "button_primary": "#000",
+ "button_primary_hover": "rgb(31, 31, 31)",
+ "button_primary_active": "rgb(207,207,216)",
+ "button_primary_color": "#fff",
"input_color": "rgb(21,20,26)",
- "input_background": "rgb(255,255,255)",
+ "input_background": "#f0f0f4",
"urlbar_popup_hover": "rgb(240,240,244)",
"urlbar_popup_separator": "rgb(240,240,244)",
"appmenu_update_icon_color": "#2AC3A2",
@@ -61,7 +61,7 @@
"panel_active": "color-mix(in srgb, currentColor 20%, transparent)",
"panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)",
"toolbar_field_icon_opacity": "0.72",
- "input_border_color": "color-mix(in srgb, currentColor 41%, transparent)",
+ "input_border_color": "rgba(0, 0, 0, .3)",
"zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
}
},

22
src/browser/themes/shared/browser-custom-colors-css.patch Normal file
View File

@@ -0,0 +1,22 @@
diff --git a/browser/themes/shared/browser-custom-colors.css b/browser/themes/shared/browser-custom-colors.css
index d98d56690f8e01fbf5cbb5050b2c71b726ed7323..5c14d3a57f6d9c17c43c934c7b8cb7f0a525d5d5 100644
--- a/browser/themes/shared/browser-custom-colors.css
+++ b/browser/themes/shared/browser-custom-colors.css
@@ -6,7 +6,7 @@
@media not (prefers-contrast) {
:root:not(:-moz-lwtheme) {
- --button-primary-bgcolor: light-dark(rgb(0, 97, 224), rgb(0, 221, 255));
+ --button-primary-bgcolor: light-dark(#000, #fff);
--button-primary-hover-bgcolor: light-dark(rgb(2, 80, 187), rgb(128, 235, 255));
--button-primary-active-bgcolor: light-dark(rgb(5, 62, 148), rgb(170, 242, 255));
--button-primary-color: light-dark(rgb(251, 251, 254), rgb(43, 42, 51));
@@ -50,7 +50,7 @@
--tab-attention-icon-color: light-dark(rgb(42, 195, 162), rgb(84, 255, 189));
--tabs-navbar-shadow-color: transparent;
- --toolbox-non-lwt-bgcolor: light-dark(rgb(240, 240, 244), rgb(28, 27, 34));
+ --toolbox-non-lwt-bgcolor: light-dark(rgb(210, 210, 213), rgb(28, 27, 34));
--toolbox-non-lwt-textcolor: light-dark(rgb(21, 20, 26), rgb(251, 251, 254));
--toolbox-non-lwt-bgcolor-inactive: var(--toolbox-non-lwt-bgcolor);
--toolbox-non-lwt-textcolor-inactive: var(--toolbox-non-lwt-textcolor);

9
src/browser/themes/shared/browser-shared-css.patch
View File

@@ -1,18 +1,17 @@
diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
index 164b54bd857e5782e3885dcde5663f336de737de..a14daf131ddaf7db7675444a16cd0d63f00ca86f 100644
index 164b54bd857e5782e3885dcde5663f336de737de..d7cf63c4ac84f00641c4ac9bfa407beb2f027c60 100644
--- a/browser/themes/shared/browser-shared.css
+++ b/browser/themes/shared/browser-shared.css
@@ -24,6 +24,9 @@
@@ -24,6 +24,8 @@
@import url("chrome://browser/skin/UITour.css");
@import url("chrome://browser/skin/formautofill-notification.css");
+@import url("chrome://browser/skin/zen-browser-shared.css");
+@import url("chrome://browser/skin/browser-custom-colors.css");
+
@namespace html url("http://www.w3.org/1999/xhtml");
:root {
@@ -152,9 +155,6 @@
@@ -152,9 +154,6 @@
#navigator-toolbox {
appearance: none;
@@ -22,7 +21,7 @@ index 164b54bd857e5782e3885dcde5663f336de737de..a14daf131ddaf7db7675444a16cd0d63
background-color: var(--toolbox-non-lwt-bgcolor);
color: var(--toolbox-non-lwt-textcolor);
@@ -162,33 +162,8 @@
@@ -162,33 +161,8 @@
transition: background-color var(--inactive-window-transition);
&:-moz-window-inactive {

2
src/browser/themes/shared/zen-browser-shared.css
View File

@@ -1,4 +1,4 @@
#navigator-toolbox toolbar#TabsToolbar {
margin: 5px 10px;
margin: 5px 0.5%;
}

23
src/toolkit/content/widgets/infobar-css.patch Normal file
View File

@@ -0,0 +1,23 @@
diff --git a/toolkit/content/widgets/infobar.css b/toolkit/content/widgets/infobar.css
index ee811818b524d41af2c89ac034083592dac333fb..c943f2a5a168120666132a34e71b86d608b1045e 100644
--- a/toolkit/content/widgets/infobar.css
+++ b/toolkit/content/widgets/infobar.css
@@ -97,3 +97,18 @@ strong {
:host([type=system]) .content {
margin-inline-start: 0;
}
+
+/**
+ * Zen Override
+ */
+:host(.infobar) {
+ --info-bar-background-color: transparent !important;
+ margin: 0;
+ border: 0;
+ border-top: 1px solid var(--arrowpanel-border-color);
+
+ &::before {
+ border-start-start-radius: 0px;
+ border-end-start-radius: 0px;
+ }
+}

1
src/toolkit/content/zen-xul.css
View File

@@ -1,6 +1,7 @@
html#main-window > body {
--zen-main-browser-background: rgb(229, 229, 229);
}
@media (prefers-color-scheme: dark) {

5
src/toolkit/themes/shared/desktop-jar-inc-mn.patch
View File

@@ -1,9 +1,10 @@
diff --git a/toolkit/themes/shared/desktop-jar.inc.mn b/toolkit/themes/shared/desktop-jar.inc.mn
index 6f504132c2459a0a476a7a440beef6794d52097e..3638ec92cc631841c8adebe4c842c9761a2bd6a9 100644
index 6f504132c2459a0a476a7a440beef6794d52097e..a66f430a0460f131f790d265ca401a8c5681bea1 100644
--- a/toolkit/themes/shared/desktop-jar.inc.mn
+++ b/toolkit/themes/shared/desktop-jar.inc.mn
@@ -151,3 +151,4 @@
@@ -151,3 +151,5 @@
skin/classic/global/reader/RM-Content-Width-Plus-44x16.svg (../../shared/reader/RM-Content-Width-Plus-44x16.svg)
skin/classic/global/reader/RM-Line-Height-Minus-38x14.svg (../../shared/reader/RM-Line-Height-Minus-38x14.svg)
skin/classic/global/reader/RM-Line-Height-Plus-38x24.svg (../../shared/reader/RM-Line-Height-Plus-38x24.svg)
+ skin/classic/global/in-content/zen-common-shared.css (../../shared/in-content/zen-common-shared.css)
+ skin/classic/global/zen-global-shared.css (../../shared/zen-global-shared.css)

7
src/toolkit/themes/shared/in-content/zen-common-shared.css
View File

@@ -8,6 +8,7 @@
--in-content-primary-button-border-active: transparent !important;
--in-content-page-background: #F9F9FB !important;
--zen-in-content-dialog-background: var(--in-content-page-background);
}
@media (prefers-color-scheme: dark) {
@@ -23,5 +24,11 @@
--in-content-primary-button-text-color-hover: #000 !important;
--in-content-page-background: #2B2A33 !important;
--zen-in-content-dialog-background: rgb(28, 28, 32);
}
}
window#commonDialogWindow {
background-color: var(--zen-in-content-dialog-background) !important;
}

25
src/toolkit/themes/shared/zen-global-shared.css Normal file
View File

@@ -0,0 +1,25 @@
:root {
--zen-dialog-background: Field;
--zen-dialog-border-color: rgb(184, 184, 184);
--arrowpanel-background: var(--zen-dialog-background) !important;
--arrowpanel-border-color: var(--zen-dialog-border-color) !important;
--arrowpanel-border-radius: 4px !important;
&:-moz-lwtheme {
color: var(--lwt-text-color);
--link-color: light-dark(rgb(0, 97, 224), rgb(0, 221, 255));
@media not (prefers-contrast) {
--focus-outline-color: light-dark(rgb(92, 91, 91), rgb(166, 166, 166)) !important;
}
}
}
@media (prefers-color-scheme: dark) {
:root {
--zen-dialog-background: rgba(28, 27, 34);
--zen-dialog-border-color: rgb(66, 66, 66);
}
}

20
src/widget/ThemeColors-h.patch Normal file
View File

@@ -0,0 +1,20 @@
diff --git a/widget/ThemeColors.h b/widget/ThemeColors.h
index 739a7ca0f0ff4d1647c5c204b49ba7cc157c76fd..86a89bc890ec5ef824f0a0295876fddb9e363c7c 100644
--- a/widget/ThemeColors.h
+++ b/widget/ThemeColors.h
@@ -13,8 +13,14 @@
namespace mozilla::widget {
+#ifndef ZEN_DEFAULT_ACCENT_COLOR
+// Like a normal hex code:
+// 0xRRGGBBAA
+#define ZEN_DEFAULT_ACCENT_COLOR 0x000000df
+#endif
+
static constexpr gfx::sRGBColor sDefaultAccent(
- gfx::sRGBColor::UnusualFromARGB(0xff0060df)); // Luminance: 13.69346%
+ gfx::sRGBColor::UnusualFromARGB(ZEN_DEFAULT_ACCENT_COLOR)); // Luminance: 13.69346%
static constexpr gfx::sRGBColor sDefaultAccentText(
gfx::sRGBColor::OpaqueWhite());