Merge branch 'master' into patch-8

carbon-design-system · Jan 17, 2020 · d7f2a7d · d7f2a7d
2 parents 8d1d24b + a614aed
commit d7f2a7d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -17649,10 +17649,6 @@ List box styles
     transform: translateY(-50%);
   }
 
-  .#{$prefix}--list-box--inline .#{$prefix}--list-box__invalid-icon {
-    top: $carbon--spacing-03;
-  }
-
   .#{$prefix}--list-box[data-invalid] .#{$prefix}--list-box__field {
     border-bottom: 0;
     padding-right: carbon--mini-units(8);
@@ -18139,10 +18135,10 @@ List box styles
   - [field-02 [variable]](#field-02-variable)
   - [carbon--spacing-08 [variable]](#carbon--spacing-08-variable)
   - [support-01 [variable]](#support-01-variable)
-  - [carbon--spacing-03 [variable]](#carbon--spacing-03-variable)
   - [disabled-02 [variable]](#disabled-02-variable)
   - [carbon--spacing-09 [variable]](#carbon--spacing-09-variable)
   - [ui-background [variable]](#ui-background-variable)
+  - [carbon--spacing-03 [variable]](#carbon--spacing-03-variable)
   - [carbon--spacing-07 [variable]](#carbon--spacing-07-variable)
   - [carbon--spacing-05 [variable]](#carbon--spacing-05-variable)
   - [icon-01 [variable]](#icon-01-variable)

diff --git a/packages/components/src/components/list-box/_list-box.scss b/packages/components/src/components/list-box/_list-box.scss
@@ -121,10 +121,6 @@ $list-box-menu-width: rem(300px);
     transform: translateY(-50%);
   }
 
-  .#{$prefix}--list-box--inline .#{$prefix}--list-box__invalid-icon {
-    top: $carbon--spacing-03;
-  }
-
   .#{$prefix}--list-box[data-invalid] .#{$prefix}--list-box__field {
     border-bottom: 0;
     padding-right: carbon--mini-units(8);

diff --git a/packages/react/src/components/UIShell/Header.js b/packages/react/src/components/UIShell/Header.js
@@ -17,7 +17,7 @@ const Header = ({ className: customClassName, children, ...rest }) => {
   const className = cx(`${prefix}--header`, customClassName);
 
   return (
-    <header {...rest} className={className} role="banner">
+    <header {...rest} className={className}>
       {children}
     </header>
   );

diff --git a/packages/react/src/components/UIShell/__tests__/__snapshots__/Header-test.js.snap b/packages/react/src/components/UIShell/__tests__/__snapshots__/Header-test.js.snap
@@ -8,7 +8,6 @@ exports[`Header should render 1`] = `
   <header
     aria-label="label"
     className="bx--header custom-class"
-    role="banner"
   />
 </Header>
 `;