commit 6b34e973008b6ee2bd7136e6e5087cfa5cd962cd
parent a11e5ebe3da401411f5fd7b3c9542c956db32640
Author: Atila Butkovits <abutkovits@mozilla.com>
Date: Mon, 3 Nov 2025 21:24:44 +0200
Revert "Bug 1961856, Bug 1995422 - make it possible to set a max-height on moz-box-group r=desktop-theme-reviewers,tgiles" for causing failures at test_moz_box_group.html.
This reverts commit 03f13b8c1b3a22838a9cd133df8c3a00cee7ee19.
Revert "Bug 1995422 - ensure isValidLocalProperty can handle shorthand properties r=frontend-codestyle-reviewers,tgiles"
This reverts commit 210f382cd8f6d9d46ee11ded3369f4df03ebfcb9.
Diffstat:
6 files changed, 6 insertions(+), 61 deletions(-)
diff --git a/browser/components/storybook/component-status/components.json b/browser/components/storybook/component-status/components.json
@@ -1,5 +1,5 @@
{
- "generatedAt": "2025-10-15T13:18:04.980Z",
+ "generatedAt": "2025-09-23T22:31:46.034Z",
"count": 28,
"items": [
{
diff --git a/toolkit/content/widgets/moz-box-group/moz-box-group.css b/toolkit/content/widgets/moz-box-group/moz-box-group.css
@@ -2,40 +2,13 @@
* 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/. */
-:host {
- --box-group-border: var(--border-width) solid var(--border-color);
- --box-group-border-radius-inner: calc(var(--border-radius-medium) - var(--border-width));
-
- display: block;
- border: var(--box-group-border);
- border-radius: var(--border-radius-medium);
- overflow: hidden;
-}
-
-::slotted(*) {
- border: none;
-}
-
::slotted(*:not(.last)) {
--box-border-radius-end: 0;
--box-border-width-end: 0;
}
-::slotted(*:not(.first, [position="0"])) {
+::slotted(*:not(.first)) {
--box-border-radius-start: 0;
- border-block-start: var(--box-group-border);
-}
-
-::slotted(.first) {
- --box-border-radius-start: var(--box-group-border-radius-inner);
-}
-
-::slotted(.last) {
- --box-border-radius-end: var(--box-group-border-radius-inner);
-}
-
-slot[name="header"]::slotted(:first-child) {
- border-block-end: var(--box-group-border);
}
.list {
@@ -43,8 +16,3 @@ slot[name="header"]::slotted(:first-child) {
padding: 0;
margin: 0;
}
-
-.scroll-container {
- max-height: var(--box-group-max-height);
- overflow-y: auto;
-}
diff --git a/toolkit/content/widgets/moz-box-group/moz-box-group.mjs b/toolkit/content/widgets/moz-box-group/moz-box-group.mjs
@@ -57,7 +57,6 @@ export default class MozBoxGroup extends MozLitElement {
contentTemplate() {
if (this.type == GROUP_TYPES.reorderable) {
return html`<moz-reorderable-list
- class="scroll-container"
itemselector="moz-box-item"
dragselector=".handle"
@reorder=${this.handleReorder}
@@ -73,7 +72,7 @@ export default class MozBoxGroup extends MozLitElement {
let listTag =
this.type == GROUP_TYPES.reorderable ? literal`ol` : literal`ul`;
return staticHtml`<${listTag}
- class="list scroll-container"
+ class="list"
aria-orientation="vertical"
@keydown=${this.handleKeydown}
@focusin=${this.handleFocus}
@@ -87,7 +86,7 @@ export default class MozBoxGroup extends MozLitElement {
</${listTag}>
<slot hidden></slot>`;
}
- return html`<div class="scroll-container"><slot></slot></div>`;
+ return html`<slot></slot>`;
}
handleReorder(event) {
diff --git a/toolkit/content/widgets/moz-box-group/moz-box-group.stories.mjs b/toolkit/content/widgets/moz-box-group/moz-box-group.stories.mjs
@@ -116,12 +116,8 @@ function basicElements() {
<moz-box-button data-l10n-id="moz-box-button-2"></moz-box-button>`;
}
-const Template = ({ type, hasHeader, hasFooter, scrollable }) => html`
+const Template = ({ type, hasHeader, hasFooter }) => html`
<style>
- moz-box-group {
- --box-group-max-height: ${scrollable ? "200px" : "unset"};
- }
-
.delete {
margin-top: var(--space-medium);
}
@@ -170,7 +166,6 @@ Default.args = {
type: "default",
hasHeader: false,
hasFooter: false,
- scrollable: false,
};
export const List = Template.bind({});
@@ -191,9 +186,3 @@ ListWithHeaderAndFooter.args = {
hasHeader: true,
hasFooter: true,
};
-
-export const Scrollable = Template.bind({});
-Scrollable.args = {
- ...ListWithHeaderAndFooter.args,
- scrollable: true,
-};
diff --git a/tools/lint/stylelint/stylelint-plugin-mozilla/helpers.mjs b/tools/lint/stylelint/stylelint-plugin-mozilla/helpers.mjs
@@ -344,12 +344,7 @@ export const isValidLocalProperty = (value, cssCustomProperties, tokenCSS) => {
});
if (customProperty && cssCustomProperties[customProperty]) {
- return isValidTokenUsage(
- cssCustomProperties[customProperty],
- tokenCSS,
- cssCustomProperties,
- ALLOW_LIST
- );
+ return isToken(cssCustomProperties[customProperty].trim(), tokenCSS);
}
return false;
};
diff --git a/tools/lint/stylelint/stylelint-plugin-mozilla/tests/use-border-color-tokens.tests.mjs b/tools/lint/stylelint/stylelint-plugin-mozilla/tests/use-border-color-tokens.tests.mjs
@@ -123,12 +123,6 @@ testRule({
code: "outline: var(--focus-outline);",
description: "Using a focus-outline token in outline is valid.",
},
- {
- code: `
- :root { --custom-token: var(--border-width) solid var(--border-color); }
- .a { border: var(--custom-token); }
- `,
- },
],
reject: [
