Merge branch 'main' into 8698-datepicker-onopen

carbon-design-system · May 18, 2021 · a4ce010 · a4ce010
2 parents f01bc2d + 5ca86ba
commit a4ce010
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/config/babel-preset-carbon/.npmignore b/config/babel-preset-carbon/.npmignore
@@ -0,0 +1,4 @@
+**/__mocks__/**
+**/__tests__/**
+**/examples/**
+**/tasks/**
diff --git a/config/babel-preset-carbon/package.json b/config/babel-preset-carbon/package.json
@@ -1,8 +1,22 @@
 {
   "name": "babel-preset-carbon",
-  "version": "0.0.0",
   "private": true,
+  "version": "0.0.0",
+  "license": "Apache-2.0",
   "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/carbon-design-system/carbon.git",
+    "directory": "config/babel-preset-carbon"
+  },
+  "bugs": "https://github.com/carbon-design-system/carbon/issues",
+  "keywords": [
+    "ibm",
+    "carbon",
+    "carbon-design-system",
+    "components",
+    "react"
+  ],
   "dependencies": {
     "@babel/core": "^7.14.2",
     "@babel/plugin-proposal-class-properties": "^7.13.0",

diff --git a/packages/components/src/components/button/_button.scss b/packages/components/src/components/button/_button.scss
@@ -457,6 +457,10 @@
     height: rem(20px);
   }
 
+  .#{$prefix}--btn-set .#{$prefix}--btn.#{$prefix}--btn--expressive {
+    max-width: rem(320px);
+  }
+
   // Skeleton State
   .#{$prefix}--btn.#{$prefix}--skeleton {
     @include skeleton;
@@ -475,6 +479,8 @@
 
   .#{$prefix}--btn-set .#{$prefix}--btn {
     width: 100%;
+    // 196px from design kit
+    max-width: rem(196px);
 
     &:not(:focus) {
       box-shadow: rem(-1px) 0 0 0 $button-separator;
@@ -485,11 +491,6 @@
     }
   }
 
-  .#{$prefix}--btn-set .#{$prefix}--btn:not(.#{$prefix}--btn--expressive) {
-    // 196px from design kit
-    max-width: rem(196px);
-  }
-
   .#{$prefix}--btn-set .#{$prefix}--btn:focus + .#{$prefix}--btn {
     box-shadow: inherit;
   }