Merge branch 'master' into type-updates

carbon-design-system · Mar 20, 2020 · 4c06596 · 4c06596
2 parents fba42a1 + 7aa0cab
commit 4c06596
Show file tree

Hide file tree

Showing 74 changed files with 935 additions and 9,061 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -13,8 +13,7 @@ to the Carbon community.
 
 We value all of our community members, and thus want to foster a positive
 contributing environment. Please take a look at our
-[code of conduct](https://github.com/carbon-design-system/carbon/blob/master/docs/developer-handbook.md#carbon-code-of-conduct)
-before engaging in our workspaces.
+[code of conduct](./CODE_OF_CONDUCT.md) before engaging in our workspaces.
 
 ## Prerequisites
 

diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -23,4 +23,4 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
-          yarn lerna publish --canary minor --dist-tag nightly --no-push --no-git-tag-version --yes
+          yarn lerna publish --canary minor --force-publish --exact --dist-tag nightly --preid alpha --no-push --no-git-tag-version --yes
diff --git a/.yarn/offline-mirror/@angular-compiler-6.1.10.tgz b/.yarn/offline-mirror/@angular-compiler-6.1.10.tgz
diff --git a/.yarn/offline-mirror/@angular-compiler-cli-6.1.10.tgz b/.yarn/offline-mirror/@angular-compiler-cli-6.1.10.tgz
diff --git a/.yarn/offline-mirror/@angular-core-6.1.10.tgz b/.yarn/offline-mirror/@angular-core-6.1.10.tgz
diff --git a/.yarn/offline-mirror/jasmine-diff-0.1.3.tgz b/.yarn/offline-mirror/jasmine-diff-0.1.3.tgz
diff --git a/.yarn/offline-mirror/reflect-metadata-0.1.13.tgz b/.yarn/offline-mirror/reflect-metadata-0.1.13.tgz
diff --git a/.yarn/offline-mirror/rollup-0.66.6.tgz b/.yarn/offline-mirror/rollup-0.66.6.tgz
diff --git a/.yarn/offline-mirror/tsickle-0.32.1.tgz b/.yarn/offline-mirror/tsickle-0.32.1.tgz
diff --git a/.yarn/offline-mirror/typescript-2.9.2.tgz b/.yarn/offline-mirror/typescript-2.9.2.tgz
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -13,5 +13,5 @@
 
 # Release team should be notified of Public API changes in the following
 # packages
-/packages/react/__tests__/PublicAPI-test.js @carbon-design-system/developers-system @carbon-design-system/release
-/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap @carbon-design-system/developers-system @carbon-design-system/release
+/packages/react/__tests__/PublicAPI-test.js @carbon-design-system/release @carbon-design-system/developers-system
+/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap @carbon-design-system/release @carbon-design-system/developers-system
diff --git a/README.md b/README.md
@@ -44,19 +44,19 @@ We also have community-contributed components for the following technologies:
 If you're trying to find something specific, here's a full list of packages that
 we support!
 
-| Package name                                  | Description                                                                                                                                         |
-| --------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [`carbon-components`](./packages/components)  | Component styles and Vanilla JavaScript                                                                                                             |
-| [`carbon-components-react`](./packages/react) | React components                                                                                                                                    |
-| [`@carbon/elements`](./packages/elements)     | IBM Design Language elements like colors, type, iconography, and more                                                                               |
-| [`@carbon/colors`](./packages/colors)         | Work with IBM Design Language colors                                                                                                                |
-| [`@carbon/grid`](./packages/grid)             | Build layouts using the new 16 column grid system                                                                                                   |
-| [`@carbon/icons`](./packages/icons)           | Iconography assets. We also offer support in: [React](./packages/icons-react), [Angular](./packages/icons-angular), and [Vue](./packages/icons-vue) |
-| [`@carbon/pictograms`](./packages/pictograms) | Pictogram assets. We also offer support in: [React](./packages/pictograms-react)                                                                    |
-| [`@carbon/layout`](./packages/layout)         | Layout-based units and spacing scale                                                                                                                |
-| [`@carbon/motion`](./packages/motion)         | Productive and expressive motion curves                                                                                                             |
-| [`@carbon/themes`](./packages/themes)         | Color tokens available in the Carbon Design System, like `$interactive-01`                                                                          |
-| [`@carbon/type`](./packages/type)             | New type tokens used alongside IBM Plex                                                                                                             |
+| Package name                                  | Description                                                                                                                                                                             |
+| --------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [`carbon-components`](./packages/components)  | Component styles and Vanilla JavaScript                                                                                                                                                 |
+| [`carbon-components-react`](./packages/react) | React components                                                                                                                                                                        |
+| [`@carbon/elements`](./packages/elements)     | IBM Design Language elements like colors, type, iconography, and more                                                                                                                   |
+| [`@carbon/colors`](./packages/colors)         | Work with IBM Design Language colors                                                                                                                                                    |
+| [`@carbon/grid`](./packages/grid)             | Build layouts using the new 16 column grid system                                                                                                                                       |
+| [`@carbon/icons`](./packages/icons)           | Iconography assets. We also offer support in: [React](./packages/icons-react), [Angular](https://github.com/carbon-design-system/carbon-icons-angular), and [Vue](./packages/icons-vue) |
+| [`@carbon/pictograms`](./packages/pictograms) | Pictogram assets. We also offer support in: [React](./packages/pictograms-react)                                                                                                        |
+| [`@carbon/layout`](./packages/layout)         | Layout-based units and spacing scale                                                                                                                                                    |
+| [`@carbon/motion`](./packages/motion)         | Productive and expressive motion curves                                                                                                                                                 |
+| [`@carbon/themes`](./packages/themes)         | Color tokens available in the Carbon Design System, like `$interactive-01`                                                                                                              |
+| [`@carbon/type`](./packages/type)             | New type tokens used alongside IBM Plex                                                                                                                                                 |
 
 ## :books: Documentation
 

diff --git a/e2e/icons-angular/entrypoint-test.js b/e2e/icons-angular/entrypoint-test.js
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -6203,7 +6203,6 @@ $ui-02: if(
 - **Type**: `{undefined}`
 - **Used by**:
   - [carbon--theme [mixin]](#carbon--theme-mixin)
-  - [button [mixin]](#button-mixin)
   - [button-theme [mixin]](#button-theme-mixin)
   - [snippet [mixin]](#snippet-mixin)
   - [loading [mixin]](#loading-mixin)
@@ -12964,8 +12963,7 @@ Button styles
       $interactive-03,
       $hover-tertiary,
       currentColor,
-      $active-tertiary,
-      1px
+      $active-tertiary
     );
 
     &:hover {
@@ -12993,19 +12991,6 @@ Button styles
     }
   }
 
-  .#{$prefix}--btn--tertiary,
-  .#{$prefix}--btn--tertiary.#{$prefix}--btn--field,
-  .#{$prefix}--btn--tertiary.#{$prefix}--btn--sm {
-    padding-right: rem(62px);
-    padding-left: rem(14px);
-
-    &:focus {
-      border-width: rem(3px);
-      padding-right: rem(60px);
-      padding-left: rem(12px);
-    }
-  }
-
   .#{$prefix}--btn--ghost {
     @include button-theme(
       transparent,
@@ -13054,11 +13039,16 @@ Button styles
 
   .#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger {
     @include tooltip--trigger('icon', 'bottom');
+
+    svg,
+    &:hover svg,
+    &:focus svg {
+      fill: currentColor;
+    }
   }
 
   .#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger:focus {
     border-color: $focus;
-    box-shadow: inset 0 0 0 $button-outline-width $ui-02;
   }
 
   .#{$prefix}--btn.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger:focus
@@ -13076,8 +13066,8 @@ Button styles
   }
 
   .#{$prefix}--btn--icon-only {
-    padding-left: rem(13px);
-    padding-right: rem(13px);
+    padding-left: rem(15px);
+    padding-right: rem(15px);
 
     .#{$prefix}--btn__icon {
       position: static;
@@ -13113,50 +13103,20 @@ Button styles
     display: none;
   }
 
-  .#{$prefix}--btn--icon-only.#{$prefix}--btn--tertiary {
-    padding-left: rem(15px);
-    padding-right: rem(15px);
-
-    &:focus {
-      padding-left: rem(13px);
-      padding-right: rem(13px);
-    }
-  }
-
   .#{$prefix}--btn--field.#{$prefix}--btn--icon-only {
-    padding-left: rem(9px);
-    padding-right: rem(9px);
-  }
-
-  .#{$prefix}--btn--field.#{$prefix}--btn--icon-only.#{$prefix}--btn--tertiary {
     padding-left: rem(11px);
     padding-right: rem(11px);
-
-    &:focus {
-      padding-left: rem(9px);
-      padding-right: rem(9px);
-    }
   }
 
   .#{$prefix}--btn--sm.#{$prefix}--btn--icon-only {
-    padding-left: rem(5px);
-    padding-right: rem(5px);
-  }
-
-  .#{$prefix}--btn--sm.#{$prefix}--btn--icon-only.#{$prefix}--btn--tertiary {
     padding-left: rem(7px);
     padding-right: rem(7px);
-
-    &:focus {
-      padding-left: rem(5px);
-      padding-right: rem(5px);
-    }
   }
 
   .#{$prefix}--btn--danger {
     @include button-theme(
       $danger,
-      $danger,
+      transparent,
       $text-04,
       $hover-danger,
       currentColor,
@@ -13165,7 +13125,6 @@ Button styles
 
     &:hover {
       color: $text-04;
-      border: $button-border-width solid transparent;
     }
   }
 
@@ -13212,7 +13171,6 @@ Button styles
   - [carbon--spacing-03 [variable]](#carbon--spacing-03-variable)
   - [hover-primary-text [variable]](#hover-primary-text-variable)
   - [focus [variable]](#focus-variable)
-  - [ui-02 [variable]](#ui-02-variable)
   - [icon-01 [variable]](#icon-01-variable)
   - [disabled-02 [variable]](#disabled-02-variable)
   - [danger [variable]](#danger-variable)
@@ -13287,7 +13245,7 @@ Button variant styles
 ```scss
 @mixin button-theme() {
   background-color: $bg-color;
-  border-width: $border-width;
+  border-width: $button-outline-width;
   border-style: solid;
   border-color: $border-color;
   color: $font-color;
@@ -13298,7 +13256,8 @@ Button variant styles
 
   &:focus {
     border-color: $focus;
-    box-shadow: inset 0 0 0 $button-outline-width $ui-02;
+    box-shadow: inset 0 0 0 $button-border-width $focus, inset 0 0 0
+        ($button-border-width + $button-outline-width) $ui-02;
   }
 
   &:disabled:hover,
@@ -17102,6 +17061,14 @@ File uploader styles
     }
   }
 
+  .#{$prefix}--file__selected-file--field {
+    min-height: rem(40px);
+  }
+
+  .#{$prefix}--file__selected-file--sm {
+    min-height: rem(32px);
+  }
+
   // TODO: deprecate this block
   .#{$prefix}--file__selected-file--invalid__wrapper {
     @include focus-outline('invalid');

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -65,9 +65,6 @@
     "babel-core": "7.0.0-bridge.0",
     "freshy": ">= 1.0.3"
   },
-  "peerDependencies": {
-    "@carbon/icons": "^10.9.0"
-  },
   "dependencies": {
     "flatpickr": "4.6.1",
     "lodash.debounce": "^4.0.8",