Bug 1679452 - Replace :not(X):not(Y) with :not(X, Y) r=ntim

Differential Revision: https://phabricator.services.mozilla.com/D100147
This commit is contained in:
Kartik Gautam 2020-12-19 11:24:13 +00:00
parent 75e8ce164a
commit 5d5093a494
36 changed files with 67 additions and 67 deletions

View File

@ -189,7 +189,7 @@ toolbar .toolbarbutton-1:not([disabled=true], [checked], [open], :active):hover
#PersonalToolbar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active),
.findbar-button:not([disabled=true]):is([checked="true"],:hover:active),
toolbarbutton.bookmark-item:not(.subviewbutton):hover:active:not([disabled="true"]),
toolbarbutton.bookmark-item:hover:active:not(.subviewbutton, [disabled="true"]),
toolbarbutton.bookmark-item[open="true"],
toolbar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-icon,
toolbar .toolbarbutton-1:not([disabled=true]):is([open],[checked],:hover:active) > .toolbarbutton-text,

View File

@ -381,20 +381,20 @@ body {
border: 0;
}
.treeTable:not(:focus):not(:focus-within) .treeRow.selected {
.treeTable:not(:focus, :focus-within) .treeRow.selected {
background-color: var(--accessibility-unfocused-tree-focused-node-background);
}
.treeTable:not(:focus):not(:focus-within) .treeRow.selected .theme-twisty {
.treeTable:not(:focus, :focus-within) .treeRow.selected .theme-twisty {
fill: var(--accessibility-unfocused-tree-focused-node-twisty-fill);
}
.treeTable:not(:focus):not(:focus-within) .treeRow.selected *,
.treeTable:not(:focus):not(:focus-within) .treeRow.selected .treeLabelCell:after {
.treeTable:not(:focus, :focus-within) .treeRow.selected *,
.treeTable:not(:focus, :focus-within) .treeRow.selected .treeLabelCell:after {
color: inherit;
}
.treeTable:not(:focus):not(:focus-within) .treeRow.selected .objectBox-string {
.treeTable:not(:focus, :focus-within) .treeRow.selected .objectBox-string {
color: var(--string-color);
}
@ -501,7 +501,7 @@ body {
color: var(--theme-selection-color);
}
.treeTable:not(:focus):not(:focus-within) .treeRow.selected .badges .badge {
.treeTable:not(:focus, :focus-within) .treeRow.selected .badges .badge {
color: var(--badge-color);
}
@ -807,7 +807,7 @@ body {
margin-inline-start: 1px;
}
.accessibility-color-contrast .accessibility-contrast-value:not(:first-child):not(:empty):before {
.accessibility-color-contrast .accessibility-contrast-value:not(:first-child, :empty):before {
margin-inline-start: 4px;
}
@ -833,7 +833,7 @@ body {
}
.devtools-toolbar .toolbar-menu-button.active,
.devtools-toolbar .toolbar-menu-button.active.devtools-button:not(:empty):not(.checked):not(:disabled):focus {
.devtools-toolbar .toolbar-menu-button.active.devtools-button:not(:empty, .checked, :disabled):focus {
color: var(--theme-toolbar-selected-color);
}

View File

@ -36,7 +36,7 @@
pointer-events: none;
}
.editor-wrapper :not(.empty-line):not(.new-breakpoint)
.editor-wrapper :not(.empty-line, .new-breakpoint)
> .CodeMirror-gutter-wrapper
> .CodeMirror-linenumber:hover::after {
content: "";

View File

@ -20,12 +20,12 @@
}
.command-bar-button:not(.disabled):hover,
.devtools-button.debugger-settings-menu-button:empty:not(:disabled):not([aria-expanded="true"]):hover {
.devtools-button.debugger-settings-menu-button:empty:not(:disabled, [aria-expanded="true"]):hover {
background: var(--theme-toolbar-background-hover);
}
.theme-dark .command-bar-button:not(.disabled):hover,
.devtools-button.debugger-settings-menu-button:empty:not(:disabled):not([aria-expanded="true"]):hover {
.devtools-button.debugger-settings-menu-button:empty:not(:disabled, [aria-expanded="true"]):hover {
background: var(--theme-toolbar-hover);
}

View File

@ -24,7 +24,7 @@ async function openToolboxOptionsInNewTab() {
const doc = toolbox.doc;
const panel = await toolbox.selectTool("options");
const { id } = panel.panelDoc.querySelector(
"#default-tools-box input[type=checkbox]:not([data-unsupported]):not([checked])"
"#default-tools-box input[type=checkbox]:not([data-unsupported], [checked])"
);
return {

View File

@ -558,7 +558,7 @@
/*
* Dim requests served from cache
*/
.request-list-item:not(.selected):not(:hover).fromCache {
.request-list-item:not(.selected, :hover).fromCache {
--table-icon-opacity: 0.7;
color: var(--theme-text-color-alt);
}

View File

@ -43,7 +43,7 @@
background-color: var(--status-code-color-5xx);
}
.status-code:not([data-code^="3"]):not(.status-code-blocked) {
.status-code:not([data-code^="3"], .status-code-blocked) {
color: var(--theme-body-background);
}

View File

@ -16,11 +16,11 @@ const AUTO_EXPAND_DEPTH = 0;
// full version at https://stackoverflow.com/questions/1599660.
const FOCUSABLE_SELECTOR = [
"a[href]:not([tabindex='-1'])",
"button:not([disabled]):not([tabindex='-1'])",
"button:not([disabled], [tabindex='-1'])",
"iframe:not([tabindex='-1'])",
"input:not([disabled]):not([tabindex='-1'])",
"select:not([disabled]):not([tabindex='-1'])",
"textarea:not([disabled]):not([tabindex='-1'])",
"input:not([disabled], [tabindex='-1'])",
"select:not([disabled], [tabindex='-1'])",
"textarea:not([disabled], [tabindex='-1'])",
"[tabindex]:not([tabindex='-1'])",
].join(", ");

View File

@ -94,7 +94,7 @@
}
/* Invert text selection color in selected rows */
.treeTable .treeRow.selected :not(input):not(textarea)::selection {
.treeTable .treeRow.selected :not(input, textarea)::selection {
color: var(--theme-selection-background);
background-color: var(--theme-selection-color);
}

View File

@ -10,11 +10,11 @@
*/
const focusableSelector = [
"a[href]:not([tabindex='-1'])",
"button:not([disabled]):not([tabindex='-1'])",
"button:not([disabled], [tabindex='-1'])",
"iframe:not([tabindex='-1'])",
"input:not([disabled]):not([tabindex='-1'])",
"select:not([disabled]):not([tabindex='-1'])",
"textarea:not([disabled]):not([tabindex='-1'])",
"input:not([disabled], [tabindex='-1'])",
"select:not([disabled], [tabindex='-1'])",
"textarea:not([disabled], [tabindex='-1'])",
"[tabindex]:not([tabindex='-1'])",
].join(", ");

View File

@ -79,7 +79,7 @@ select.playback-rate-selector.devtools-button {
text-align: center;
}
select.playback-rate-selector.devtools-button:not(:empty):not(:disabled):not(.checked):hover {
select.playback-rate-selector.devtools-button:not(:empty, :disabled, .checked):hover {
background: none;
background-color: var(--toolbarbutton-background);
background-image: url("chrome://devtools/skin/images/dropmarker.svg");

View File

@ -69,8 +69,8 @@
transition: all 0.1s ease-out;
}
.pie-chart-slice:not(:hover):not([focused]),
.pie-chart-slice:not(:hover):not([focused]) + .pie-chart-label {
.pie-chart-slice:not(:hover, [focused]),
.pie-chart-slice:not(:hover, [focused]) + .pie-chart-label {
transform: none !important;
}

View File

@ -370,7 +370,7 @@ checkbox:-moz-focusring {
background-color: var(--theme-toolbar-hover);
}
.devtools-button:empty:not(:disabled):not([aria-expanded="true"]):hover {
.devtools-button:empty:not(:disabled, [aria-expanded="true"]):hover {
background: var(--toolbarbutton-hover-background);
}
@ -388,17 +388,17 @@ checkbox:-moz-focusring {
/* Selectable button which is unchecked. */
.devtools-button:not(:empty):not(:disabled):not(.checked):hover,
.devtools-button:not(:empty, :disabled, .checked):hover,
.devtools-button:empty:not(:disabled):is(:hover:active,.checked),
.devtools-button[aria-haspopup="menu"][aria-expanded="true"] {
background-color: var(--toolbarbutton-hover-background);
}
.devtools-button:not(:empty):not(.checked):not(:disabled):hover:active {
.devtools-button:not(:empty, .checked, :disabled):hover:active {
background-color: var(--theme-selection-background-hover);
}
.devtools-button:not(:empty):not(.checked):not(:disabled):focus {
.devtools-button:not(:empty, .checked, :disabled):focus {
background-color: var(--toolbarbutton-focus-background);
color: var(--toolbarbutton-focus-color);
}
@ -408,7 +408,7 @@ checkbox:-moz-focusring {
color: var(--theme-toolbarbutton-color);
}
.devtools-togglebutton:not([aria-pressed="true"]):hover:not(:active) {
.devtools-togglebutton:hover:not([aria-pressed="true"], :active) {
background-color: var(--theme-toolbarbutton-hover-background);
}

View File

@ -206,7 +206,7 @@
}
/* Center first level indent within the left gutter */
.message:not(.startGroup):not(.startGroupCollapsed) > .indent[data-indent="1"] {
.message:not(.startGroup, .startGroupCollapsed) > .indent[data-indent="1"] {
margin-inline-start: calc(1px + var(--console-icon-horizontal-offset));
margin-inline-end: calc(11px - var(--console-icon-horizontal-offset));
}

View File

@ -206,7 +206,7 @@
/* Custom configurable/enumerable/writable or frozen/sealed/extensible
* variables and properties */
.variable-or-property[non-enumerable]:not([self]):not([pseudo-item]) > .title > .name {
.variable-or-property[non-enumerable]:not([self], [pseudo-item]) > .title > .name {
opacity: 0.6;
}

View File

@ -157,7 +157,7 @@ body {
--jsterm-border-width: 1px;
}
.webconsole-app:not(.jsterm-editor):not(.eager-evaluation) .jsterm-input-container {
.webconsole-app:not(.jsterm-editor, .eager-evaluation) .jsterm-input-container {
/* The input should be full-height when eager evaluation is disabled. */
flex-grow: 1;
--jsterm-padding-top: var(--console-input-extra-padding);

View File

@ -24,7 +24,7 @@
:root[platform="mac"] .webconsole-app .reverse-search {
border-end-start-radius: 5px;
}
:root[platform="mac"] .webconsole-app:not(.jsterm-editor):not(.sidebar-visible) .reverse-search
:root[platform="mac"] .webconsole-app:not(.jsterm-editor, .sidebar-visible) .reverse-search
{
border-end-end-radius: 5px;
}

View File

@ -143,7 +143,7 @@ mtd {
/* Don't support m(labeled)tr without mtable, nor mtd without m(labeled)tr */
:not(mtable) > mtr,
:not(mtable) > mlabeledtr,
:not(mtr):not(mlabeledtr) > mtd {
:not(mtr, mlabeledtr) > mtd {
display: none !important;
}

View File

@ -495,7 +495,7 @@ input:is([type="radio"], [type="checkbox"]):is(:disabled, :disabled:active, :dis
cursor: unset;
}
input:not([type="file"]):not([type="image"]):-moz-focusring,
input:not([type="file"], [type="image"]):-moz-focusring,
select:-moz-focusring,
button:-moz-focusring,
textarea:-moz-focusring {

View File

@ -335,7 +335,7 @@ table:-moz-table-border-nonzero > th
}
/* collapse only if rules are really specified */
table[rules]:not([rules="none"]):not([rules=""]) {
table[rules]:not([rules="none"], [rules=""]) {
border-collapse: collapse;
}

View File

@ -356,7 +356,7 @@
transform: none !important;
}
xul|*:fullscreen:not(:root):not([hidden="true"]) {
xul|*:fullscreen:not(:root, [hidden="true"]) {
/* The position: fixed; property above used to force the computed display
* value to block. It is no longer the case now, so we manually set it here to
* maintain the old behaviour. We should probably not do this, but we don't
@ -366,7 +366,7 @@ xul|*:fullscreen:not(:root):not([hidden="true"]) {
/* Selectors here should match the check in
* nsViewportFrame.cpp:ShouldInTopLayerForFullscreen() */
*|*:fullscreen:not(:root):not(:-moz-browser-frame) {
*|*:fullscreen:not(:root, :-moz-browser-frame) {
-moz-top-layer: top !important;
}

View File

@ -8,7 +8,7 @@
animation-name: alert-animation;
}
#alertBox[animate]:not([clicked]):not([closing]):hover {
#alertBox[animate]:not([clicked], [closing]):hover {
animation-play-state: paused;
}

View File

@ -391,7 +391,7 @@ function makeRuleset(coeffs, biases) {
rule(
DEVELOPMENT
? dom(
"input[type=password]:not([disabled]):not([aria-hidden=true]"
"input[type=password]:not([disabled], [aria-hidden=true])"
).when(isVisible)
: element("input"),
type("new").note(clearCache)

View File

@ -99,7 +99,7 @@ select {
padding: 0;
}
select:not([size]):not([multiple])[iconic] {
select:not([size], [multiple])[iconic] {
padding-inline-start: 28px;
}

View File

@ -66,7 +66,7 @@ tabmodalprompt.tab-prompt .tabmodalprompt-mainContainer {
box-sizing: border-box;
}
.tabmodalprompt-topContainer > div:not(.tabmodalprompt-infoContainer):not([hidden]) {
.tabmodalprompt-topContainer > div:not(.tabmodalprompt-infoContainer, [hidden]) {
display: contents;
}

View File

@ -180,7 +180,7 @@ groupbox {
%ifndef MOZ_WIDGET_GTK
titlebar,
toolbar:not([nowindowdrag="true"]):not([customizing="true"]) {
toolbar:not([nowindowdrag="true"], [customizing="true"]) {
-moz-window-dragging: drag;
}
%endif

View File

@ -36,7 +36,7 @@ button:hover:not(:active,[disabled="true"],[open="true"],[checked="true"],[defau
/* .......... active state .......... */
button:is(:hover:active,[open="true"]):not([default="true"]):not([disabled="true"]) {
button:is(:hover:active, [open="true"]):not([default="true"], [disabled="true"]) {
color: -moz-gtk-buttonactivetext;
}

View File

@ -68,7 +68,7 @@ menubar:-moz-lwtheme > menu:not([open="true"]) {
text-shadow: inherit;
}
menubar > menu[_moz-menuactive="true"]:not([open]):not([disabled="true"]):not(:-moz-lwtheme) {
menubar > menu[_moz-menuactive="true"]:not([open], [disabled="true"], :-moz-lwtheme) {
color: -moz-menubartext;
}

View File

@ -47,7 +47,7 @@ toolbarbutton[disabled="true"] {
color: GrayText;
}
toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) {
toolbarbutton:-moz-lwtheme:not(:hover, [checked="true"], [open="true"], [disabled="true"]) {
text-shadow: inherit;
}

View File

@ -69,9 +69,9 @@ xul|scrollbar xul|thumb {
border-radius: 4px;
}
select:not([size]):not([multiple]) > xul|scrollbar,
select:not([size], [multiple]) > xul|scrollbar,
select[size="1"] > xul|scrollbar,
select:not([size]):not([multiple]) > xul|scrollbar > xul|scrollbarbutton,
select:not([size], [multiple]) > xul|scrollbar > xul|scrollbarbutton,
select[size="1"] > xul|scrollbar > xul|scrollbarbutton {
display: block;
margin-left: 0;

View File

@ -19,7 +19,7 @@ button:not([disabled="true"]):hover:active {
/* When the window isn't focused, the default button background isn't drawn,
* so don't change the text color then: */
button[default="true"]:not([disabled="true"]):not(:-moz-window-inactive) {
button[default="true"]:not([disabled="true"], :-moz-window-inactive) {
color: -moz-mac-defaultbuttontext;
}

View File

@ -56,8 +56,8 @@ label.findbar-find-fast:-moz-lwtheme {
border-color: var(--lwt-toolbar-field-border-color, @findUiDefaultBorderColor@);
}
.findbar-find-next:not(:-moz-lwtheme):not([disabled]):hover:active,
.findbar-find-previous:not(:-moz-lwtheme):not([disabled]):hover:active,
.findbar-find-next:not(:-moz-lwtheme, [disabled]):hover:active,
.findbar-find-previous:not(:-moz-lwtheme, [disabled]):hover:active,
.findbar-button:not([disabled]):hover:active,
.findbar-button:not([disabled])[checked="true"] {
background-image: linear-gradient(#dadada, #dadada);

View File

@ -17,7 +17,7 @@ scrollbar[root="true"] {
z-index: 2147483647; /* largest positive value of a signed 32-bit integer */
}
html|select[size]:not([size="0"]):not([size="1"]),
html|select[size]:not([size="0"], [size="1"]),
html|select[multiple] {
scrollbar-width: thin;
}

View File

@ -280,12 +280,12 @@ body.dark blockquote {
transition-duration: 250ms;
}
.toolbar-container.scrolled .toolbar:not(:hover):not(:focus-within) {
.toolbar-container.scrolled .toolbar:not(:hover, :focus-within) {
border-color: transparent;
box-shadow: 0 2px 8px transparent;
}
.toolbar-container.scrolled .toolbar:not(:hover):not(:focus-within) .button {
.toolbar-container.scrolled .toolbar:not(:hover, :focus-within) .button {
opacity: 0.6;
}

View File

@ -22,7 +22,7 @@
animation-name: alert-closing-animation;
}
#alertBox[animate]:not([clicked]):not([closing]):hover {
#alertBox[animate]:not([clicked], [closing]):hover {
/* !important is necessary because CSS animations have highest
importance in the cascade with exception to !important rules. */
opacity: 1 !important;

View File

@ -270,7 +270,7 @@ xul|menulist:-moz-focusring {
box-shadow: 0 0 0 4px var(--in-content-border-active-shadow);
}
html|select:not([size]):not([multiple]) {
html|select:not([size], [multiple]) {
background-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
background-position: right 3px center;
background-repeat: no-repeat;
@ -283,17 +283,17 @@ html|select:not([size]):not([multiple]) {
text-overflow: ellipsis;
}
html|select:not([size]):not([multiple]):dir(rtl) {
html|select:not([size], [multiple]):dir(rtl) {
background-position-x: left 3px;
}
html|select:not([size]):not([multiple]) > html|option {
html|select:not([size], [multiple]) > html|option {
background-color: var(--in-content-box-background);
color: var(--in-content-text-color);
}
html|button:enabled:hover,
html|select:not([size]):not([multiple]):enabled:hover,
html|select:not([size], [multiple]):enabled:hover,
html|input[type="color"]:hover,
xul|button:not([disabled="true"]):hover,
xul|menulist:not([disabled="true"]):hover {
@ -301,7 +301,7 @@ xul|menulist:not([disabled="true"]):hover {
}
html|button:enabled:hover:active,
html|select:not([size]):not([multiple]):enabled:hover:active,
html|select:not([size], [multiple]):enabled:hover:active,
html|input[type="color"]:enabled:hover:active,
xul|button:not([disabled="true"]):hover:active,
xul|button[open],
@ -468,7 +468,7 @@ html|textarea {
html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):enabled:not(:focus):hover,
html|textarea:enabled:not(:focus):hover,
xul|search-textbox:not([disabled="true"]):not([focused]):hover {
xul|search-textbox:not([disabled="true"], [focused]):hover {
border-color: var(--in-content-border-hover);
}
@ -607,7 +607,7 @@ xul|*.radio-check {
background-color: var(--grey-90-a10);
}
xul|radio:not([disabled="true"]):not([selected="true"]):hover > xul|*.radio-check {
xul|radio:not([disabled="true"], [selected="true"]):hover > xul|*.radio-check {
background-color: var(--grey-90-a20);
}
@ -880,13 +880,13 @@ xul|treecolpicker {
padding: 5px 10px;
}
xul|treecol:not([hideheader="true"]):not([sortable="false"]):hover,
xul|treecol:not([hideheader="true"], [sortable="false"]):hover,
xul|treecolpicker:hover {
background-color: var(--in-content-box-background-active);
color: var(--in-content-text-color);
}
xul|treecol:not([hideheader="true"]):not(:first-child),
xul|treecol:not([hideheader="true"], :first-child),
xul|treecolpicker {
border-inline-start-width: 1px;
border-inline-start-style: solid;