Merge pull request #421 from dcos-labs/gt/fix/DCOS-59679-pageheader-h…

…eight DCOS-59679
d2iq · Oct 21, 2019 · 78408d6 · 78408d6
2 parents b1b0038 + f7f2967
commit 78408d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/pageheader/components/PageHeader.tsx b/packages/pageheader/components/PageHeader.tsx
@@ -30,8 +30,9 @@ class PageHeader extends React.PureComponent<PageHeaderProps, {}> {
 
     return (
       <div
-        className={cx(padding("all", pageHeaderPaddingSize), fillHeight, {
-          [border("bottom")]: !hasTabsChild
+        className={cx(padding("all", pageHeaderPaddingSize), {
+          [border("bottom")]: !hasTabsChild,
+          [fillHeight]: hasTabsChild
         })}
       >
         <div className={cx(flex({ align: "center" }))} data-cy="pageHeader">

diff --git a/packages/pageheader/tests/__snapshots__/PageHeader.test.tsx.snap b/packages/pageheader/tests/__snapshots__/PageHeader.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`PageHeader default 1`] = `
 <div
-  class="css-18vxolt"
+  class="css-1ik9ay"
 >
   <div
     class="css-1s0dtwu"