Merge branch 'master' into stats-icons-2

carbon-design-system · Feb 6, 2020 · 6ece94a · 6ece94a
2 parents caa6d95 + 4b9cc7c
commit 6ece94a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
@@ -18927,6 +18927,7 @@ Inline notification styles
     min-height: rem(48px);
     min-width: rem(288px);
     max-width: rem(288px);
+    width: 100%;
     color: $inverse-01;
     margin-top: $carbon--spacing-05;
     margin-bottom: $carbon--spacing-05;

diff --git a/packages/components/src/components/notification/_inline-notification.scss b/packages/components/src/components/notification/_inline-notification.scss
@@ -29,6 +29,7 @@
     min-height: rem(48px);
     min-width: rem(288px);
     max-width: rem(288px);
+    width: 100%;
     color: $inverse-01;
     margin-top: $carbon--spacing-05;
     margin-bottom: $carbon--spacing-05;

diff --git a/packages/react/src/components/UIShell/HeaderSideNavItems.js b/packages/react/src/components/UIShell/HeaderSideNavItems.js
@@ -17,11 +17,13 @@ const HeaderSideNavItems = ({
   children,
   hasDivider,
 }) => {
-  const className = cx({
-    [`${prefix}--side-nav__header-navigation`]: true,
-    [`${prefix}--side-nav__header-divider`]: hasDivider,
-    customClassName,
-  });
+  const className = cx(
+    {
+      [`${prefix}--side-nav__header-navigation`]: true,
+      [`${prefix}--side-nav__header-divider`]: hasDivider,
+    },
+    customClassName
+  );
   return <div className={className}>{children}</div>;
 };