Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(coachmark): S2 migration #3412

Open
wants to merge 3 commits into
base: spectrum-two
Choose a base branch
from
+29 −14
Open

feat(coachmark): S2 migration #3412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25f3615
feat(coachmark): s2 migration
cdransf Nov 21, 2024
15b294c
feat(coachmark): line height token
cdransf Nov 22, 2024
c7098c0
feat(coachmark): font token revisions
cdransf Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .changeset/nice-cows-shout.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
"@spectrum-css/coachmark": major
---

# S2 coachmark migration

This migrates the `coachmark` component to S2. Custom properties have been remapped per the design spec.

| Before | After |
| ------------------------------------------ | ----------------------------------------------- |
| --spectrum-heading-sans-serif-font-weight | --spectrum-title-sans-serif-font-weight |
| --spectrum-coach-mark-title-size | --spectrum-coach-mark-title-font-size |
| --spectrum-heading-line-height | --spectrum-title-line-height |
| --spectrum-coach-mark-body-size | --spectrum-coach-mark-body-font-size |
| --spectrum-body-sans-serif-font-style | --spectrum-body-serif-font-style |
| --spectrum-coach-mark-pagination-body-size | --spectrum-coach-mark-pagination-body-font-size |
27 changes: 13 additions & 14 deletions components/coachmark/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
Copyright 2023 Adobe. All rights reserved.
Copyright 2024 Adobe. All rights reserved.
This file is licensed to you under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. You may obtain a copy
of the License at http://www.apache.org/licenses/LICENSE-2.0
Expand All @@ -11,8 +11,8 @@ governing permissions and limitations under the License.
*/

.spectrum-CoachMark {
--spectrum-coachmark-min-width: var(--spectrum-coach-mark-minimum-width);
--spectrum-coachmark-width: var(--spectrum-coach-mark-width);
--spectrum-coachmark-min-width: var(--spectrum-coach-mark-minimum-width);
--spectrum-coachmark-width: var(--spectrum-coach-mark-width);
--spectrum-coachmark-max-width: var(--spectrum-coach-mark-maximum-width);

--spectrum-coachmark-media-height: var(--spectrum-coach-mark-media-height);
Expand All @@ -30,24 +30,24 @@ governing permissions and limitations under the License.
/* font */
--spectrum-coachmark-title-color: var(--spectrum-heading-color);
--spectrum-coachmark-title-font-family: var(--spectrum-sans-serif-font);
--spectrum-coachmark-title-font-style: var(--spectrum-heading-serif-font-style);
--spectrum-coachmark-title-text-font-weight: var(--spectrum-heading-sans-serif-font-weight);
--spectrum-coachmark-title-font-size: var(--spectrum-coach-mark-title-size);
--spectrum-coachmark-title-text-line-height: var(--spectrum-heading-line-height);
--spectrum-coachmark-title-font-style: var(--spectrum-title-serif-font-style);
--spectrum-coachmark-title-text-font-weight: var(--spectrum-title-sans-serif-font-weight);
--spectrum-coachmark-title-font-size: var(--spectrum-coach-mark-title-font-size);
--spectrum-coachmark-title-text-line-height: var(--spectrum-title-line-height);

--spectrum-coachmark-content-font-color: var(--spectrum-body-color);
--spectrum-coachmark-content-font-weight: var(--spectrum-body-sans-serif-font-weight);
--spectrum-coachmark-content-font-family: var(--spectrum-sans-serif-font);
--spectrum-coachmark-content-font-style: var(--spectrum-body-sans-serif-font-style);
--spectrum-coachmark-content-line-height: var(--spectrum-body-line-height);
--spectrum-coachmark-content-font-size: var(--spectrum-coach-mark-body-size);
--spectrum-coachmark-content-font-size: var(--spectrum-coach-mark-body-font-size);

--spectrum-coachmark-step-color: var(--spectrum-coach-mark-pagination-color);
--spectrum-coachmark-step-font-weight: var(--spectrum-body-medium-font-weight);
--spectrum-coachmark-step-font-family: var(--spectrum-sans-serif-font);
--spectrum-coachmark-step-font-style: var(--spectrum-body-sans-serif-font-style);
--spectrum-coachmark-step-line-height: var(--spectrum-body-line-height);
--spectrum-coachmark-step-font-size: var(--spectrum-coach-mark-pagination-body-size);
--spectrum-coachmark-step-font-style: var(--spectrum-body-serif-font-style);
--spectrum-coachmark-step-line-height: var(--spectrum-line-height-200);
--spectrum-coachmark-step-font-size: var(--spectrum-coach-mark-pagination-body-font-size);
--spectrum-coachmark-step-to-bottom: var(--spectrum-coach-mark-pagination-text-to-bottom-edge);

/* mods */
Expand All @@ -59,7 +59,7 @@ governing permissions and limitations under the License.
}

.spectrum-CoachMark {
position: relative;
position: relative;
min-inline-size: var(--mod-coachmark-min-width, var(--spectrum-coachmark-min-width));
max-inline-size: var(--mod-coachmark-max-width, var(--spectrum-coachmark-max-width));
inline-size: var(--mod-coachmark-width, var(--spectrum-coachmark-width));
Expand Down Expand Up @@ -108,7 +108,6 @@ governing permissions and limitations under the License.
padding-inline: var(--mod-coachmark-padding, var(--spectrum-coachmark-padding));
}


.spectrum-CoachMark-header {
padding-block-start: var(--mod-coachmark-padding, var(--spectrum-coachmark-padding));
display: flex;
Expand All @@ -120,7 +119,7 @@ governing permissions and limitations under the License.
.spectrum-CoachMark-action-menu {
white-space: nowrap;
z-index: 1;
margin-inline-start: var(--mod-coachmark-heading-to-action-button, var(--spectrum-coachmark-heading-to-action-button))
margin-inline-start: var(--mod-coachmark-heading-to-action-button, var(--spectrum-coachmark-heading-to-action-button));
}

.spectrum-CoachMark-content {
Expand Down
Loading