Skip to content

Commit e2960f4

Browse files
jenndiazpfulton
andauthored
feat(inlinealert)!: updates tokens (#1695)
BREAKING CHANGE: migrates In-Line Alert to the new tokens system. --------- Co-authored-by: Patrick Fulton <pfulton@adobe.com>
1 parent 72a1b36 commit e2960f4

File tree

6 files changed

+51
-23
lines changed

6 files changed

+51
-23
lines changed

components/inlinealert/index.css

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,20 @@ governing permissions and limitations under the License.
1212

1313
.spectrum-InLineAlert {
1414
/* Font */
15-
--spectrum-inlinealert-font-weight: var(--spectrum-bold-font-weight);
15+
--spectrum-inlinealert-heading-font-family: var(--spectrum-sans-font-family-stack);
16+
--spectrum-inlinealert-heading-font-weight: var(--spectrum-heading-sans-serif-font-weight);
17+
--spectrum-inlinealert-heading-font-style: var(--spectrum-heading-sans-serif-font-style);
18+
--spectrum-inlinealert-heading-font-size: var(--spectrum-heading-size-xxs);
19+
--spectrum-inlinealert-heading-line-height: var(--spectrum-heading-line-height);
20+
21+
--spectrum-inlinealert-content-font-family: var(--spectrum-sans-font-family-stack);
22+
--spectrum-inlinealert-content-font-weight: var(--spectrum-body-sans-serif-font-weight);
23+
--spectrum-inlinealert-content-font-style: var(--spectrum-body-sans-serif-font-style);
24+
--spectrum-inlinealert-content-font-size: var(--spectrum-body-size-s);
25+
--spectrum-inlinealert-content-line-height: var(--spectrum-body-line-height);
1626

1727
/* Size*/
18-
--spectrum-inlinealert-border-width: var(--spectrum-border-width-100);
28+
--spectrum-inlinealert-border-width: var(--spectrum-border-width-200);
1929
--spectrum-inlinealert-border-radius: var(--spectrum-corner-radius-100);
2030
--spectrum-inlinealert-icon-size: var(--spectrum-workflow-icon-size-100);
2131
--spectrum-inlinealert-min-inline-size: var(--spectrum-in-line-alert-minimum-width);
@@ -27,9 +37,14 @@ governing permissions and limitations under the License.
2737
--spectrum-inlinealert-spacing-header-content-button: var(--spectrum-spacing-300);
2838

2939
/* Color */
30-
--spectrum-inlinealert-background-color: var(--spectrum-gray-50);
31-
--spectrum-inlinealert-border-and-icon-color: var(--spectrum-gray-600);
32-
--spectrum-inlinealert-header-and-content-color: var(--spectrum-gray-900);
40+
--spectrum-inlinealert-background-color: var(--spectrum-background-layer-2-color);
41+
--spectrum-inlinealert-border-and-icon-color: var(--spectrum-neutral-visual-color);
42+
--spectrum-inlinealert-header-color: var(--spectrum-heading-color);
43+
--spectrum-inlinealert-content-color: var(--spectrum-body-color);
44+
--spectrum-inlinealert-border-and-icon-color-info: var(--spectrum-informative-visual-color);
45+
--spectrum-inlinealert-border-and-icon-color-positive: var(--spectrum-positive-visual-color);
46+
--spectrum-inlinealert-border-and-icon-color-notice: var(--spectrum-notice-visual-color);
47+
--spectrum-inlinealert-border-and-icon-color-negative: var(--spectrum-negative-visual-color);
3348
}
3449

3550
.spectrum-InLineAlert {
@@ -54,7 +69,8 @@ governing permissions and limitations under the License.
5469
@media (forced-colors: active) {
5570
.spectrum-InLineAlert {
5671
--highcontrast-inlinealert-background-color: Background;
57-
--highcontrast-inlinealert-header-and-content-color: CanvasText;
72+
--highcontrast-inlinealert-header-color: CanvasText;
73+
--highcontrast-inlinealert-content-color: CanvasText;
5874
--highcontrast-inlinealert-border-and-icon-color: ButtonBorder;
5975
}
6076
}
@@ -71,12 +87,16 @@ governing permissions and limitations under the License.
7187
/* Minimum space between header and icon */
7288
gap: var(--mod-inlinealert-spacing-header-to-icon, var(--spectrum-inlinealert-spacing-header-to-icon));
7389

74-
font-weight: var(--mod-inlinealert-font-weight, var(--spectrum-inlinealert-font-weight));
90+
font-weight: var(--mod-inlinealert-heading-font-weight, var(--spectrum-inlinealert-heading-font-weight));
91+
font-family: var(--mod-inlinealert-heading-font-family, var(--spectrum-inlinealert-heading-font-family));
92+
font-style: var(--mod-inlinealert-heading-font-style, var(--spectrum-inlinealert-heading-font-style));
93+
font-size: var(--mod-inlinealert-heading-font-size, var(--spectrum-inlinealert-heading-font-size));
94+
line-height: var(--mod-inlinealert-heading-line-height, var(--spectrum-inlinealert-heading-line-height));
7595
text-transform: none;
7696

7797
min-block-size: var(--mod-inlinealert-header-min-block-size, var(--spectrum-inlinealert-header-min-block-size));
7898

79-
color: var(--highcontrast-inlinealert-header-and-content-color, var(--mod-inlinealert-header-and-content-color, var(--spectrum-inlinealert-header-and-content-color)));
99+
color: var(--highcontrast-inlinealert-header-color, var(--mod-inlinealert-header-color, var(--spectrum-inlinealert-header-color)));
80100
}
81101

82102
.spectrum-InLineAlert-content {
@@ -89,7 +109,13 @@ governing permissions and limitations under the License.
89109

90110
word-wrap: break-word;
91111

92-
color: var(--highcontrast-inlinealert-header-and-content-color, var(--mod-inlinealert-header-and-content-color, var(--spectrum-inlinealert-header-and-content-color)));
112+
font-weight: var(--mod-inlinealert-content-font-weight, var(--spectrum-inlinealert-content-font-weight));
113+
font-family: var(--mod-inlinealert-content-font-family, var(--spectrum-inlinealert-content-font-family));
114+
font-style: var(--mod-inlinealert-content-font-style, var(--spectrum-inlinealert-content-font-style));
115+
font-size: var(--mod-inlinealert-content-font-size, var(--spectrum-inlinealert-content-font-size));
116+
line-height: var(--mod-inlinealert-content-line-height, var(--spectrum-inlinealert-content-line-height));
117+
118+
color: var(--highcontrast-inlinealert-content-color, var(--mod-inlinealert-content-color, var(--spectrum-inlinealert-content-color)));
93119
}
94120

95121
.spectrum-InLineAlert-footer {

components/inlinealert/metadata/mods.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,20 @@
88
|`--mod-inlinealert-border-and-icon-color`|
99
|`--mod-inlinealert-icon-size`|
1010
|`--mod-inlinealert-spacing-header-to-icon`|
11-
|`--mod-inlinealert-font-weight`|
11+
|`--mod-inlinealert-heading-font-weight`|
12+
|`--mod-inlinealert-heading-font-family`|
13+
|`--mod-inlinealert-heading-font-style`|
14+
|`--mod-inlinealert-heading-font-size`|
15+
|`--mod-inlinealert-heading-line-height`|
1216
|`--mod-inlinealert-header-min-block-size`|
13-
|`--mod-inlinealert-header-and-content-color`|
17+
|`--mod-inlinealert-header-color`|
1418
|`--mod-inlinealert-spacing-header-content-button`|
19+
|`--mod-inlinealert-content-font-weight`|
20+
|`--mod-inlinealert-content-font-family`|
21+
|`--mod-inlinealert-content-font-style`|
22+
|`--mod-inlinealert-content-font-size`|
23+
|`--mod-inlinealert-content-line-height`|
24+
|`--mod-inlinealert-content-color`|
1525
|`--mod-inlinealert-border-and-icon-color-info`|
1626
|`--mod-inlinealert-border-and-icon-color-notice`|
1727
|`--mod-inlinealert-border-and-icon-color-positive`|

components/inlinealert/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
"build": "gulp"
1919
},
2020
"peerDependencies": {
21-
"@spectrum-css/icon": "^3.0.0",
22-
"@spectrum-css/tokens": "^7.0.0"
21+
"@spectrum-css/icon": "^3.0.35",
22+
"@spectrum-css/tokens": "^7.7.0"
2323
},
2424
"devDependencies": {
25-
"@spectrum-css/button": "^6.0.21",
25+
"@spectrum-css/button": "^9.0.11",
2626
"@spectrum-css/component-builder-simple": "^2.0.7",
2727
"@spectrum-css/icon": "^3.0.35",
2828
"@spectrum-css/tokens": "^7.7.0",

components/inlinealert/stories/inlinealert.stories.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default {
3333
type: { summary: "string" },
3434
category: "Component",
3535
},
36-
options: ["neutral", "info", "positive", "notice", "negative", "closable"],
36+
options: ["neutral", "info", "positive", "notice", "negative"],
3737
control: "select"
3838
},
3939
isClosable: {

components/inlinealert/themes/express.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,5 @@ governing permissions and limitations under the License.
1111

1212
@container (--system: express) {
1313
.spectrum-InLineAlert {
14-
--spectrum-inlinealert-border-and-icon-color-info: var(--spectrum-blue-1000);
15-
--spectrum-inlinealert-border-and-icon-color-positive: var(--spectrum-green-1000);
16-
--spectrum-inlinealert-border-and-icon-color-notice: var(--spectrum-orange-800);
17-
--spectrum-inlinealert-border-and-icon-color-negative: var(--spectrum-red-1000);
1814
}
1915
}

components/inlinealert/themes/spectrum.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,5 @@ governing permissions and limitations under the License.
1111

1212
@container (--system: spectrum) {
1313
.spectrum-InLineAlert {
14-
--spectrum-inlinealert-border-and-icon-color-info: var(--spectrum-blue-800);
15-
--spectrum-inlinealert-border-and-icon-color-positive: var(--spectrum-green-800);
16-
--spectrum-inlinealert-border-and-icon-color-notice: var(--spectrum-orange-600);
17-
--spectrum-inlinealert-border-and-icon-color-negative: var(--spectrum-red-800);
1814
}
1915
}

0 commit comments

Comments
 (0)