Skip to content

Commit

Permalink
Merge branch 'main' into menu-item-overflow
Browse files Browse the repository at this point in the history
  • Loading branch information
@blunteshwar
blunteshwar authored Feb 11, 2025
2 parents 65f1a6c + 0cd4a3b commit 1aa543d
Show file tree
Hide file tree
Showing 11 changed files with 418 additions and 1,854 deletions.
2 changes: 1 addition & 1 deletion packages/checkbox/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"@spectrum-web-components/shared": "^1.1.1"
},
"devDependencies": {
"@spectrum-css/checkbox": "10.0.0-s2-foundations.18"
"@spectrum-css/checkbox": "10.0.0-s2-foundations.20"
},
"types": "./src/index.d.ts",
"customElements": "custom-elements.json",
Expand Down
122 changes: 0 additions & 122 deletions packages/checkbox/src/checkbox-overrides.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,130 +24,8 @@ governing permissions and limitations under the License.
--spectrum-checkbox-control-color-focus: var(
--system-checkbox-control-color-focus
);
--spectrum-checkbox-content-color-default: var(
--system-checkbox-content-color-default
);
--spectrum-checkbox-content-color-hover: var(
--system-checkbox-content-color-hover
);
--spectrum-checkbox-content-color-down: var(
--system-checkbox-content-color-down
);
--spectrum-checkbox-content-color-focus: var(
--system-checkbox-content-color-focus
);
--spectrum-checkbox-focus-indicator-color: var(
--system-checkbox-focus-indicator-color
);
--spectrum-checkbox-content-color-disabled: var(
--system-checkbox-content-color-disabled
);
--spectrum-checkbox-control-color-disabled: var(
--system-checkbox-control-color-disabled
);
--spectrum-checkbox-checkmark-color: var(--system-checkbox-checkmark-color);
--spectrum-checkbox-invalid-color-default: var(
--system-checkbox-invalid-color-default
);
--spectrum-checkbox-invalid-color-hover: var(
--system-checkbox-invalid-color-hover
);
--spectrum-checkbox-invalid-color-down: var(
--system-checkbox-invalid-color-down
);
--spectrum-checkbox-invalid-color-focus: var(
--system-checkbox-invalid-color-focus
);
--spectrum-checkbox-emphasized-color-default: var(
--system-checkbox-emphasized-color-default
);
--spectrum-checkbox-emphasized-color-hover: var(
--system-checkbox-emphasized-color-hover
);
--spectrum-checkbox-emphasized-color-down: var(
--system-checkbox-emphasized-color-down
);
--spectrum-checkbox-emphasized-color-focus: var(
--system-checkbox-emphasized-color-focus
);
--spectrum-checkbox-control-selected-color-default: var(
--system-checkbox-control-selected-color-default
);
--spectrum-checkbox-control-selected-color-hover: var(
--system-checkbox-control-selected-color-hover
);
--spectrum-checkbox-control-selected-color-down: var(
--system-checkbox-control-selected-color-down
);
--spectrum-checkbox-control-selected-color-focus: var(
--system-checkbox-control-selected-color-focus
);
--spectrum-checkbox-line-height: var(--system-checkbox-line-height);
--spectrum-checkbox-line-height-cjk: var(--system-checkbox-line-height-cjk);
--spectrum-checkbox-control-corner-radius: var(
--system-checkbox-control-corner-radius
);
--spectrum-checkbox-focus-indicator-gap: var(
--system-checkbox-focus-indicator-gap
);
--spectrum-checkbox-focus-indicator-thickness: var(
--system-checkbox-focus-indicator-thickness
);
--spectrum-checkbox-border-width: var(--system-checkbox-border-width);
--spectrum-checkbox-animation-duration: var(
--system-checkbox-animation-duration
);
--spectrum-checkbox-font-size: var(--system-checkbox-font-size);
--spectrum-checkbox-height: var(--system-checkbox-height);
--spectrum-checkbox-control-size: var(--system-checkbox-control-size);
--spectrum-checkbox-top-to-text: var(--system-checkbox-top-to-text);
--spectrum-checkbox-text-to-control: var(--system-checkbox-text-to-control);
}

:host([size='s']) {
--spectrum-checkbox-font-size: var(--system-checkbox-size-s-font-size);
--spectrum-checkbox-height: var(--system-checkbox-size-s-height);
--spectrum-checkbox-control-size: var(
--system-checkbox-size-s-control-size
);
--spectrum-checkbox-top-to-text: var(--system-checkbox-size-s-top-to-text);
--spectrum-checkbox-text-to-control: var(
--system-checkbox-size-s-text-to-control
);
}

:host {
--spectrum-checkbox-font-size: var(--system-checkbox-size-m-font-size);
--spectrum-checkbox-height: var(--system-checkbox-size-m-height);
--spectrum-checkbox-control-size: var(
--system-checkbox-size-m-control-size
);
--spectrum-checkbox-top-to-text: var(--system-checkbox-size-m-top-to-text);
--spectrum-checkbox-text-to-control: var(
--system-checkbox-size-m-text-to-control
);
}

:host([size='l']) {
--spectrum-checkbox-font-size: var(--system-checkbox-size-l-font-size);
--spectrum-checkbox-height: var(--system-checkbox-size-l-height);
--spectrum-checkbox-control-size: var(
--system-checkbox-size-l-control-size
);
--spectrum-checkbox-top-to-text: var(--system-checkbox-size-l-top-to-text);
--spectrum-checkbox-text-to-control: var(
--system-checkbox-size-l-text-to-control
);
}

:host([size='xl']) {
--spectrum-checkbox-font-size: var(--system-checkbox-size-xl-font-size);
--spectrum-checkbox-height: var(--system-checkbox-size-xl-height);
--spectrum-checkbox-control-size: var(
--system-checkbox-size-xl-control-size
);
--spectrum-checkbox-top-to-text: var(--system-checkbox-size-xl-top-to-text);
--spectrum-checkbox-text-to-control: var(
--system-checkbox-size-xl-text-to-control
);
}
159 changes: 120 additions & 39 deletions packages/checkbox/src/spectrum-checkbox.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,120 @@ governing permissions and limitations under the License.
*/

/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
:host {
--spectrum-checkbox-content-color-default: var(
--spectrum-neutral-content-color-default
);
--spectrum-checkbox-content-color-hover: var(
--spectrum-neutral-content-color-hover
);
--spectrum-checkbox-content-color-down: var(
--spectrum-neutral-content-color-down
);
--spectrum-checkbox-content-color-focus: var(
--spectrum-neutral-content-color-key-focus
);
--spectrum-checkbox-focus-indicator-color: var(
--spectrum-focus-indicator-color
);
--spectrum-checkbox-content-color-disabled: var(
--spectrum-disabled-content-color
);
--spectrum-checkbox-control-color-disabled: var(
--spectrum-disabled-content-color
);
--spectrum-checkbox-invalid-color-default: var(
--spectrum-negative-color-900
);
--spectrum-checkbox-invalid-color-hover: var(
--spectrum-negative-color-1000
);
--spectrum-checkbox-invalid-color-down: var(--spectrum-negative-color-1100);
--spectrum-checkbox-invalid-color-focus: var(
--spectrum-negative-color-1000
);
--spectrum-checkbox-emphasized-color-default: var(
--spectrum-accent-color-900
);
--spectrum-checkbox-emphasized-color-hover: var(
--spectrum-accent-color-1000
);
--spectrum-checkbox-emphasized-color-down: var(
--spectrum-accent-color-1100
);
--spectrum-checkbox-emphasized-color-focus: var(
--spectrum-accent-color-1000
);
--spectrum-checkbox-control-selected-color-default: var(
--spectrum-neutral-background-color-selected-default
);
--spectrum-checkbox-control-selected-color-hover: var(
--spectrum-neutral-background-color-selected-hover
);
--spectrum-checkbox-control-selected-color-down: var(
--spectrum-neutral-background-color-selected-down
);
--spectrum-checkbox-control-selected-color-focus: var(
--spectrum-neutral-background-color-selected-key-focus
);
--spectrum-checkbox-line-height: var(--spectrum-line-height-100);
--spectrum-checkbox-line-height-cjk: var(--spectrum-cjk-line-height-100);
--spectrum-checkbox-focus-indicator-gap: var(
--spectrum-focus-indicator-gap
);
--spectrum-checkbox-focus-indicator-thickness: var(
--spectrum-focus-indicator-thickness
);
--spectrum-checkbox-border-width: var(--spectrum-border-width-200);
--spectrum-checkbox-selected-border-width: calc(
var(--spectrum-checkbox-control-size) / 2
);
--spectrum-checkbox-animation-duration: var(
--spectrum-animation-duration-100
);
}

:host,
:host {
--spectrum-checkbox-font-size: var(--spectrum-font-size-100);
--spectrum-checkbox-height: var(--spectrum-component-height-100);
--spectrum-checkbox-control-size: var(
--spectrum-checkbox-control-size-medium
);
--spectrum-checkbox-top-to-text: var(--spectrum-component-top-to-text-100);
--spectrum-checkbox-text-to-control: var(--spectrum-text-to-control-100);
}

:host([size='s']) {
--spectrum-checkbox-font-size: var(--spectrum-font-size-75);
--spectrum-checkbox-height: var(--spectrum-component-height-75);
--spectrum-checkbox-control-size: var(
--spectrum-checkbox-control-size-small
);
--spectrum-checkbox-top-to-text: var(--spectrum-component-top-to-text-75);
--spectrum-checkbox-text-to-control: var(--spectrum-text-to-control-75);
}

:host([size='l']) {
--spectrum-checkbox-font-size: var(--spectrum-font-size-200);
--spectrum-checkbox-height: var(--spectrum-component-height-200);
--spectrum-checkbox-control-size: var(
--spectrum-checkbox-control-size-large
);
--spectrum-checkbox-top-to-text: var(--spectrum-component-top-to-text-200);
--spectrum-checkbox-text-to-control: var(--spectrum-text-to-control-200);
}

:host([size='xl']) {
--spectrum-checkbox-font-size: var(--spectrum-font-size-300);
--spectrum-checkbox-height: var(--spectrum-component-height-300);
--spectrum-checkbox-control-size: var(
--spectrum-checkbox-control-size-extra-large
);
--spectrum-checkbox-top-to-text: var(--spectrum-component-top-to-text-300);
--spectrum-checkbox-text-to-control: var(--spectrum-text-to-control-300);
}

:host {
color: var(
--highcontrast-checkbox-content-color-default,
Expand Down Expand Up @@ -79,24 +193,8 @@ governing permissions and limitations under the License.
);
}

:host([readonly]) {
border-color: var(
--highcontrast-checkbox-color-default,
var(
--mod-checkbox-control-selected-color-default,
var(--spectrum-checkbox-control-selected-color-default)
)
);
}

:host([readonly]:is(:active, [active])) #box:before {
border-color: var(
--highcontrast-checkbox-selected-color-default,
var(
--mod-checkbox-control-selected-color-default,
var(--spectrum-checkbox-control-selected-color-default)
)
);
:host([readonly]) #input {
cursor: default;
}

:host([readonly]) #input:checked:disabled + #box:before,
Expand All @@ -119,7 +217,6 @@ governing permissions and limitations under the License.

:host([readonly]) #input:checked:disabled ~ #label,
:host([readonly]) #input:disabled ~ #label {
forced-color-adjust: none;
color: var(
--highcontrast-checkbox-color-default,
var(
Expand Down Expand Up @@ -248,7 +345,7 @@ governing permissions and limitations under the License.
}

:host([invalid][invalid]:hover) #box:before,
:host([invalid][invalid]:hover) #input:checked + #box:before {
:host([invalid][invalid]:hover) #input:checked + #box {
border-color: var(
--highcontrast-checkbox-color-hover,
var(
Expand All @@ -258,16 +355,6 @@ governing permissions and limitations under the License.
);
}

:host([readonly]:hover) #box:before {
border-color: var(
--highcontrast-checkbox-color-default,
var(
--mod-checkbox-control-selected-color-default,
var(--spectrum-checkbox-control-selected-color-default)
)
);
}

:host([indeterminate]:hover) #box:before,
:host([indeterminate]:hover) #input:checked + #box:before {
border-color: var(
Expand Down Expand Up @@ -422,7 +509,7 @@ governing permissions and limitations under the License.
box-sizing: border-box;
inline-size: 100%;
block-size: 100%;
opacity: 0.0001;
opacity: 0;
z-index: 1;
cursor: pointer;
margin: 0;
Expand Down Expand Up @@ -521,9 +608,6 @@ governing permissions and limitations under the License.
var(--spectrum-checkbox-control-size)
)
);
--spectrum-checkbox-selected-border-width: calc(
var(--spectrum-checkbox-control-size) / 2
);
margin: calc(
var(--mod-checkbox-spacing, var(--spectrum-checkbox-spacing)) / 2
)
Expand Down Expand Up @@ -693,11 +777,8 @@ governing permissions and limitations under the License.
)
);
outline-offset: var(
--highcontrast-checkbox-focus-indicator-gap,
var(
--mod-checkbox-focus-indicator-gap,
var(--spectrum-checkbox-focus-indicator-gap)
)
--mod-checkbox-focus-indicator-gap,
var(--spectrum-checkbox-focus-indicator-gap)
);
outline-style: auto;
outline-width: var(
Expand Down
2 changes: 1 addition & 1 deletion packages/menu/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"@spectrum-web-components/shared": "^1.1.1"
},
"devDependencies": {
"@spectrum-css/menu": "8.0.0-s2-foundations.16"
"@spectrum-css/menu": "8.0.0-s2-foundations.17"
},
"types": "./src/index.d.ts",
"customElements": "custom-elements.json",
Expand Down
Loading

0 comments on commit 1aa543d

Please sign in to comment.