Skip to content

Commit 1a2491e

Browse files
committed
fix(pagination): deprecate legacy features to align with foundations
1 parent 0bce7a5 commit 1a2491e

File tree

5 files changed

+17
-37
lines changed

5 files changed

+17
-37
lines changed

.storybook/modes/index.js

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,22 @@
1212
*/
1313

1414
const modes = {
15-
"Light | LTR": {
16-
color: "light",
17-
textDirection: "ltr",
18-
},
19-
"Dark | RTL": {
20-
color: "dark",
21-
textDirection: "rtl",
22-
},
23-
"S1 | Light | LTR": {
24-
context: "legacy",
25-
color: "light",
26-
textDirection: "ltr",
27-
},
28-
"Express | Light | LTR": {
29-
context: "express",
30-
color: "light",
31-
textDirection: "ltr",
32-
},
15+
Light: {
16+
color: "light",
17+
},
18+
Dark: {
19+
color: "dark",
20+
},
21+
RTL: {
22+
textDirection: "rtl",
23+
},
3324
};
3425

3526
export default modes;
3627

3728
export const disableDefaultModes = {
38-
...Object.keys(modes).reduce((acc, key) => {
39-
acc[key] = { disable: true };
40-
return acc;
41-
}, {}),
29+
...Object.keys(modes).reduce((acc, key) => {
30+
acc[key] = { disable: true };
31+
return acc;
32+
}, {}),
4233
};

.storybook/preview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export const parameters = {
9090
// Set an empty object to avoid the "undefined" value in the ComponentDetails doc block
9191
packageJson: {},
9292
// A list of published npm tags that should not appear in the ComponentDetails doc block
93-
ignoredTags: ["beta", "next"],
93+
ignoredTags: ["beta"],
9494
};
9595

9696
export default {

components/card/index.css

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
--spectrum-card-border-width: var(--mod-card-border-width, var(--spectrum-border-width-100));
3232
--spectrum-card-corner-radius: var(--mod-card-corner-radius, var(--spectrum-corner-radius-100));
33+
--spectrum-card-border-color-selected: var(--mod-card-border-color-selected, var(--spectrum-blue-700));
3334

3435
/* Typography */
3536
--spectrum-card-title-font-family: var(--mod-card-title-font-family, var(--spectrum-sans-font-family-stack));
@@ -81,13 +82,6 @@
8182
--spectrum-card-content-margin-top: var(--spectrum-spacing-100);
8283
}
8384

84-
&.is-selected,
85-
&.is-drop-target {
86-
--spectrum-card-border-color: var(--mod-card-border-color-selected, var(--spectrum-blue-700));
87-
}
88-
}
89-
90-
.spectrum-Card {
9185
position: relative;
9286
display: inline-flex;
9387
flex-direction: column;

components/pagination/CHANGELOG.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,7 @@ Output for all component CSS files is now being run through a lightweight optimi
313313

314314
- feat(pagination)!: migrate to spectrum tokens package([f29a74d](https://github.com/adobe/spectrum-css/commit/f29a74d))
315315

316-
###
317-
318-
🛑 BREAKING CHANGES
316+
### 🛑 BREAKING CHANGES
319317

320318
- Replaces DNA tokens with Spectrum tokens.
321319

@@ -434,7 +432,6 @@ Add the "Button style" version of Pagination from the docs to Storybook.
434432
### 🔙 Reverts
435433

436434
- gulp and build updates ([#2121](https://github.com/adobe/spectrum-css/issues/2121))([03a37f5](https://github.com/adobe/spectrum-css/commit/03a37f5)), closes[#2099](https://github.com/adobe/spectrum-css/issues/2099)
437-
<a name="6.0.40"></a>
438435

439436
## 6.0.40
440437

@@ -500,7 +497,7 @@ Add the "Button style" version of Pagination from the docs to Storybook.
500497

501498
### 🐛 Bug fixes
502499

503-
\*icon sizing in Storybook story templates ([#2037](https://github.com/adobe/spectrum-css/issues/2037))([c90c8a3](https://github.com/adobe/spectrum-css/commit/c90c8a3))
500+
- icon sizing in Storybook story templates ([#2037](https://github.com/adobe/spectrum-css/issues/2037))([c90c8a3](https://github.com/adobe/spectrum-css/commit/c90c8a3))
504501

505502
<a name="6.0.32"></a>
506503

tools/generator/templates/index.css.hbs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
// color: var(--highcontrast-{{ folderName }}-content-color-default, var(--mod-{{ folderName }}-content-color-default, var(--spectrum-{{ folderName }}-content-color-default)));
1616

1717
&.spectrum-{{ pascalCase name }}--sizeS {}
18-
&,
19-
&.spectrum-{{ pascalCase name }}--sizeM {}
2018
&.spectrum-{{ pascalCase name }}--sizeL {}
2119
&.spectrum-{{ pascalCase name }}--sizeXL {}
2220
}

0 commit comments

Comments
 (0)