Skip to content

Commit 652e0da

Browse files
HDS-4532 Clan up css to remove redundant gap custom property
1 parent e012cdc commit 652e0da

File tree

1 file changed

+45
-17
lines changed
  • packages/components/src/styles/components/layout

1 file changed

+45
-17
lines changed

packages/components/src/styles/components/layout/grid.scss

+45-17
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,26 @@
99

1010
.hds-layout-grid {
1111
display: grid;
12-
// Note: "Unitless 0" <length>s aren’t supported in math functions so we use 0px as the default col min width
13-
// https://drafts.csswg.org/css-values/#calc-type-checking
12+
// The column gap value is subtracted from the column-min-width to prevent overflow & simplify API for consumers
1413

15-
// Gap is subtracted from column-min-width to prevent overflow & simplify API for consumers
14+
// Note: "Unitless 0" <length>s aren’t supported in math functions so we use 0px as a fallback value within calc()
15+
// https://drafts.csswg.org/css-values/#calc-type-checking
1616
grid-template-columns:
1717
repeat(
1818
auto-fit,
1919
minmax(
2020
calc(
21-
var(--hds-layout-grid-column-min-width, 0px) - var(--hds-layout-grid-gap, var(--hds-layout-grid-column-gap, 0px)) ),
21+
var(--hds-layout-grid-column-min-width, 0px) - var(--hds-layout-grid-column-gap, 0px)
22+
),
2223
1fr
2324
)
2425
);
2526

2627
// Note: The gap style is defined here to avoid setting it repeatedly for the gap size variants defined below.
2728
// For the gap size variants, we override the value of the gap custom properties to set the desired sizes.
2829
gap:
29-
var(--hds-layout-grid-row-gap, var(--hds-layout-grid-gap, 0)) // rowGap
30-
var(--hds-layout-grid-column-gap, var(--hds-layout-grid-gap, 0)); // columnGap
30+
var(--hds-layout-grid-row-gap, 0)
31+
var(--hds-layout-grid-column-gap, 0);
3132
}
3233

3334
// inline
@@ -47,18 +48,45 @@
4748

4849
// gap
4950

50-
// We set the values of the gap custom properties overriding the default value of 0px
51+
// We set the values of the gap custom properties overriding the default value of 0
52+
53+
// set row & column gap size together
54+
.hds-layout-grid--gap-4 {
55+
--hds-layout-grid-row-gap: 4px;
56+
--hds-layout-grid-column-gap: 4px;
57+
}
58+
59+
.hds-layout-grid--gap-8 {
60+
--hds-layout-grid-row-gap: 8px;
61+
--hds-layout-grid-column-gap: 8px;
62+
}
63+
64+
.hds-layout-grid--gap-12 {
65+
--hds-layout-grid-row-gap: 12px;
66+
--hds-layout-grid-column-gap: 12px;
67+
}
5168

52-
// set row & column gap together
53-
.hds-layout-grid--gap-4 { --hds-layout-grid-gap: 4px;}
54-
.hds-layout-grid--gap-8 { --hds-layout-grid-gap: 8px; }
55-
.hds-layout-grid--gap-12 { --hds-layout-grid-gap: 12px; }
56-
.hds-layout-grid--gap-16 { --hds-layout-grid-gap: 16px; }
57-
.hds-layout-grid--gap-24 { --hds-layout-grid-gap: 24px; }
58-
.hds-layout-grid--gap-32 { --hds-layout-grid-gap: 32px; }
59-
.hds-layout-grid--gap-48 { --hds-layout-grid-gap: 48px; }
69+
.hds-layout-grid--gap-16 {
70+
--hds-layout-grid-row-gap: 16px;
71+
--hds-layout-grid-column-gap: 16px;
72+
}
73+
74+
.hds-layout-grid--gap-24 {
75+
--hds-layout-grid-row-gap: 24px;
76+
--hds-layout-grid-column-gap: 24px;
77+
}
78+
79+
.hds-layout-grid--gap-32 {
80+
--hds-layout-grid-row-gap: 32px;
81+
--hds-layout-grid-column-gap: 32px;
82+
}
83+
84+
.hds-layout-grid--gap-48 {
85+
--hds-layout-grid-row-gap: 48px;
86+
--hds-layout-grid-column-gap: 48px;
87+
}
6088

61-
// set just row gap
89+
// set just row gap size
6290
.hds-layout-grid--row-gap-4 { --hds-layout-grid-row-gap: 4px; }
6391
.hds-layout-grid--row-gap-8 { --hds-layout-grid-row-gap: 8px; }
6492
.hds-layout-grid--row-gap-12 { --hds-layout-grid-row-gap: 12px; }
@@ -67,7 +95,7 @@
6795
.hds-layout-grid--row-gap-32 { --hds-layout-grid-row-gap: 32px; }
6896
.hds-layout-grid--row-gap-48 { --hds-layout-grid-row-gap: 48px; }
6997

70-
// set just column gap
98+
// set just column gap size
7199
.hds-layout-grid--column-gap-4 { --hds-layout-grid-column-gap: 4px; }
72100
.hds-layout-grid--column-gap-8 { --hds-layout-grid-column-gap: 8px; }
73101
.hds-layout-grid--column-gap-12 { --hds-layout-grid-column-gap: 12px; }

0 commit comments

Comments
 (0)