Bug 1719463 - Part 5: Remove the edit and zoom items from the pre-proton appMenu view. r=Gijs (d81c1b74) · Commits · The Tor Project / Applications / Tor Browser

browser/base/content/appmenu-viewcache.inc.xhtml

+0 −51

Original line number	Diff line number	Diff line
		@@ -6,57 +6,6 @@
		<panelview id="appMenu-mainView" class="PanelUI-subView"
		descriptionheightworkaround="true">
		<vbox class="panel-subview-body">
		<toolbaritem id="appMenu-zoom-controls" class="toolbaritem-combined-buttons" closemenu="none">
		<!-- Use a spacer, because panel sizing code gets confused when using CSS methods. -->
		<spacer class="before-label"/>
		<label value="&fullZoom.label;"/>
		<!-- This spacer keeps the scrollbar from overlapping the view. -->
		<spacer class="after-label"/>
		<toolbarbutton id="appMenu-zoomReduce-button"
		class="subviewbutton subviewbutton-iconic"
		command="cmd_fullZoomReduce"
		data-l10n-id="appmenuitem-zoom-reduce"
		tooltip="dynamic-shortcut-tooltip"/>
		<toolbarbutton id="appMenu-zoomReset-button"
		class="subviewbutton"
		command="cmd_fullZoomReset"
		tooltip="dynamic-shortcut-tooltip"/>
		<toolbarbutton id="appMenu-zoomEnlarge-button"
		class="subviewbutton subviewbutton-iconic"
		command="cmd_fullZoomEnlarge"
		data-l10n-id="appmenuitem-zoom-enlarge"
		tooltip="dynamic-shortcut-tooltip"/>
		<toolbarseparator orient="vertical"/>
		<toolbarbutton id="appMenu-fullscreen-button"
		class="subviewbutton subviewbutton-iconic"
		data-l10n-id="appmenuitem-fullscreen"
		observes="View:FullScreen"
		type="checkbox"
		closemenu="auto"
		onclick="if (event.button == 0) this.closest('panel').hidePopup();"
		tooltip="dynamic-shortcut-tooltip"/>
		</toolbaritem>
		<toolbarseparator/>
		<toolbaritem id="appMenu-edit-controls" class="toolbaritem-combined-buttons" closemenu="none">
		<!-- Use a spacer, because panel sizing code gets confused when using CSS methods. -->
		<spacer class="before-label"/>
		<label value="&editMenu.label;"/>
		<!-- This spacer keeps the scrollbar from overlapping the view. -->
		<spacer class="after-label"/>
		<toolbarbutton id="appMenu-cut-button"
		class="subviewbutton subviewbutton-iconic"
		command="cmd_cut"
		tooltip="dynamic-shortcut-tooltip"/>
		<toolbarbutton id="appMenu-copy-button"
		class="subviewbutton subviewbutton-iconic"
		command="cmd_copy"
		tooltip="dynamic-shortcut-tooltip"/>
		<toolbarbutton id="appMenu-paste-button"
		class="subviewbutton subviewbutton-iconic"
		command="cmd_paste"
		tooltip="dynamic-shortcut-tooltip"/>
		</toolbaritem>
		<toolbarseparator/>
		<toolbarbutton id="appMenu-library-button"
		class="subviewbutton subviewbutton-iconic subviewbutton-nav"
		label="&places.library.title;"

browser/base/content/browser.js

+0 −14

Original line number	Diff line number	Diff line
		@@ -6869,7 +6869,6 @@ const nodeToTooltipMap = {
		"context-stop": "stopButton.tooltip",
		"downloads-button": "downloads.tooltip",
		"fullscreen-button": "fullscreenButton.tooltip",
		"appMenu-fullscreen-button": "fullscreenButton.tooltip",
		"appMenu-fullscreen-button2": "fullscreenButton.tooltip",
		"new-window-button": "newWindowButton.tooltip",
		"new-tab-button": "newTabButton.tooltip",
		@@ -6877,14 +6876,8 @@ const nodeToTooltipMap = {
		"reload-button": "reloadButton.tooltip",
		"stop-button": "stopButton.tooltip",
		"urlbar-zoom-button": "urlbar-zoom-button.tooltip",
		"appMenu-cut-button": "cut-button.tooltip",
		"appMenu-copy-button": "copy-button.tooltip",
		"appMenu-paste-button": "paste-button.tooltip",
		"appMenu-zoomEnlarge-button": "zoomEnlarge-button.tooltip",
		"appMenu-zoomEnlarge-button2": "zoomEnlarge-button.tooltip",
		"appMenu-zoomReset-button": "zoomReset-button.tooltip",
		"appMenu-zoomReset-button2": "zoomReset-button.tooltip",
		"appMenu-zoomReduce-button": "zoomReduce-button.tooltip",
		"appMenu-zoomReduce-button2": "zoomReduce-button.tooltip",
		"reader-mode-button": "reader-mode-button.tooltip",
		"reader-mode-button-icon": "reader-mode-button.tooltip",
		@@ -6896,7 +6889,6 @@ const nodeToShortcutMap = {
		"context-stop": "key_stop",
		"downloads-button": "key_openDownloads",
		"fullscreen-button": "key_fullScreen",
		"appMenu-fullscreen-button": "key_fullScreen",
		"appMenu-fullscreen-button2": "key_fullScreen",
		"new-window-button": "key_newNavigator",
		"new-tab-button": "key_newNavigatorTab",
		@@ -6904,14 +6896,8 @@ const nodeToShortcutMap = {
		"reload-button": "key_reload",
		"stop-button": "key_stop",
		"urlbar-zoom-button": "key_fullZoomReset",
		"appMenu-cut-button": "key_cut",
		"appMenu-copy-button": "key_copy",
		"appMenu-paste-button": "key_paste",
		"appMenu-zoomEnlarge-button": "key_fullZoomEnlarge",
		"appMenu-zoomEnlarge-button2": "key_fullZoomEnlarge",
		"appMenu-zoomReset-button": "key_fullZoomReset",
		"appMenu-zoomReset-button2": "key_fullZoomReset",
		"appMenu-zoomReduce-button": "key_fullZoomReduce",
		"appMenu-zoomReduce-button2": "key_fullZoomReduce",
		"reader-mode-button": "key_toggleReaderMode",
		"reader-mode-button-icon": "key_toggleReaderMode",

browser/locales/en-US/chrome/browser/browser.dtd

+0 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ this container is a toolbar. This avoids double-speaking. -->
		<!ENTITY newNavigatorCmd.label "New Window">
		<!ENTITY newPrivateWindow.label "New Private Window">

		<!ENTITY editMenu.label "Edit">
		<!ENTITY preferencesCmd2.label "Options">
		<!ENTITY preferencesCmdUnix.label "Preferences">
		<!ENTITY logins.label "Logins and Passwords">

browser/themes/osx/customizableui/panelUI.css

+0 −4

Original line number	Diff line number	Diff line
		@@ -38,10 +38,6 @@ panel[type="arrow"][side="right"] {
		margin-top: -4px; /* Overrides value from panelUI.inc.css */
		}

		panelmultiview .toolbaritem-combined-buttons > spacer.before-label {
		width: 42px; /* 18px toolbarbutton padding + 16px icon + 8px label padding start */
		}

		.panel-subview-body {
		scrollbar-color: color-mix(in srgb, currentColor 26%, transparent) transparent;
		}

browser/themes/shared/customizableui/panelUI.inc.css

+0 −44

Original line number	Diff line number	Diff line
		@@ -1234,15 +1234,6 @@ panelmultiview .toolbaritem-combined-buttons > label {
		padding: 4px 0;
		}

		panelmultiview .toolbaritem-combined-buttons > spacer.before-label {
		width: 36px; /* 12px toolbarbutton padding + 16px icon + 8px label padding start */
		}

		panelmultiview .toolbaritem-combined-buttons > spacer.after-label {
		-moz-box-flex: 1;
		width: 20px; /* a little bigger than the width of the scrollbar */
		}

		.PanelUI-subView .toolbaritem-combined-buttons > .subviewbutton {
		-moz-box-flex: 0;
		height: auto;
		@@ -1251,38 +1242,11 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label {
		padding: 4px 5px;
		}

		#appMenu-zoom-controls > .subviewbutton {
		margin-inline-start: 10px;
		}

		/* Unset the min-height constraint, because that works better for a text-only button. */
		#appMenu-zoomReset-button {
		min-height: unset;
		border: 1px solid var(--panel-separator-color);
		border-radius: 10000px;
		padding: 1px 8px;
		background-color: var(--arrowpanel-dimmed);
		}

		#appMenu-zoomReset-button@buttonStateHoverOrFocus@ {
		background-color: var(--arrowpanel-dimmed-further);
		}

		#appMenu-zoomReset-button@buttonStateActive@ {
		background-color: var(--arrowpanel-dimmed-even-further);
		}

		#appMenu-zoomReset-button > .toolbarbutton-text,
		#appMenu-zoomReset-button2 > .toolbarbutton-text {
		min-width: calc(4ch + 8px);
		text-align: center;
		}

		#appMenu-zoom-controls > toolbarseparator[orient="vertical"] + .subviewbutton,
		#appMenu-zoom-controls2 > toolbarseparator[orient="vertical"] + .subviewbutton {
		margin-inline-start: 0;
		}

		.PanelUI-subView .toolbaritem-combined-buttons > .subviewbutton-iconic > .toolbarbutton-text,
		.PanelUI-subView .toolbaritem-combined-buttons > .subviewbutton:not(.subviewbutton-iconic) > .toolbarbutton-icon {
		display: none;
		@@ -1414,14 +1378,6 @@ menuitem.subviewbutton@menuStateActive@,
		margin-inline: 10px;
		}

		.PanelUI-subView toolbarseparator[orient="vertical"] {
		height: 24px;
		border-inline-start: 1px solid var(--panel-separator-color);
		border-top: none;
		margin: 0;
		margin-inline: 6px 7px;
		}

		.subviewbutton > .menu-accel-container {
		-moz-box-pack: end;
		margin-inline: 10px auto;