merge mozilla-inbound to mozilla-central. r=merge a=merge (04574052) · Commits · Tommy Webb / Tor Browser

accessible/tests/browser/e10s/browser.ini

+1 −0

Original line number	Original line	Diff line number	Diff line
	[DEFAULT]		[DEFAULT]
			skip-if = e10s && os == 'win' && release_or_beta
	support-files =		support-files =
	head.js		head.js
	doc_treeupdate_ariadialog.html		doc_treeupdate_ariadialog.html

accessible/tests/browser/states/browser.ini

+2 −1

Original line number	Original line	Diff line number	Diff line
	[DEFAULT]		[DEFAULT]
			skip-if = e10s && os == 'win' && release_or_beta
	support-files =		support-files =
	head.js		head.js
	!/accessible/tests/browser/events.js		!/accessible/tests/browser/events.js

browser/base/content/browser-tabsintitlebar.js

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -176,6 +176,16 @@ var TabsInTitlebar = {

	// Begin setting CSS properties which will cause a reflow		// Begin setting CSS properties which will cause a reflow

			if (AppConstants.MOZ_PHOTON_THEME &&
			AppConstants.isPlatformAndVersionAtLeast("win", "10.0")) {
			if (!menuHeight) {
			titlebarContentHeight = Math.max(titlebarContentHeight, fullTabsHeight);
			$("titlebar-buttonbox").style.height = titlebarContentHeight + "px";
			} else {
			$("titlebar-buttonbox").style.removeProperty("height");
			}
			}

	// If the menubar is around (menuHeight is non-zero), try to adjust		// If the menubar is around (menuHeight is non-zero), try to adjust
	// its full height (i.e. including margins) to match the titlebar,		// its full height (i.e. including margins) to match the titlebar,
	// by changing the menubar's bottom padding		// by changing the menubar's bottom padding

devtools/client/debugger/new/debugger.css

+47 −23

Original line number	Original line	Diff line number	Diff line
			/* 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/. */

	.landing-page {		.landing-page {
	flex: 1;		flex: 1;
	display: flex;		display: flex;
	@@ -99,6 +103,10 @@
	font-size: 14px;		font-size: 14px;
	color: var(--theme-comment);		color: var(--theme-comment);
	}		}
			/* 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/. */

	.landing-page .tab-group {		.landing-page .tab-group {
	flex: 1;		flex: 1;
	overflow-y: auto;		overflow-y: auto;
	@@ -157,6 +165,10 @@
	.landing-page .tab.active .tab-url {		.landing-page .tab.active .tab-url {
	color: var(--theme-highlight-gray);		color: var(--theme-highlight-gray);
	}		}
			/* 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/. */

	.landing-page .sidebar {		.landing-page .sidebar {
	display: flex;		display: flex;
	background-color: var(--theme-tab-toolbar-background);		background-color: var(--theme-tab-toolbar-background);
	@@ -210,6 +222,10 @@
	.landing-page .sidebar li:focus a {		.landing-page .sidebar li:focus a {
	color: inherit;		color: inherit;
	}		}
			/* 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/. */

	menu {		menu {
	display: inline;		display: inline;
	padding: 0;		padding: 0;
	@@ -295,6 +311,10 @@ menuseparator {
	height: 100%;		height: 100%;
	z-index: 999;		z-index: 999;
	}		}
			/* 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/. */

	:root.theme-light,		:root.theme-light,
	:root .theme-light {		:root .theme-light {
	--theme-search-overlays-semitransparent: rgba(221, 225, 228, 0.66);		--theme-search-overlays-semitransparent: rgba(221, 225, 228, 0.66);
	@@ -1749,10 +1769,6 @@ html .toggle-button-end.vertical svg {
	--theme-conditional-breakpoint-color: #ccd1d5;		--theme-conditional-breakpoint-color: #ccd1d5;
	}		}

	.theme-firebug {
	--theme-conditional-breakpoint-color: #ccd1d5;
	}

	.out-of-scope .CodeMirror-line,		.out-of-scope .CodeMirror-line,
	.out-of-scope .CodeMirror-linenumber {		.out-of-scope .CodeMirror-linenumber {
	opacity: 0.8;		opacity: 0.8;
	@@ -1988,25 +2004,6 @@ html[dir="rtl"] .editor-mount {
	border-top-right-radius: 2px;		border-top-right-radius: 2px;
	border-bottom-right-radius: 2px;		border-bottom-right-radius: 2px;
	}		}

	.why-paused {
	background-color: var(--theme-body-background);
	border-bottom: 1px solid var(--theme-splitter-color);
	color: var(--theme-highlight-blue);
	padding: 10px 10px 10px 20px;
	white-space: normal;
	opacity: 0.9;
	font-size: 12px;
	flex: 0 1 auto;
	}

	.theme-dark .secondary-panes .why-paused {
	color: white;
	}

	.why-paused .message {
	font-size: 10px;
	}
	.breakpoints-toggle {		.breakpoints-toggle {
	margin: 2px 3px;		margin: 2px 3px;
	}		}
	@@ -2216,6 +2213,33 @@ html .breakpoints-list .breakpoint.paused {
	border-top: 1px solid var(--theme-splitter-color);		border-top: 1px solid var(--theme-splitter-color);
	border-bottom: 1px solid var(--theme-splitter-color);		border-bottom: 1px solid var(--theme-splitter-color);
	}		}

			.why-paused {
			background-color: var(--theme-body-background);
			color: var(--theme-body-color);
			padding: 10px 10px 10px 20px;
			white-space: normal;
			opacity: 0.6;
			font-size: 12px;
			flex: 0 1 auto;
			text-align: center;
			font-style: italic;
			font-weight: 300;
			}

			.theme-dark .secondary-panes .why-paused {
			color: white;
			}

			.why-paused .message {
			font-size: 10px;
			}

			.why-paused .message.warning {
			font-size: 10px;
			color: var(--theme-graphs-full-red);
			font-weight: bold;
			}
	.frames ul {		.frames ul {
	list-style: none;		list-style: none;
	margin: 0;		margin: 0;

devtools/client/debugger/new/debugger.js

+18425 −896

File changed.

Preview size limit exceeded, changes collapsed.