Merge branch 'main' into docs/add-grid-migration-docs

carbon-design-system · Jan 26, 2022 · de1cad7 · de1cad7
2 parents 19c51a1 + e11bf01
commit de1cad7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/packages/components/src/components/data-table/_data-table-action.scss b/packages/components/src/components/data-table/_data-table-action.scss
@@ -74,11 +74,15 @@
 
   .#{$prefix}--toolbar-search-container-expandable .#{$prefix}--search-input {
     height: 100%;
-    padding: 0;
     cursor: pointer;
     opacity: 0;
   }
 
+  .#{$prefix}--toolbar-search-container-expandable:not(.#{$prefix}--toolbar-search-container-active)
+    .#{$prefix}--search-input {
+    padding: 0;
+  }
+
   .#{$prefix}--toolbar-search-container-expandable
     .#{$prefix}--search-magnifier-icon {
     left: 0;

diff --git a/packages/react/src/components/UIShell/HeaderSideNavItems.js b/packages/react/src/components/UIShell/HeaderSideNavItems.js
@@ -23,7 +23,7 @@ const HeaderSideNavItems = ({
     },
     customClassName
   );
-  return <div className={className}>{children}</div>;
+  return <ul className={className}>{children}</ul>;
 };
 
 HeaderSideNavItems.propTypes = {

diff --git a/packages/styles/scss/components/data-table/action/_data-table-action.scss b/packages/styles/scss/components/data-table/action/_data-table-action.scss
@@ -80,11 +80,15 @@
 
   .#{$prefix}--toolbar-search-container-expandable .#{$prefix}--search-input {
     height: 100%;
-    padding: 0;
     cursor: pointer;
     opacity: 0;
   }
 
+  .#{$prefix}--toolbar-search-container-expandable:not(.#{$prefix}--toolbar-search-container-active)
+    .#{$prefix}--search-input {
+    padding: 0;
+  }
+
   .#{$prefix}--toolbar-search-container-expandable
     .#{$prefix}--search-magnifier-icon {
     left: 0;