mirror of
https://github.com/zen-browser/desktop.git
synced 2025-10-04 17:06:35 +00:00
Separated tabs from title tab and changed UI
This commit is contained in:
@@ -1 +1 @@
|
|||||||
3
|
8
|
479
src/browser/base/content/browser-box-inc-xhtml.patch
Normal file
479
src/browser/base/content/browser-box-inc-xhtml.patch
Normal file
@@ -0,0 +1,479 @@
|
|||||||
|
diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
|
||||||
|
index d445abe7e743b2ec5d46d42f8f149c000e3c7997..67eba2cf4c4d81ab80713f636c33717eb1f8e92e 100644
|
||||||
|
--- a/browser/base/content/browser-box.inc.xhtml
|
||||||
|
+++ b/browser/base/content/browser-box.inc.xhtml
|
||||||
|
@@ -18,6 +18,474 @@
|
||||||
|
</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 -->
|
||||||
|
+
|
||||||
|
<!-- gNotificationBox will be added here lazily. -->
|
||||||
|
<tabbox id="tabbrowser-tabbox"
|
||||||
|
flex="1" tabcontainer="tabbrowser-tabs">
|
476
src/browser/base/content/navigator-toolbox-inc-xhtml.patch
Normal file
476
src/browser/base/content/navigator-toolbox-inc-xhtml.patch
Normal file
@@ -0,0 +1,476 @@
|
|||||||
|
diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
|
||||||
|
index dce7bacdb3678a95dc97085390a7e6102090ffb2..dc1faa983ba7de831026794699a7d90b8dea9d69 100644
|
||||||
|
--- a/browser/base/content/navigator-toolbox.inc.xhtml
|
||||||
|
+++ b/browser/base/content/navigator-toolbox.inc.xhtml
|
||||||
|
@@ -107,471 +107,6 @@
|
||||||
|
|
||||||
|
</vbox>
|
||||||
|
|
||||||
|
- <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>
|
58
src/browser/themes/shared/browser-shared-css.patch
Normal file
58
src/browser/themes/shared/browser-shared-css.patch
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
|
||||||
|
index 164b54bd857e5782e3885dcde5663f336de737de..a14daf131ddaf7db7675444a16cd0d63f00ca86f 100644
|
||||||
|
--- a/browser/themes/shared/browser-shared.css
|
||||||
|
+++ b/browser/themes/shared/browser-shared.css
|
||||||
|
@@ -24,6 +24,9 @@
|
||||||
|
@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 @@
|
||||||
|
#navigator-toolbox {
|
||||||
|
appearance: none;
|
||||||
|
|
||||||
|
- /* Toolbar / content area border */
|
||||||
|
- border-bottom: 1px solid var(--chrome-content-separator-color);
|
||||||
|
-
|
||||||
|
background-color: var(--toolbox-non-lwt-bgcolor);
|
||||||
|
color: var(--toolbox-non-lwt-textcolor);
|
||||||
|
|
||||||
|
@@ -162,33 +162,8 @@
|
||||||
|
transition: background-color var(--inactive-window-transition);
|
||||||
|
|
||||||
|
&:-moz-window-inactive {
|
||||||
|
- background-color: var(--toolbox-non-lwt-bgcolor-inactive);
|
||||||
|
color: var(--toolbox-non-lwt-textcolor-inactive);
|
||||||
|
}
|
||||||
|
-
|
||||||
|
- :root[customizing] & {
|
||||||
|
- border-bottom-style: none;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- &:-moz-lwtheme {
|
||||||
|
- background-image: var(--lwt-additional-images);
|
||||||
|
- background-repeat: var(--lwt-background-tiling);
|
||||||
|
- background-position: var(--lwt-background-alignment);
|
||||||
|
- background-color: var(--lwt-accent-color);
|
||||||
|
- color: inherit;
|
||||||
|
-
|
||||||
|
- &:-moz-window-inactive {
|
||||||
|
- background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- /* When a theme defines both theme_frame and additional_backgrounds, show
|
||||||
|
- the latter atop the former. */
|
||||||
|
- :root[lwtheme-image] & {
|
||||||
|
- background-image: var(--lwt-header-image), var(--lwt-additional-images);
|
||||||
|
- background-repeat: no-repeat, var(--lwt-background-tiling);
|
||||||
|
- background-position: right top, var(--lwt-background-alignment);
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
|
||||||
|
.browser-toolbar {
|
11
src/browser/themes/shared/jar-inc-mn.patch
Normal file
11
src/browser/themes/shared/jar-inc-mn.patch
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
|
||||||
|
index 37b5f04cddde9a3769d31c6e3a93b43da76f44e5..aa8eeb8627521cfee9c6ef827c3509c6323d6d9d 100644
|
||||||
|
--- a/browser/themes/shared/jar.inc.mn
|
||||||
|
+++ b/browser/themes/shared/jar.inc.mn
|
||||||
|
@@ -285,3 +285,5 @@
|
||||||
|
skin/classic/browser/weather/night-partly-cloudy-with-showers.svg (../shared/weather/night-partly-cloudy-with-showers.svg)
|
||||||
|
skin/classic/browser/weather/night-partly-cloudy-with-thunderstorms.svg (../shared/weather/night-partly-cloudy-with-thunderstorms.svg)
|
||||||
|
skin/classic/browser/weather/night-mostly-cloudy-with-flurries.svg (../shared/weather/night-mostly-cloudy-with-flurries.svg)
|
||||||
|
+
|
||||||
|
+ skin/classic/browser/zen-browser-shared.css (../shared/zen-browser-shared.css)
|
||||||
|
\ No newline at end of file
|
13
src/browser/themes/shared/tabs-css.patch
Normal file
13
src/browser/themes/shared/tabs-css.patch
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/browser/themes/shared/tabs.css b/browser/themes/shared/tabs.css
|
||||||
|
index eb92f71e5942a19618fd74492354de78ac03bacf..0ba9a169b1a8937e8cdf39fa1fe8e5f14e09c306 100644
|
||||||
|
--- a/browser/themes/shared/tabs.css
|
||||||
|
+++ b/browser/themes/shared/tabs.css
|
||||||
|
@@ -633,7 +633,7 @@
|
||||||
|
toolbarbutton:not(#firefox-view-button),
|
||||||
|
toolbarpaletteitem:not(#wrapper-firefox-view-button)
|
||||||
|
) + #tabbrowser-tabs {
|
||||||
|
- border-inline-start: 1px solid color-mix(in srgb, currentColor 25%, transparent);
|
||||||
|
+ border-inline-start: transparent;
|
||||||
|
padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px);
|
||||||
|
margin-inline-start: 2px;
|
||||||
|
}
|
4
src/browser/themes/shared/zen-browser-shared.css
Normal file
4
src/browser/themes/shared/zen-browser-shared.css
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
|
||||||
|
#navigator-toolbox toolbar#TabsToolbar {
|
||||||
|
margin: 5px 10px;
|
||||||
|
}
|
@@ -1,16 +1,25 @@
|
|||||||
|
|
||||||
|
html#main-window > body {
|
||||||
|
--zen-main-browser-background: rgb(229, 229, 229);
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
html#main-window > body {
|
||||||
|
--zen-main-browser-background: rgb(53, 52, 61);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
html#main-window > body > toolbox#navigator-toolbox,
|
||||||
hbox#browser {
|
hbox#browser {
|
||||||
background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
|
background-color: var(--zen-main-browser-background) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
#nav-bar {
|
#appcontent {
|
||||||
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
THIS SHOULD BE JOINED WITH #nav-bar! TODOOOOOO!
|
|
||||||
*/
|
|
||||||
#tabbrowser-tabpanels browser[type="content"][primary] {
|
|
||||||
border-radius: 7px;
|
border-radius: 7px;
|
||||||
|
overflow: hidden;
|
||||||
box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
|
box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
|
||||||
margin: 10px;
|
margin: 10px;
|
||||||
|
|
||||||
|
margin-top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -6,6 +6,8 @@
|
|||||||
--in-content-primary-button-border-color: transparent !important;
|
--in-content-primary-button-border-color: transparent !important;
|
||||||
--in-content-primary-button-border-hover: transparent !important;
|
--in-content-primary-button-border-hover: transparent !important;
|
||||||
--in-content-primary-button-border-active: transparent !important;
|
--in-content-primary-button-border-active: transparent !important;
|
||||||
|
|
||||||
|
--in-content-page-background: #F9F9FB !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
@media (prefers-color-scheme: dark) {
|
||||||
@@ -19,5 +21,7 @@
|
|||||||
--in-content-primary-button-border-active: transparent !important;
|
--in-content-primary-button-border-active: transparent !important;
|
||||||
--in-content-primary-button-text-color: #000 !important;
|
--in-content-primary-button-text-color: #000 !important;
|
||||||
--in-content-primary-button-text-color-hover: #000 !important;
|
--in-content-primary-button-text-color-hover: #000 !important;
|
||||||
|
|
||||||
|
--in-content-page-background: #2B2A33 !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user