Merge branch 'master' into 6624-default-pagination-pages-text

carbon-design-system · Aug 24, 2020 · bf84010 · bf84010
2 parents a0fe1fe + 907bdf5
commit bf84010
Show file tree

Hide file tree

Showing 48 changed files with 914 additions and 452 deletions.
diff --git a/config/eslint-config-carbon/README.md b/config/eslint-config-carbon/README.md
@@ -0,0 +1,51 @@
+# eslint-config-carbon
+
+> ESLint configuration for Carbon
+
+## Getting started
+
+To install `eslint-config-carbon` in your project, you will need to run the
+following command using [npm](https://www.npmjs.com/):
+
+```bash
+npm install -S eslint-config-carbon
+```
+
+If you prefer [Yarn](https://yarnpkg.com/en/), use the following command
+instead:
+
+```bash
+yarn add eslint-config-carbon
+```
+
+## Usage
+
+You can use `eslint-config-carbon` in your project by extending it in your
+`eslint` configuration. For example, if we had an `.eslintrc` file:
+
+```json
+{
+  "extends": ["carbon"]
+}
+```
+
+The default configuration available under `eslint-config-carbon` includes all
+ESLint configuration and plugins, including plugins for React.js development. If
+you'd like to not include these rules in your setup, you can also include a
+`base` or `vanilla` oriented configuration by doing the following:
+
+```json
+{
+  "extends": ["eslint-config-carbon/base"]
+}
+```
+
+## 🙌 Contributing
+
+We're always looking for contributors to help us fix bugs, build new features,
+or help us improve the project documentation. If you're interested, definitely
+check out our [Contributing Guide](/.github/CONTRIBUTING.md)! 👀
+
+## 📝 License
+
+Licensed under the [Apache 2.0 License](/LICENSE).
diff --git a/config/eslint-config-carbon/package.json b/config/eslint-config-carbon/package.json
@@ -1,7 +1,7 @@
 {
   "name": "eslint-config-carbon",
-  "private": true,
-  "version": "2.3.0",
+  "description": "ESLint configuration for Carbon",
+  "version": "2.0.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": "https://github.com/carbon-design-system/carbon/tree/master/config/eslint-config-carbon",

diff --git a/config/stylelint-config-carbon/README.md b/config/stylelint-config-carbon/README.md
@@ -1,6 +1,6 @@
 # stylelint-config-carbon
 
-> Stylelint configuration for the Carbon Design System
+> Stylelint configuration for Carbon
 
 ## Getting started
 

diff --git a/config/stylelint-config-carbon/package.json b/config/stylelint-config-carbon/package.json
@@ -1,8 +1,7 @@
 {
   "name": "stylelint-config-carbon",
-  "private": true,
-  "description": "Stylelint configuration for the Carbon Design System",
-  "version": "0.4.0",
+  "description": "Stylelint configuration for Carbon",
+  "version": "1.0.0",
   "license": "Apache-2.0",
   "main": "index.js",
   "repository": "https://github.com/carbon-design-system/carbon/tree/master/config/stylelint-config-carbon",

diff --git a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap
@@ -580,6 +580,8 @@ Array [
   "VideoAlt",
   "VideoChat",
   "VideoPlay",
+  "Video_01",
+  "Video_02",
   "Virus",
   "Vision",
   "VisualInsights",

diff --git a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap
@@ -579,6 +579,8 @@ Array [
   "VideoAlt",
   "VideoChat",
   "VideoPlay",
+  "Video_01",
+  "Video_02",
   "Virus",
   "Vision",
   "VisualInsights",

diff --git a/package.json b/package.json
@@ -133,7 +133,7 @@
   },
   "eslintConfig": {
     "extends": [
-      "eslint-config-carbon"
+      "carbon"
     ]
   },
   "stylelint": {

diff --git 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.13.0",
+  "version": "10.14.0",
   "license": "Apache-2.0",
   "bin": {
     "carbon-cli": "./bin/carbon-cli.js"

diff --git a/packages/colors/package.json b/packages/colors/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/colors",
   "description": "Colors for digital and software products using the Carbon Design System",
-  "version": "10.11.0",
+  "version": "10.12.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -15643,6 +15643,8 @@ Data table action styles
 
   //btns container
   .#{$prefix}--action-list {
+    position: absolute;
+    right: 0;
     display: flex;
   }
 
@@ -15722,6 +15724,8 @@ Data table action styles
 
   // items selected text
   .#{$prefix}--batch-summary {
+    position: absolute;
+    left: 0;
     display: flex;
     align-items: center;
     margin-left: $spacing-05;
@@ -19916,6 +19920,16 @@ Modal styles
     margin: 0 2px 2px;
   }
 
+  @media screen and (-ms-high-contrast: active) {
+    .#{$prefix}--modal-scroll-content > *:last-child {
+      padding-bottom: 0;
+    }
+
+    .#{$prefix}--modal-content--overflow-indicator {
+      display: none;
+    }
+  }
+
   .#{$prefix}--modal-footer {
     display: flex;
 
@@ -24183,7 +24197,8 @@ Text input styles
     color: $disabled-02;
     background-color: $disabled-01;
     border-bottom: 1px solid transparent;
-
+    // Needed to fix disabled text in Safari #6673
+    -webkit-text-fill-color: currentColor;
     cursor: not-allowed;
   }
 

diff --git 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.17.0",
+  "version": "10.18.0",
   "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.16.0",
-    "@carbon/icons-handlebars": "^10.15.0",
-    "@carbon/icons-react": "^10.15.0",
+    "@carbon/elements": "^10.17.0",
+    "@carbon/icons-handlebars": "^10.16.0",
+    "@carbon/icons-react": "^10.16.0",
     "@carbon/test-utils": "^10.10.0",
     "@frctl/fractal": "^1.1.0",
     "adaro": "1.0.4",

diff --git a/packages/components/src/components/data-table/_data-table-action.scss b/packages/components/src/components/data-table/_data-table-action.scss
@@ -390,6 +390,8 @@
 
   //btns container
   .#{$prefix}--action-list {
+    position: absolute;
+    right: 0;
     display: flex;
   }
 
@@ -469,6 +471,8 @@
 
   // items selected text
   .#{$prefix}--batch-summary {
+    position: absolute;
+    left: 0;
     display: flex;
     align-items: center;
     margin-left: $spacing-05;

diff --git a/packages/components/src/components/modal/_modal.scss b/packages/components/src/components/modal/_modal.scss
@@ -293,6 +293,16 @@
     margin: 0 2px 2px;
   }
 
+  @media screen and (-ms-high-contrast: active) {
+    .#{$prefix}--modal-scroll-content > *:last-child {
+      padding-bottom: 0;
+    }
+
+    .#{$prefix}--modal-content--overflow-indicator {
+      display: none;
+    }
+  }
+
   .#{$prefix}--modal-footer {
     display: flex;
 

diff --git a/packages/components/src/components/text-input/_text-input.scss b/packages/components/src/components/text-input/_text-input.scss
@@ -156,7 +156,8 @@
     color: $disabled-02;
     background-color: $disabled-01;
     border-bottom: 1px solid transparent;
-
+    // Needed to fix disabled text in Safari #6673
+    -webkit-text-fill-color: currentColor;
     cursor: not-allowed;
   }
 

diff --git 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.16.0",
+  "version": "10.17.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -31,13 +31,13 @@
     "clean": "rimraf es lib umd && node tasks/clean.js"
   },
   "dependencies": {
-    "@carbon/colors": "^10.11.0",
+    "@carbon/colors": "^10.12.0",
     "@carbon/grid": "^10.14.0",
-    "@carbon/icons": "^10.15.0",
+    "@carbon/icons": "^10.16.0",
     "@carbon/import-once": "^10.3.0",
     "@carbon/layout": "^10.12.0",
     "@carbon/motion": "^10.9.0",
-    "@carbon/themes": "^10.16.0",
+    "@carbon/themes": "^10.17.0",
     "@carbon/type": "^10.14.0"
   },
   "devDependencies": {

diff --git a/packages/icon-build-helpers/package.json b/packages/icon-build-helpers/package.json
@@ -2,7 +2,7 @@
   "name": "@carbon/icon-build-helpers",
   "private": true,
   "description": "Build helpers for the Carbon Design System icon library",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "repository": "https://github.com/carbon-design-system/carbon/tree/master/packages/icon-build-helpers",

diff --git 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.15.0",
+  "version": "10.16.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.15.0"
+    "@carbon/icons": "^10.16.0"
   },
   "devDependencies": {
     "handlebars": "^4.0.12"

diff --git 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.15.0",
+  "version": "10.16.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -32,8 +32,8 @@
     "@carbon/icon-helpers": "^10.9.0"
   },
   "devDependencies": {
-    "@carbon/icon-build-helpers": "^0.9.0",
-    "@carbon/icons": "^10.15.0"
+    "@carbon/icon-build-helpers": "^0.10.0",
+    "@carbon/icons": "^10.16.0"
   },
   "sideEffects": false
 }
diff --git 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.15.0",
+  "version": "10.16.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.15.0",
+    "@carbon/icons": "^10.16.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
@@ -1,7 +1,7 @@
 {
   "name": "@carbon/icons",
   "description": "Icons for digital and software products using the Carbon Design System",
-  "version": "10.15.0",
+  "version": "10.16.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -34,7 +34,7 @@
     "prepublishOnly": "yarn build"
   },
   "devDependencies": {
-    "@carbon/icon-build-helpers": "^0.9.0"
+    "@carbon/icon-build-helpers": "^0.10.0"
   },
   "gitHead": "bb04f2f061de0bda6e457a07a67cf624db375808"
 }
diff --git 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.16.0",
+  "version": "10.17.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -32,8 +32,8 @@
     "@carbon/icon-helpers": "^10.9.0"
   },
   "devDependencies": {
-    "@carbon/icon-build-helpers": "^0.9.0",
-    "@carbon/pictograms": "^10.16.0"
+    "@carbon/icon-build-helpers": "^0.10.0",
+    "@carbon/pictograms": "^10.17.0"
   },
   "sideEffects": false
 }
diff --git a/packages/pictograms/categories.yml b/packages/pictograms/categories.yml
@@ -163,6 +163,8 @@ categories:
       - slider
       - toggle
       - video
+      - video--01
+      - video--02
       - video--alt
       - video--chat
       - video--play

diff --git a/packages/pictograms/deprecated.yml b/packages/pictograms/deprecated.yml
@@ -21,4 +21,10 @@ deprecated:
       The upload pictogram has been deprecated in favor of upload--01
   - name: upload--alt
     reason:
-      The upload--alt pictogram has been deprecated in favor of upload--02      
+      The upload--alt pictogram has been deprecated in favor of upload--02
+  - name: video
+    reason:
+      The video pictogram has been deprecated in favor of video--01
+  - name: video--alt
+    reason:
+      The video--alt pictogram has been deprecated in favor of video--02