rebase and add modifiers to toolbar

Author: kmcfaul

packages/react-core/src/components/Masthead/__tests__/__snapshots__/Masthead.test.tsx.snap

@@ -93,7 +93,7 @@ exports[`Masthead verify inset2xl inset breakpoints 1`] = `
   }
 >
   <header
-    className="pf-c-masthead"
+    className="pf-c-masthead pf-m-inset-2xl pf-m-inset-2xl-on-sm pf-m-inset-2xl-on-md pf-m-inset-2xl-on-lg pf-m-inset-2xl-on-xl pf-m-inset-2xl-on-2xl"
   >
     test
   </header>
@@ -135,7 +135,7 @@ exports[`Masthead verify insetLg inset breakpoints 1`] = `
   }
 >
   <header
-    className="pf-c-masthead"
+    className="pf-c-masthead pf-m-inset-lg pf-m-inset-lg-on-sm pf-m-inset-lg-on-md pf-m-inset-lg-on-lg pf-m-inset-lg-on-xl pf-m-inset-lg-on-2xl"
   >
     test
   </header>
@@ -156,7 +156,7 @@ exports[`Masthead verify insetMd inset breakpoints 1`] = `
   }
 >
   <header
-    className="pf-c-masthead"
+    className="pf-c-masthead pf-m-inset-md pf-m-inset-md-on-sm pf-m-inset-md-on-md pf-m-inset-md-on-lg pf-m-inset-md-on-xl pf-m-inset-md-on-2xl"
   >
     test
   </header>
@@ -177,7 +177,7 @@ exports[`Masthead verify insetNone inset breakpoints 1`] = `
   }
 >
   <header
-    className="pf-c-masthead"
+    className="pf-c-masthead pf-m-inset-none pf-m-inset-none-on-sm pf-m-inset-none-on-md pf-m-inset-none-on-lg pf-m-inset-none-on-xl pf-m-inset-none-on-2xl"
   >
     test
   </header>
@@ -198,7 +198,7 @@ exports[`Masthead verify insetSm inset breakpoints 1`] = `
   }
 >
   <header
-    className="pf-c-masthead"
+    className="pf-c-masthead pf-m-inset-sm pf-m-inset-sm-on-sm pf-m-inset-sm-on-md pf-m-inset-sm-on-lg pf-m-inset-sm-on-xl pf-m-inset-sm-on-2xl"
   >
     test
   </header>
@@ -219,7 +219,7 @@ exports[`Masthead verify insetXl inset breakpoints 1`] = `
   }
 >
   <header
-    className="pf-c-masthead"
+    className="pf-c-masthead pf-m-inset-xl pf-m-inset-xl-on-sm pf-m-inset-xl-on-md pf-m-inset-xl-on-lg pf-m-inset-xl-on-xl pf-m-inset-xl-on-2xl"
   >
     test
   </header>

packages/react-core/src/components/Toolbar/Toolbar.tsx

@@ -24,6 +24,10 @@ export interface ToolbarProps extends React.HTMLProps<HTMLDivElement>, OUIAProps
   children?: React.ReactNode;
   /** Id of the data toolbar */
   id?: string;
+  /** Flag indicating the toolbar height should expand to the full height of the container */
+  isFullHeight?: boolean;
+  /** Flag indicating the toolbar is static */
+  isStatic?: boolean;
   /** Flag indicating the toolbar should use the Page insets */
   usePageInsets?: boolean;
   /** Insets at various breakpoints. */
@@ -113,6 +117,8 @@ export class Toolbar extends React.Component<ToolbarProps, ToolbarState> {
       toggleIsExpanded,
       className,
       children,
+      isFullHeight,
+      isStatic,
       inset,
       usePageInsets,
       ouiaId,
@@ -130,6 +136,8 @@ export class Toolbar extends React.Component<ToolbarProps, ToolbarState> {
       <div
         className={css(
           styles.toolbar,
+          isFullHeight && styles.modifiers.fullHeight,
+          isStatic && styles.modifiers.static,
           usePageInsets && styles.modifiers.pageInsets,
           formatBreakpointMods(inset, styles),
           className

packages/react-core/src/demos/Masthead.md

@@ -149,7 +149,7 @@ class BasicMasthead extends React.Component {
           </MastheadBrand>
         </MastheadMain>
         <MastheadContent>
-          <Toolbar id="toolbar">
+          <Toolbar id="toolbar" isFullHeight isStatic>
             <ToolbarContent>
               <ToolbarItem>
                 <ContextSelector