Skip to content

Commit 7262ccd

Browse files
committed
fix(field-group,styles): use latest CSS
1 parent e58902c commit 7262ccd

File tree

5 files changed

+16
-24
lines changed

5 files changed

+16
-24
lines changed

.changeset/stale-candies-camp.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
'@spectrum-web-components/close-button': patch
33
'@spectrum-web-components/dropzone': patch
4+
'@spectrum-web-components/field-group': patch
45
'@spectrum-web-components/illustrated-message': patch
56
'@spectrum-web-components/menu': patch
67
'@spectrum-web-components/status-light': patch

packages/field-group/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"@spectrum-web-components/help-text": "1.5.0"
6969
},
7070
"devDependencies": {
71-
"@spectrum-css/fieldgroup": "6.0.1"
71+
"@spectrum-css/fieldgroup": "7.1.0"
7272
},
7373
"types": "./src/index.d.ts",
7474
"customElements": "custom-elements.json",

packages/field-group/src/field-group.css

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,8 @@ governing permissions and limitations under the License.
1111
*/
1212

1313
@import url('./spectrum-field-group.css');
14-
@import url('./field-group-overrides.css');
1514

16-
:host([horizontal][dir='rtl']) slot:not([name])::slotted(*:not(:last-child)),
17-
:host([dir='rtl']:not([vertical]))
18-
slot:not([name])::slotted(*:not(:last-child)) {
15+
:host(:not([vertical])) .group {
1916
/* .spectrum-FieldGroup--horizontal .spectrum-FieldGroup-item+.spectrum-FieldGroup-item */
20-
margin: 0 0 0 var(--spectrum-fieldgroup-margin);
21-
}
22-
23-
:host([horizontal][dir='ltr']) slot:not([name])::slotted(*:not(:last-child)),
24-
:host([dir='ltr']:not([vertical]))
25-
slot:not([name])::slotted(*:not(:last-child)) {
26-
/* .spectrum-FieldGroup--horizontal .spectrum-FieldGroup-item+.spectrum-FieldGroup-item */
27-
margin: 0 var(--spectrum-fieldgroup-margin) 0 0;
17+
gap: var(--spectrum-spacing-300);
2818
}

packages/field-group/src/spectrum-field-group.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ governing permissions and limitations under the License.
1212

1313
/* THIS FILE IS MACHINE GENERATED. DO NOT EDIT */
1414
.group {
15-
--spectrum-fieldgroup-margin: var(--spectrum-spacing-300);
1615
flex-flow: column wrap;
1716
display: flex;
1817
}
@@ -39,7 +38,7 @@ governing permissions and limitations under the License.
3938
}
4039

4140
:host([horizontal]) .group slot:not([name])::slotted(:not(:last-child)) {
42-
margin-inline-end: var(--spectrum-fieldgroup-margin);
41+
margin-inline-end: var(--spectrum-spacing-300);
4342
}
4443

4544
:host([horizontal]) .group .spectrum-HelpText {

yarn.lock

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7728,22 +7728,24 @@ __metadata:
77287728
languageName: node
77297729
linkType: hard
77307730

7731-
"@spectrum-css/fieldgroup@npm:6.0.1":
7732-
version: 6.0.1
7733-
resolution: "@spectrum-css/fieldgroup@npm:6.0.1"
7731+
"@spectrum-css/fieldgroup@npm:7.1.0":
7732+
version: 7.1.0
7733+
resolution: "@spectrum-css/fieldgroup@npm:7.1.0"
77347734
peerDependencies:
7735-
"@spectrum-css/checkbox": ">=9"
7736-
"@spectrum-css/helptext": ">=5"
7737-
"@spectrum-css/radio": ">=9"
7738-
"@spectrum-css/tokens": ">=14 || >=15"
7735+
"@spectrum-css/checkbox": ">=10.0.0 <11.0.0"
7736+
"@spectrum-css/helptext": ">=7.0.0 <8.0.0"
7737+
"@spectrum-css/radio": ">=10.0.0 <11.0.0"
7738+
"@spectrum-css/tokens": ">=16.0.0 <17.0.0"
77397739
peerDependenciesMeta:
77407740
"@spectrum-css/checkbox":
77417741
optional: true
77427742
"@spectrum-css/helptext":
77437743
optional: true
77447744
"@spectrum-css/radio":
77457745
optional: true
7746-
checksum: 10c0/8cd88744e799383ccbe772956447962ed5d9b44f26d742ca3cb66e6f5311dc4477990f1d5b2475fe696d32c042377d80cd8b4107de74b2a74d7790511c51327c
7746+
"@spectrum-css/tokens":
7747+
optional: true
7748+
checksum: 10c0/bb3b1fef4ddb1fe7dafc101bf72367c61cc1bcf050be98f0e55013f86c3f96b167a0b281d9c55b167616a6c16dc57b3c7fa2bd2df8c0bd5524ca741cf94e2667
77477749
languageName: node
77487750
linkType: hard
77497751

@@ -8864,7 +8866,7 @@ __metadata:
88648866
version: 0.0.0-use.local
88658867
resolution: "@spectrum-web-components/field-group@workspace:packages/field-group"
88668868
dependencies:
8867-
"@spectrum-css/fieldgroup": "npm:6.0.1"
8869+
"@spectrum-css/fieldgroup": "npm:7.1.0"
88688870
"@spectrum-web-components/base": "npm:1.5.0"
88698871
"@spectrum-web-components/help-text": "npm:1.5.0"
88708872
languageName: unknown

0 commit comments

Comments
 (0)