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

Update to Style Dictionary v4 #203

Merged
merged 16 commits into from
Sep 20, 2024
Merged

Update to Style Dictionary v4 #203

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7134ce2
chore: update to sd v4
Aug 13, 2024
f08c1d2
chore: update dependencies and fix android output
Aug 13, 2024
93297a6
chore: fix concat files
Aug 13, 2024
84dd48a
chore: fix ios output
Aug 14, 2024
6ddbba3
chore: update package lock
Aug 14, 2024
744d062
chore: update pipeline
Aug 14, 2024
ab7d6b8
bugfix: fix android output and add filepath to figma to implement new…
Aug 15, 2024
959c43c
chore: migrate to dtcg
Aug 19, 2024
f6fe644
merge next
sikhote Aug 28, 2024
1bd960b
fix global name convention
Aug 29, 2024
7672cde
remove async actions
Aug 30, 2024
702ab25
debug validation
Sep 6, 2024
ab809a0
fix async build
Sep 6, 2024
39a3a0a
remove redundant config
Sep 6, 2024
35638fa
change validate function
Sep 6, 2024
02b2ddf
remove async from actions
Sep 12, 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
6 changes: 3 additions & 3 deletions .github/workflows/node.js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:

strategy:
matrix:
node-version: [14.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
Expand Down
4 changes: 1 addition & 3 deletions dist/docsite/android/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>


<resources>
<color name="cdr_color_text_button_primary">#fff9f8f6</color>
<color name="cdr_color_text_button_primary_hover">#ff1f513f</color>
Expand Down Expand Up @@ -279,5 +278,4 @@
<color name="cdr_knockout_color_border_table_row">#ff4e4d49</color>
<color name="cdr_knockout_color_icon_inverse_default">#ffdcd6cb</color>
<color name="cdr_knockout_color_icon_background_note">#ffc4b03b</color>

</resources>
</resources>
15 changes: 12 additions & 3 deletions dist/docsite/android/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>


<resources>
<dimen name="cdr_form_input_height_default">40.00dp</dimen>
<dimen name="cdr_form_input_height_large">48.00dp</dimen>
Expand Down Expand Up @@ -88,16 +87,26 @@
<dimen name="cdr_space_inset_four_x_squish_left_right">64.00dp</dimen>
<dimen name="cdr_space_inset_four_x_stretch_top_bottom">96.00dp</dimen>
<dimen name="cdr_space_inset_four_x_stretch_left_right">64.00dp</dimen>
<dimen name="cdr_text_default_display1_size">34.00sp</dimen>
<dimen name="cdr_text_default_display1_line_spacing">40.00dp</dimen>
<dimen name="cdr_text_default_title1_size">26.00sp</dimen>
<dimen name="cdr_text_default_title1_line_spacing">36.00dp</dimen>
<dimen name="cdr_text_default_title2_size">24.00sp</dimen>
<dimen name="cdr_text_default_title2_line_spacing">32.00dp</dimen>
<dimen name="cdr_text_default_title3_size">19.00sp</dimen>
<dimen name="cdr_text_default_title3_line_spacing">28.00dp</dimen>
<dimen name="cdr_text_default_headline_size">17.00sp</dimen>
<dimen name="cdr_text_default_headline_line_spacing">24.00dp</dimen>
<dimen name="cdr_text_default_subheadline_size">15.00sp</dimen>
<dimen name="cdr_text_default_subheadline_line_spacing">20.00dp</dimen>
<dimen name="cdr_text_default_body1_size">15.00sp</dimen>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is size intended to be added to the output?

<dimen name="cdr_text_default_body1_line_spacing">20.00dp</dimen>
<dimen name="cdr_text_default_body2_size">12.00sp</dimen>
<dimen name="cdr_text_default_body2_line_spacing">18.00dp</dimen>
<dimen name="cdr_text_default_caption1_size">12.00sp</dimen>
<dimen name="cdr_text_default_caption1_line_spacing">16.00dp</dimen>
<dimen name="cdr_text_default_caption2_size">11.00sp</dimen>
<dimen name="cdr_text_default_caption2_line_spacing">16.00dp</dimen>
<dimen name="cdr_text_default_button_size">15.00sp</dimen>
<dimen name="cdr_text_default_button_line_spacing">24.00dp</dimen>

</resources>
</resources>
4 changes: 1 addition & 3 deletions dist/docsite/android/font_dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>


<resources>
<dimen name="cdr_text_default_display1_size">34.00sp</dimen>
<dimen name="cdr_text_default_title1_size">26.00sp</dimen>
Expand All @@ -13,5 +12,4 @@
<dimen name="cdr_text_default_caption1_size">12.00sp</dimen>
<dimen name="cdr_text_default_caption2_size">11.00sp</dimen>
<dimen name="cdr_text_default_button_size">15.00sp</dimen>

</resources>
</resources>
Loading