Skip to content

Commit

Permalink
Merge pull request #1797 from chanzuckerberg/release-v13.7.0
Browse files Browse the repository at this point in the history
## [13.7.0](v13.6.1...v13.7.0) (2023-11-06)

[Storybook](https://61313967cde49b003ae2a860-wtqbmpxmdj.chromatic.com/)

### Features

* **Heading:** add preset typography prop and values ([5732144](5732144))
* **Text:** add preset typography prop ([4422e8e](4422e8e))


### Bug Fixes

* **Select:** ensure name prop gets to Listbox ([#1795](#1795)) ([a7eae60](a7eae60))
  • Loading branch information
booc0mtaco authored Nov 6, 2023
2 parents c2ecaf7 + 0aefece commit 81ad84f
Show file tree
Hide file tree
Showing 19 changed files with 1,279 additions and 1,144 deletions.
7 changes: 5 additions & 2 deletions .omletrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"ignore": ["lib/**", ".storybook/**"],
"include": ["src/components/**/*.tsx"],
"tsconfigPath": "tsconfig.json"
"include": ["src/components/**/*.{tsx,ts}", "src/index.ts"],
"tsconfigPath": "tsconfig.json",
"exports": {
".": "./src/index.ts"
}
}
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [13.7.0](https://github.com/chanzuckerberg/edu-design-system/compare/v13.6.1...v13.7.0) (2023-11-06)


### Features

* **Heading:** add preset typography prop and values ([5732144](https://github.com/chanzuckerberg/edu-design-system/commit/57321449504e0bedded8affc93d5f127fcb3807c))
* **Text:** add preset typography prop ([4422e8e](https://github.com/chanzuckerberg/edu-design-system/commit/4422e8eaf0b3460ef78f8342642581e9a6a24401))


### Bug Fixes

* **Select:** ensure name prop gets to Listbox ([#1795](https://github.com/chanzuckerberg/edu-design-system/issues/1795)) ([a7eae60](https://github.com/chanzuckerberg/edu-design-system/commit/a7eae60dbee1a1057e7240bf592a5f9086e949c9))

### [13.6.1](https://github.com/chanzuckerberg/edu-design-system/compare/v13.6.0...v13.6.1) (2023-10-23)


Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@chanzuckerberg/eds",
"version": "13.6.1",
"version": "13.7.0",
"description": "The React-powered design system library for Chan Zuckerberg Initiative education web applications",
"author": "CZI <[email protected]>",
"homepage": "https://github.com/chanzuckerberg/edu-design-system",
Expand Down Expand Up @@ -102,7 +102,7 @@
"react-popper": "^2.3.0",
"react-portal": "^4.2.2",
"react-uid": "^2.3.3",
"style-dictionary": "^3.8.0",
"style-dictionary": "^3.9.0",
"svg4everybody": "^2.1.9"
},
"devDependencies": {
Expand All @@ -123,40 +123,40 @@
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-typescript": "^11.1.5",
"@size-limit/file": "^8.2.6",
"@storybook/addon-a11y": "^7.5.1",
"@storybook/addon-docs": "^7.5.1",
"@storybook/addon-essentials": "^7.5.1",
"@storybook/addon-interactions": "^7.5.1",
"@storybook/addon-links": "^7.5.1",
"@storybook/addon-a11y": "^7.5.2",
"@storybook/addon-docs": "^7.5.2",
"@storybook/addon-essentials": "^7.5.2",
"@storybook/addon-interactions": "^7.5.2",
"@storybook/addon-links": "^7.5.2",
"@storybook/addon-styling": "^1.3.7",
"@storybook/react": "^7.5.1",
"@storybook/react-webpack5": "^7.5.1",
"@storybook/react": "^7.5.2",
"@storybook/react-webpack5": "^7.5.2",
"@storybook/testing-library": "^0.2.0",
"@storybook/testing-react": "^2.0.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.5.6",
"@types/node": "^18.18.6",
"@types/react": "^18.2.30",
"@types/jest": "^29.5.7",
"@types/node": "^18.18.8",
"@types/react": "^18.2.34",
"@types/react-beautiful-dnd": "^13.1.6",
"@types/react-dom": "^18.2.14",
"@types/react-portal": "^4.0.5",
"axe-core": "4.8.2",
"chromatic": "^6.24.1",
"codecov": "^3.8.3",
"copyfiles": "^2.4.1",
"eslint": "^8.51.0",
"eslint": "^8.52.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-jest": "^27.4.2",
"eslint-plugin-jest": "^27.6.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-storybook": "^0.6.13",
"eslint-plugin-testing-library": "^5.11.1",
"husky": "^8.0.3",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-preset-stylelint": "^6.3.1",
"jest-preset-stylelint": "^6.3.2",
"lint-staged": "^13.3.0",
"pascal-case": "^3.1.2",
"plop": "^3.1.2",
Expand All @@ -174,11 +174,11 @@
"size-limit": "^8.2.6",
"snake-case": "^3.0.4",
"standard-version": "^9.5.0",
"storybook": "^7.5.1",
"style-dictionary": "^3.8.0",
"storybook": "^7.5.2",
"style-dictionary": "^3.9.0",
"stylelint": "^15.11.0",
"stylelint-config-recommended": "^10.0.1",
"tailwindcss": "^3.3.3",
"tailwindcss": "^3.3.5",
"ts-jest": "^29.1.1",
"typescript": "^4.9.5"
},
Expand Down
101 changes: 100 additions & 1 deletion src/components/Heading/Heading.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# HEADING
\*------------------------------------*/

/* Deprecated; moving all size classes to prefer prefix */
.heading--size-headline-lg {
font: var(--eds-theme-typography-headline-lg);

Expand Down Expand Up @@ -50,6 +51,7 @@

/**
* Heading sizes, correlate to similar numerically named typography token.
* deprecated in favor of only using the typography presets
*/
.heading--size-h1 {
font: var(--eds-theme-typography-headline-lg);
Expand Down Expand Up @@ -93,7 +95,7 @@
}

/**
* Color variants
* Color variants - deprecated in favor of using utility classes
*/
.heading--error {
color: var(--eds-theme-color-text-utility-error);
Expand Down Expand Up @@ -126,3 +128,100 @@
.heading--white {
color: var(--eds-theme-color-text-neutral-default-inverse);
}

/**
* Map the component preset names to the defined typography tokens
*
* TODO: This should always match the generated tokens so find a
* way to generate this.
*/
.heading--headline-lg {
font: var(--eds-theme-typography-headline-lg);

@media all and (max-width: $eds-bp-md) {
font: var(--eds-typography-preset-001-mobile);
}
}
.heading--headline-lg-bold {
font: var(--eds-theme-typography-headline-lg-bold);
}
.heading--headline-lg-bold-mobile {
font: var(--eds-theme-typography-headline-lg-bold-mobile);
}
.heading--headline-lg-mobile {
font: var(--eds-theme-typography-headline-lg-mobile);
}
.heading--headline-md {
font: var(--eds-theme-typography-headline-md);

@media all and (max-width: $eds-bp-md) {
font: var(--eds-typography-preset-002-mobile);
}
}
.heading--headline-md-bold {
font: var(--eds-theme-typography-headline-md-bold);
}
.heading--headline-md-bold-mobile {
font: var(--eds-theme-typography-headline-md-bold-mobile);
}
.heading--headline-md-mobile {
font: var(--eds-theme-typography-headline-md-mobile);
}
.heading--headline-sm {
font: var(--eds-theme-typography-headline-sm);

@media all and (max-width: $eds-bp-md) {
font: var(--eds-typography-preset-003-mobile);
}
}
.heading--headline-sm-bold {
font: var(--eds-theme-typography-headline-sm-bold);
}
.heading--headline-sm-bold-mobile {
font: var(--eds-theme-typography-headline-sm-bold-mobile);
}
.heading--headline-sm-mobile {
font: var(--eds-theme-typography-headline-sm-mobile);
}
.heading--headline-secondary-lg {
font: var(--eds-theme-typography-headline-secondary-lg);
}
.heading--headline-secondary-lg-bold {
font: var(--eds-theme-typography-headline-secondary-lg-bold);
}
.heading--headline-secondary-md {
font: var(--eds-theme-typography-headline-secondary-md);
}
.heading--headline-secondary-md-bold {
font: var(--eds-theme-typography-headline-secondary-md-bold);
}
.heading--headline-secondary-sm {
font: var(--eds-theme-typography-headline-secondary-sm);
}
.heading--headline-secondary-sm-bold {
font: var(--eds-theme-typography-headline-secondary-sm-bold);
}
.heading--title-lg {
font: var(--eds-theme-typography-title-lg);
}
.heading--title-lg-bold {
font: var(--eds-theme-typography-title-lg-bold);
}
.heading--title-md {
font: var(--eds-theme-typography-title-md);
}
.heading--title-md-bold {
font: var(--eds-theme-typography-title-md-bold);
}
.heading--title-sm {
font: var(--eds-theme-typography-title-sm);
}
.heading--title-sm-bold {
font: var(--eds-theme-typography-title-sm-bold);
}
.heading--title-xs {
font: var(--eds-theme-typography-title-xs);
}
.heading--title-xs-bold {
font: var(--eds-theme-typography-title-xs-bold);
}
34 changes: 0 additions & 34 deletions src/components/Heading/Heading.stories.module.css

This file was deleted.

Loading

0 comments on commit 81ad84f

Please sign in to comment.