Merge branch 'carbon-design-system:main' into card-with-pictogram-ADC…

…MS-4074
carbon-design-system · Oct 26, 2023 · a9cdecb · a9cdecb
2 parents 186a3ae + 9eb94ea
commit a9cdecb
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 118 deletions.
diff --git a/packages/carbon-web-components/src/components/ui-shell/side-nav-menu-item.ts b/packages/carbon-web-components/src/components/ui-shell/side-nav-menu-item.ts
@@ -64,6 +64,13 @@ class BXSideNavMenuItem extends FocusMixin(LitElement) {
     return true;
   }
 
+  connectedCallback() {
+    if (!this.hasAttribute('role')) {
+      this.setAttribute('role', 'button');
+    }
+    super.connectedCallback();
+  }
+
   render() {
     const { active, href, title } = this;
     const classes = classMap({

diff --git a/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap b/packages/react/src/__tests__/__snapshots__/storyshots.test.js.snap
@@ -60334,15 +60334,15 @@ exports[`Storyshots Components/Dotcom shell With L1 1`] = `
                               className="bx--sub-content-right"
                             />
                             <HeaderNavigation
-                              aria-label=""
+                              aria-label="Main Navigation"
                               className="bx--masthead__l1-nav"
                             >
                               <nav
-                                aria-label=""
+                                aria-label="Main Navigation"
                                 className="bx--header__nav bx--masthead__l1-nav"
                               >
                                 <ul
-                                  aria-label=""
+                                  aria-label="Main Navigation"
                                   className="bx--header__menu-bar"
                                 >
                                   <ForwardRef
@@ -121566,15 +121566,15 @@ exports[`Storyshots Components/Masthead With L1 1`] = `
                               className="bx--sub-content-right"
                             />
                             <HeaderNavigation
-                              aria-label=""
+                              aria-label="Main Navigation"
                               className="bx--masthead__l1-nav"
                             >
                               <nav
-                                aria-label=""
+                                aria-label="Main Navigation"
                                 className="bx--header__nav bx--masthead__l1-nav"
                               >
                                 <ul
-                                  aria-label=""
+                                  aria-label="Main Navigation"
                                   className="bx--header__menu-bar"
                                 >
                                   <ForwardRef

diff --git a/packages/react/src/components/Masthead/MastheadL1.js b/packages/react/src/components/Masthead/MastheadL1.js
@@ -83,7 +83,7 @@ const MastheadL1 = ({ navigationL1, ...rest }) => {
           <HeaderNavContainer>
             <HeaderNavigation
               className={`${prefix}--masthead__l1-nav`}
-              aria-label="">
+              aria-label="Main Navigation">
               {mastheadL1Links}
             </HeaderNavigation>
           </HeaderNavContainer>

diff --git a/packages/styles/scss/components/filter-panel/_filter-panel.scss b/packages/styles/scss/components/filter-panel/_filter-panel.scss
@@ -1,5 +1,5 @@
 /**
- * Copyright IBM Corp. 2016, 2022
+ * Copyright IBM Corp. 2016, 2023
  *
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
@@ -237,18 +237,7 @@
   }
 
   :host(#{$dds-prefix}-filter-panel-heading) {
-    @include carbon--type-style('heading-01');
-    @include carbon--breakpoint('sm') {
-      margin-left: $spacing-05;
-      margin-bottom: $spacing-05;
-    }
-    @include carbon--breakpoint('lg') {
-      margin: 0;
-    }
-
-    @include carbon--breakpoint-down('lg') {
-      display: none;
-    }
+    display: none;
   }
 
   :host(#{$dds-prefix}-filter-group:first-of-type) {