From 80d49d4449841cc093e35955bdf94a06c601e2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Matheus?= Date: Wed, 12 Jul 2023 10:48:09 -0300 Subject: [PATCH 1/5] feat(tokens): add rgb tokens (#181) Co-authored-by: Felipe Fialho --- packages/tokens/src/tokens.scss | 20 ++++++++++++++++++- packages/tokens/stories/4_Screens.stories.mdx | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/packages/tokens/src/tokens.scss b/packages/tokens/src/tokens.scss index b6bf70243..de29d8ce3 100644 --- a/packages/tokens/src/tokens.scss +++ b/packages/tokens/src/tokens.scss @@ -41,40 +41,58 @@ --color-neutral-white-rgb: 255 255 255; --color-brand-primary-dark-1: #b85000; + --color-brand-primary-dark-1-rgb: 184 80 0; --color-brand-primary-regular: #ed6700; --color-brand-primary-regular-rgb: 237 103 0; --color-brand-primary-light-1: #ff913d; + --color-brand-primary-light-1-rgb: 255 145 61; --color-brand-primary-light-2: #fff3eb; + --color-brand-primary-light-2-rgb: 255 243 235; --color-brand-secondary-dark-1: #12579b; + --color-brand-secondary-dark-1-rgb: 18 87 155; --color-brand-secondary-regular: #1976d2; --color-brand-secondary-regular-rgb: 25 118 210; --color-brand-secondary-light-1: #4a9ff2; + --color-brand-secondary-light-1-rgb: 74 159 242; --color-brand-secondary-light-2: #e4f0fc; + --color-brand-secondary-light-2-rgb: 228 240 252; --color-contextual-error-dark-1: #b60000; + --color-contextual-error-dark-1-rgb: 182 0 0; --color-contextual-error-regular: #d60000; --color-contextual-error-regular-rgb: 214 0 0; --color-contextual-error-light-1: #ff0a0a; + --color-contextual-error-light-1-rgb: 255 10 10; --color-contextual-error-light-2: #ffebeb; + --color-contextual-error-light-2-rgb: 255 235 235; --color-contextual-success-dark-1: #106105; + --color-contextual-success-dark-1-rgb: 16 97 5; --color-contextual-success-regular: #168806; --color-contextual-success-regular-rgb: 22 136 6; --color-contextual-success-light-1: #26b413; + --color-contextual-success-light-1-rgb: 38 180 19; --color-contextual-success-light-2: #e4ffe0; + --color-contextual-success-light-2-rgb: 228 255 224; --color-contextual-warning-dark-1: #856900; + --color-contextual-warning-dark-1-rgb: 133 105 0; --color-contextual-warning-regular: #ffc900; --color-contextual-warning-regular-rgb: 255 201 0; --color-contextual-warning-light-1: #ffda52; + --color-contextual-warning-light-1-rgb: 255 218 82; --color-contextual-warning-light-2: #fff4cc; + --color-contextual-warning-light-2-rgb: 255 244 204; --color-contextual-info-dark-1: #0a6171; + --color-contextual-info-dark-1-rgb: 10 97 113; --color-contextual-info-regular: #0d8296; --color-contextual-info-regular-rgb: 13 130 150; --color-contextual-info-light-1: #10a2bc; + --color-contextual-info-light-1-rgb: 16 162 188; --color-contextual-info-light-2: #e3f9fd; + --color-contextual-info-light-2-rgb: 227 249 253; /* Fonts * ------------------------- */ @@ -139,7 +157,7 @@ --screen-xs: 576px; --screen-sm: 768px; --screen-md: 992px; - --screen-lg: 1280px; + --screen-lg: 1200px; --screen-xlg: 1440px; --screen-fhd: 1920px; --screen-2k: 2048px; diff --git a/packages/tokens/stories/4_Screens.stories.mdx b/packages/tokens/stories/4_Screens.stories.mdx index 2aa4043b6..e4cf32fed 100644 --- a/packages/tokens/stories/4_Screens.stories.mdx +++ b/packages/tokens/stories/4_Screens.stories.mdx @@ -21,7 +21,7 @@ All breakpoints used in our projects. | 576px | `var(--screen-xs)` | | 768px | `var(--screen-sm)` | | 992px | `var(--screen-md)` | -| 1280px | `var(--screen-lg)` | +| 1200px | `var(--screen-lg)` | | 1440px | `var(--screen-xlg)` | | 1920px | `var(--screen-fhd)` | | 2048px | `var(--screen-2k)` | From 017e834ba2704643cb16537b2d50b9765402ccc6 Mon Sep 17 00:00:00 2001 From: Rodrigo Victor Date: Wed, 12 Jul 2023 11:07:16 -0300 Subject: [PATCH 2/5] fix(tokens): remove variable not used to remove sonar bug (#180) --- packages/tokens/scripts/generate-tokens.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tokens/scripts/generate-tokens.ts b/packages/tokens/scripts/generate-tokens.ts index 493457648..96277d61f 100644 --- a/packages/tokens/scripts/generate-tokens.ts +++ b/packages/tokens/scripts/generate-tokens.ts @@ -46,4 +46,4 @@ function processCssFileByTokenPrefix(cssFilePath: string) { generateJavaScriptFile(outputFilePath) } -export const generateTokens = processCssFileByTokenPrefix(TOKENS_DIR) +processCssFileByTokenPrefix(TOKENS_DIR) From 540882294176a274f3e77a971494214f00c33f65 Mon Sep 17 00:00:00 2001 From: felipefialho Date: Thu, 13 Jul 2023 11:14:10 -0300 Subject: [PATCH 3/5] chore: bump to 0.1.0-alpha.20 --- release-please-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-please-config.json b/release-please-config.json index e99bfe698..77a2820d8 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,6 +1,6 @@ { "prerelease": true, - "release-as": "0.1.0-alpha.19", + "release-as": "0.1.0-alpha.20", "packages": { "packages/core": {}, "packages/tokens": {} From a12ef8b637e00fb407cbd8956fe30daebfa6eb72 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 11:18:03 -0300 Subject: [PATCH 4/5] chore: release main (#183) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- packages/tokens/CHANGELOG.md | 12 ++++++++++++ packages/tokens/package.json | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 270248bca..2f9d91b93 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,4 +1,4 @@ { "packages/core": "0.1.0-alpha.17", - "packages/tokens": "0.1.0-alpha.19" + "packages/tokens": "0.1.0-alpha.20" } diff --git a/packages/tokens/CHANGELOG.md b/packages/tokens/CHANGELOG.md index 2f6c5f4b5..12f6fd367 100644 --- a/packages/tokens/CHANGELOG.md +++ b/packages/tokens/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [0.1.0-alpha.20](https://github.com/juntossomosmais/atomium/compare/atomium-tokens-v0.1.0-alpha.19...atomium-tokens-v0.1.0-alpha.20) (2023-07-13) + + +### Features + +* **tokens:** add rgb tokens ([#181](https://github.com/juntossomosmais/atomium/issues/181)) ([80d49d4](https://github.com/juntossomosmais/atomium/commit/80d49d4449841cc093e35955bdf94a06c601e2d2)) + + +### Bug Fixes + +* **tokens:** remove variable not used to remove sonar bug ([#180](https://github.com/juntossomosmais/atomium/issues/180)) ([017e834](https://github.com/juntossomosmais/atomium/commit/017e834ba2704643cb16537b2d50b9765402ccc6)) + ## [0.1.0-alpha.19](https://github.com/juntossomosmais/atomium/compare/atomium-tokens-v0.1.0-alpha.18...atomium-tokens-v0.1.0-alpha.19) (2023-07-04) diff --git a/packages/tokens/package.json b/packages/tokens/package.json index 38cdbf630..9ac4a7613 100644 --- a/packages/tokens/package.json +++ b/packages/tokens/package.json @@ -1,6 +1,6 @@ { "name": "@juntossomosmais/atomium-tokens", - "version": "0.1.0-alpha.19", + "version": "0.1.0-alpha.20", "description": "Tokens and variables for Atomium", "access": "public", "main": "dist/index.js", From f358f9004ab06801009f3d53b3d7ee882e2f1a70 Mon Sep 17 00:00:00 2001 From: felipefialho Date: Thu, 13 Jul 2023 11:47:03 -0300 Subject: [PATCH 5/5] chore: add npx before nx commands --- package-lock.json | 2 +- package.json | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index b2df0107d..83284d0a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30865,7 +30865,7 @@ }, "packages/tokens": { "name": "@juntossomosmais/atomium-tokens", - "version": "0.1.0-alpha.19" + "version": "0.1.0-alpha.20" }, "packages/vue": { "name": "@juntossomosmais/atomium-vue" diff --git a/package.json b/package.json index 6e390e5dc..13ef05dfd 100644 --- a/package.json +++ b/package.json @@ -15,22 +15,22 @@ "utils/*" ], "scripts": { - "core:build": "nx build @juntossomosmais/atomium && npm run react:build", - "docs:build": "nx build @atomium/docs && nx build @atomium/docs-react", - "docs-react:start": "nx run @atomium/docs-react:start", - "lint:pre-commit": "eslint --resolve-plugins-relative-to . -c ./.eslintrc.json $(git diff --cached --name-only --diff-filter=AM | grep -E \"(.js$|.ts$)\") --cache --cache-location node_modules/.cache/eslint", + "core:build": "npx nx build @juntossomosmais/atomium && npm run react:build", + "docs:build": "npx nx build @atomium/docs && npx nx build @atomium/docs-react", + "docs-react:start": "npx nx run @atomium/docs-react:start", + "lint:pre-commit": "eslint --resolve-plugins-relative-to . -c ./.eslintrc.json $(git diff --cached --name-only --diff-filter=AM | grep -E \"(.js$|.ts$)\") --cache --cache-location node_modules/.cache/eslint", "lint:styles": "stylelint '**/*.scss'", - "icons:build": "nx build @juntossomosmais/atomium-icons", - "postinstall": "npx husky install & nx build @juntossomosmais/atomium:prebuild && npm run icons:build && npm run core:build && npm run tokens:build", + "icons:build": "npx nx build @juntossomosmais/atomium-icons", + "postinstall": "npx husky install & npx nx build @juntossomosmais/atomium:prebuild && npm run icons:build && npm run core:build && npm run tokens:build", "pre-commit": "lint-staged", "prepare": "husky install", "react:build": "cd packages/react && npm run build", - "start": "nx run-many --target=start --maxParallel=10 --exclude=@atomium/docs-react", - "test": "nx run @juntossomosmais/atomium:test", + "start": "npx nx run-many --target=start --maxParallel=10 --exclude=@atomium/docs-react", + "test": "npx nx run @juntossomosmais/atomium:test", "test:ci": "npx nx affected --target=test:ci --base=origin/main --parallel", "test:ci-merge": "npx nx affected --target=test:ci --base=origin/main~1 --head=origin/main --parallel", - "tokens:build": "nx build @juntossomosmais/atomium-tokens", - "tokens:publish": "npm run tokens:build && nx run @juntossomosmais/atomium-tokens:publish" + "tokens:build": "npx nx build @juntossomosmais/atomium-tokens", + "tokens:publish": "npm run tokens:build && npx nx run @juntossomosmais/atomium-tokens:publish" }, "dependencies": { "@stencil/core": "^3.2.1"