From ba5afb6ef4425ba8167843c2ba2671709faec99c Mon Sep 17 00:00:00 2001 From: Akira Sudoh Date: Thu, 16 Jul 2020 05:54:04 +0900 Subject: [PATCH 1/3] fix(button): ensure rem in variable definition level (#6470) This change makes sure `rem` unit is used in variable definition level (as it's done for other variables). Fixes #6469. Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- packages/components/src/components/button/_mixins.scss | 2 +- packages/components/src/globals/scss/_theme-tokens.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/components/src/components/button/_mixins.scss b/packages/components/src/components/button/_mixins.scss index 00e4fb83cff1..6c4754f62545 100644 --- a/packages/components/src/components/button/_mixins.scss +++ b/packages/components/src/components/button/_mixins.scss @@ -20,7 +20,7 @@ justify-content: space-between; vertical-align: top; flex-shrink: 0; - min-height: rem($button-height); + min-height: $button-height; padding: $button-padding; border-radius: $button-border-radius; text-align: left; diff --git a/packages/components/src/globals/scss/_theme-tokens.scss b/packages/components/src/globals/scss/_theme-tokens.scss index 638d2bddc9d1..db988abe6d30 100644 --- a/packages/components/src/globals/scss/_theme-tokens.scss +++ b/packages/components/src/globals/scss/_theme-tokens.scss @@ -88,7 +88,7 @@ $button-border-radius: 0 !default; /// @type Number /// @access public /// @group button -$button-height: 48px !default; +$button-height: 3rem !default; /// @type Value /// @access public From 9f75bc6d0e49b96ad2e5ec4d337b731f76aff3cd Mon Sep 17 00:00:00 2001 From: carbon-bot Date: Wed, 15 Jul 2020 21:15:16 +0000 Subject: [PATCH 2/3] chore(project): sync generated files --- packages/components/docs/sass.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md index d26ee19388b5..1c59415b7569 100644 --- a/packages/components/docs/sass.md +++ b/packages/components/docs/sass.md @@ -14056,7 +14056,7 @@ Button base styles justify-content: space-between; vertical-align: top; flex-shrink: 0; - min-height: rem($button-height); + min-height: $button-height; padding: $button-padding; border-radius: $button-border-radius; text-align: left; From d734a44594ef5648a414fb8a3dab1f30fd41d186 Mon Sep 17 00:00:00 2001 From: DAK <40970507+dakahn@users.noreply.github.com> Date: Wed, 15 Jul 2020 16:35:19 -0500 Subject: [PATCH 3/3] chore(release): v10.16.0-rc.1 (#6478) Co-authored-by: Josh Black --- package.json | 1 - packages/cli/package.json | 2 +- packages/components/package.json | 8 ++++---- packages/elements/package.json | 12 ++++++------ packages/eslint-config-carbon/package.json | 2 +- packages/grid/package.json | 4 ++-- packages/icons-handlebars/package.json | 4 ++-- packages/icons-react/package.json | 4 ++-- packages/icons-vue/package.json | 4 ++-- packages/icons/package.json | 2 +- packages/layout/package.json | 2 +- packages/pictograms-react/package.json | 4 ++-- packages/pictograms/package.json | 2 +- packages/react-hooks/package.json | 4 ++-- packages/react/package.json | 6 +++--- packages/sketch/package.json | 8 ++++---- packages/stylelint-config-carbon/package.json | 2 +- packages/themes/package.json | 6 +++--- packages/type/package.json | 4 ++-- 19 files changed, 40 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index ee1aef394618..addff1f0d5a7 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,6 @@ "@babel/preset-env": "^7.10.0", "@babel/preset-react": "^7.10.0", "@babel/runtime": "^7.10.0", - "@carbon/cli": "10.11.0", "@commitlint/cli": "^8.3.5", "@commitlint/config-conventional": "^8.3.4", "@ibma/aat": "https://able.ibm.com/tools/dist/ibma-aat-2.0.6.tgz", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4c3415e21869..aa8ee8d8c1c8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/cli", "description": "Task automation for working with the Carbon Design System", - "version": "10.11.0", + "version": "10.12.0-rc.0", "license": "Apache-2.0", "bin": { "carbon-cli": "./bin/carbon-cli.js" diff --git a/packages/components/package.json b/packages/components/package.json index 6e50c26a6a90..1e9d4d2c2a6f 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,7 +1,7 @@ { "name": "carbon-components", "description": "The Carbon Design System is IBM’s open-source design system for products and experiences.", - "version": "10.16.0-rc.0", + "version": "10.16.0-rc.1", "license": "Apache-2.0", "main": "umd/index.js", "module": "es/index.js", @@ -79,9 +79,9 @@ "@babel/preset-env": "^7.10.0", "@babel/preset-react": "^7.10.0", "@babel/runtime": "^7.10.0", - "@carbon/elements": "^10.14.0", - "@carbon/icons-handlebars": "^10.13.0", - "@carbon/icons-react": "^10.13.0", + "@carbon/elements": "^10.15.0-rc.0", + "@carbon/icons-handlebars": "^10.14.0-rc.0", + "@carbon/icons-react": "^10.14.0-rc.0", "@carbon/test-utils": "^10.10.0", "@frctl/fractal": "^1.1.0", "adaro": "1.0.4", diff --git a/packages/elements/package.json b/packages/elements/package.json index b6251a4f2c45..17a7e518095c 100644 --- a/packages/elements/package.json +++ b/packages/elements/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/elements", "description": "A collection of design elements in code for the IBM Design Language", - "version": "10.14.0", + "version": "10.15.0-rc.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -32,13 +32,13 @@ }, "dependencies": { "@carbon/colors": "^10.11.0", - "@carbon/grid": "^10.12.0", - "@carbon/icons": "^10.13.0", + "@carbon/grid": "^10.13.0-rc.0", + "@carbon/icons": "^10.14.0-rc.0", "@carbon/import-once": "^10.3.0", - "@carbon/layout": "^10.11.0", + "@carbon/layout": "^10.12.0-rc.0", "@carbon/motion": "^10.9.0", - "@carbon/themes": "^10.14.0", - "@carbon/type": "^10.12.0" + "@carbon/themes": "^10.15.0-rc.0", + "@carbon/type": "^10.13.0-rc.0" }, "devDependencies": { "@carbon/bundler": "^10.9.0", diff --git a/packages/eslint-config-carbon/package.json b/packages/eslint-config-carbon/package.json index 7e901259ce88..9706b2921ada 100644 --- a/packages/eslint-config-carbon/package.json +++ b/packages/eslint-config-carbon/package.json @@ -1,7 +1,7 @@ { "name": "eslint-config-carbon", "private": true, - "version": "2.1.0-rc.0", + "version": "2.2.0-rc.0", "license": "Apache-2.0", "main": "index.js", "repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/eslint-config-carbon", diff --git a/packages/grid/package.json b/packages/grid/package.json index 9beced2fa786..9cb3fb035ce0 100644 --- a/packages/grid/package.json +++ b/packages/grid/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/grid", "description": "Grid for digital and software products using the Carbon Design System", - "version": "10.12.0", + "version": "10.13.0-rc.0", "license": "Apache-2.0", "repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/grid", "bugs": "https://github.com/carbon-design-system/carbon/issues", @@ -28,7 +28,7 @@ }, "dependencies": { "@carbon/import-once": "^10.3.0", - "@carbon/layout": "^10.11.0" + "@carbon/layout": "^10.12.0-rc.0" }, "devDependencies": { "@carbon/bundler": "^10.9.0", diff --git a/packages/icons-handlebars/package.json b/packages/icons-handlebars/package.json index fd70a6b119ba..c60fc16e309a 100644 --- a/packages/icons-handlebars/package.json +++ b/packages/icons-handlebars/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons-handlebars", "description": "Handlebars helpers for IBM Design Language icons in digital and software products using the Carbon Design System", - "version": "10.13.0", + "version": "10.14.0-rc.0", "license": "Apache-2.0", "main": "index.js", "repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/icons-handlebars", @@ -23,7 +23,7 @@ }, "dependencies": { "@carbon/icon-helpers": "^10.9.0", - "@carbon/icons": "^10.13.0" + "@carbon/icons": "^10.14.0-rc.0" }, "devDependencies": { "handlebars": "^4.0.12" diff --git a/packages/icons-react/package.json b/packages/icons-react/package.json index 870a3407c686..0f8923889dac 100644 --- a/packages/icons-react/package.json +++ b/packages/icons-react/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons-react", "description": "React components for icons in digital and software products using the Carbon Design System", - "version": "10.13.0", + "version": "10.14.0-rc.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -33,7 +33,7 @@ }, "devDependencies": { "@carbon/icon-build-helpers": "^0.8.0", - "@carbon/icons": "^10.13.0" + "@carbon/icons": "^10.14.0-rc.0" }, "sideEffects": false } diff --git a/packages/icons-vue/package.json b/packages/icons-vue/package.json index 01118899de87..3b8f59c1d762 100644 --- a/packages/icons-vue/package.json +++ b/packages/icons-vue/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons-vue", "description": "Vue components for icons in digital and software products using the Carbon Design System", - "version": "10.13.0", + "version": "10.14.0-rc.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -28,7 +28,7 @@ }, "devDependencies": { "@carbon/cli-reporter": "^10.3.0", - "@carbon/icons": "^10.13.0", + "@carbon/icons": "^10.14.0-rc.0", "fs-extra": "^8.1.0", "prettier": "^2.0.5", "rimraf": "^3.0.0", diff --git a/packages/icons/package.json b/packages/icons/package.json index 6f1295c39b9e..0b855a5197e9 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/icons", "description": "Icons for digital and software products using the Carbon Design System", - "version": "10.13.0", + "version": "10.14.0-rc.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/layout/package.json b/packages/layout/package.json index 8399f2a60be8..3e2cbbfc6fd1 100644 --- a/packages/layout/package.json +++ b/packages/layout/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/layout", "description": "Layout helpers for digital and software products using the Carbon Design System", - "version": "10.11.0", + "version": "10.12.0-rc.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/pictograms-react/package.json b/packages/pictograms-react/package.json index d613504c3c1a..3d64f132a704 100644 --- a/packages/pictograms-react/package.json +++ b/packages/pictograms-react/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/pictograms-react", "description": "React components for pictograms in digital and software products using the Carbon Design System", - "version": "10.15.0-rc.0", + "version": "10.15.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -33,7 +33,7 @@ }, "devDependencies": { "@carbon/icon-build-helpers": "^0.8.0", - "@carbon/pictograms": "^10.15.0-rc.0" + "@carbon/pictograms": "^10.15.0-rc.1" }, "sideEffects": false } diff --git a/packages/pictograms/package.json b/packages/pictograms/package.json index 389b836e78c7..5763ff571222 100644 --- a/packages/pictograms/package.json +++ b/packages/pictograms/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/pictograms", "description": "Pictograms for digital and software products using the Carbon Design System", - "version": "10.15.0-rc.0", + "version": "10.15.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json index fd8179f21002..46fde25ddf01 100644 --- a/packages/react-hooks/package.json +++ b/packages/react-hooks/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/react-hooks", "private": true, - "version": "10.9.0-rc.0", + "version": "10.10.0-rc.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -39,7 +39,7 @@ "autoprefixer": "^9.7.4", "babel-loader": "^8.1.0", "browserslist-config-carbon": "^10.4.0", - "carbon-components": "^10.16.0-rc.0", + "carbon-components": "^10.16.0-rc.1", "css-loader": "^3.4.2", "node-sass": "^4.13.1", "postcss-loader": "^3.0.0", diff --git a/packages/react/package.json b/packages/react/package.json index 1def144d0954..184375c468c6 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,7 +1,7 @@ { "name": "carbon-components-react", "description": "The Carbon Design System is IBM’s open-source design system for products and experiences.", - "version": "7.16.0-rc.0", + "version": "7.16.0-rc.1", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -38,7 +38,7 @@ "react-dom": "^16.8.6" }, "dependencies": { - "@carbon/icons-react": "^10.13.0", + "@carbon/icons-react": "^10.14.0-rc.0", "classnames": "2.2.6", "downshift": "5.2.1", "flatpickr": "4.6.1", @@ -81,7 +81,7 @@ "babel-plugin-react-docgen": "^4.0.0", "babel-plugin-transform-inline-environment-variables": "^0.4.0", "browserslist-config-carbon": "^10.4.0", - "carbon-components": "^10.16.0-rc.0", + "carbon-components": "^10.16.0-rc.1", "carbon-icons": "^7.0.5", "chalk": "^2.3.0", "cli-table": "^0.3.0", diff --git a/packages/sketch/package.json b/packages/sketch/package.json index a1fc7384b347..dbabaa9063c4 100644 --- a/packages/sketch/package.json +++ b/packages/sketch/package.json @@ -2,7 +2,7 @@ "name": "@carbon/sketch", "private": true, "description": "Tooling for generating a sketch plugin to bring code to design", - "version": "10.13.0", + "version": "10.14.0-rc.0", "license": "Apache-2.0", "repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/sketch", "bugs": "https://github.com/carbon-design-system/carbon/issues", @@ -27,9 +27,9 @@ "@babel/polyfill": "^7.8.7", "@carbon/colors": "^10.11.0", "@carbon/icon-helpers": "^10.9.0", - "@carbon/icons": "^10.13.0", - "@carbon/themes": "^10.14.0", - "@carbon/type": "^10.12.0", + "@carbon/icons": "^10.14.0-rc.0", + "@carbon/themes": "^10.15.0-rc.0", + "@carbon/type": "^10.13.0-rc.0", "@skpm/builder": "^0.7.0", "color-string": "^1.5.3", "skpm": "^1.2.0" diff --git a/packages/stylelint-config-carbon/package.json b/packages/stylelint-config-carbon/package.json index ec9d54135ede..28334a096c9b 100644 --- a/packages/stylelint-config-carbon/package.json +++ b/packages/stylelint-config-carbon/package.json @@ -2,7 +2,7 @@ "name": "stylelint-config-carbon", "private": true, "description": "Stylelint configuration for the Carbon Design System", - "version": "0.2.0-rc.0", + "version": "0.3.0-rc.0", "license": "Apache-2.0", "main": "index.js", "repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/stylelint-config-carbon", diff --git a/packages/themes/package.json b/packages/themes/package.json index e61ca37708a9..165f4f7a6b8f 100644 --- a/packages/themes/package.json +++ b/packages/themes/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/themes", "description": "Themes for applying color in the Carbon Design System", - "version": "10.14.0", + "version": "10.15.0-rc.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -25,8 +25,8 @@ }, "dependencies": { "@carbon/colors": "^10.11.0", - "@carbon/layout": "^10.11.0", - "@carbon/type": "^10.12.0", + "@carbon/layout": "^10.12.0-rc.0", + "@carbon/type": "^10.13.0-rc.0", "color": "^3.1.2" }, "devDependencies": { diff --git a/packages/type/package.json b/packages/type/package.json index efc9fb5bb5ad..8d8723f15297 100644 --- a/packages/type/package.json +++ b/packages/type/package.json @@ -1,7 +1,7 @@ { "name": "@carbon/type", "description": "Typography for digital and software products using the Carbon Design System", - "version": "10.12.0", + "version": "10.13.0-rc.0", "license": "Apache-2.0", "main": "lib/index.js", "module": "es/index.js", @@ -33,7 +33,7 @@ }, "dependencies": { "@carbon/import-once": "^10.3.0", - "@carbon/layout": "^10.11.0" + "@carbon/layout": "^10.12.0-rc.0" }, "devDependencies": { "@carbon/bundler": "^10.9.0",