Merge branch 'master' into data-table-style-fixes

carbon-design-system · Jan 22, 2020 · a8f0c37 · a8f0c37
2 parents 073db0b + a04a3d5
commit a8f0c37
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/packages/components/src/components/tag/_tag.scss b/packages/components/src/components/tag/_tag.scss
@@ -28,6 +28,7 @@
     min-width: rem(32px); // ensures tag stays pill shaped;
     margin: $carbon--spacing-02;
     border-radius: rem(15px);
+    cursor: default;
 
     &:not(:first-child) {
       margin-left: 0;

diff --git a/packages/react/src/components/Button/Button-story.js b/packages/react/src/components/Button/Button-story.js
@@ -19,7 +19,7 @@ const { prefix } = settings;
 
 const icons = {
   None: 'None',
-  'Add with filled circle (Add16 from `@carbon/icons-react`)': 'Add16',
+  'Add (Add16 from `@carbon/icons-react`)': 'Add16',
   'Search (Search16 from `@carbon/icons-react`)': 'Search16',
 };
 

diff --git a/packages/react/src/components/Tag/Tag.js b/packages/react/src/components/Tag/Tag.js
@@ -56,9 +56,9 @@ const Tag = ({
       <Close16 />
     </button>
   ) : (
-    <button className={tagClasses} {...other}>
+    <span className={tagClasses} {...other}>
       {children !== null && children !== undefined ? children : TYPES[type]}
-    </button>
+    </span>
   );
 };