From 468dcaa59dfb48ff8d33a42b9e0f8be240b9e4d7 Mon Sep 17 00:00:00 2001
From: Sarah Rambacher <srambach@redhat.com>
Date: Thu, 28 Sep 2023 08:23:33 -0400
Subject: [PATCH 1/5] feat(page): page and masthead updates from hackathon

---
 .../components/Masthead/masthead-logo.hbs     |  6 ++++++
 .../components/Masthead/masthead.scss         | 21 ++++++++++++-------
 .../components/Page/page-main-list.hbs        |  6 ++++++
 .../components/Page/page-sidebar-header.hbs   |  6 ++++++
 .../components/Page/page-sidebar-title.hbs    |  6 ++++++
 .../components/Table/table-grid.scss          | 16 +++++++-------
 6 files changed, 45 insertions(+), 16 deletions(-)
 create mode 100644 src/patternfly/components/Masthead/masthead-logo.hbs
 create mode 100644 src/patternfly/components/Page/page-main-list.hbs
 create mode 100644 src/patternfly/components/Page/page-sidebar-header.hbs
 create mode 100644 src/patternfly/components/Page/page-sidebar-title.hbs

diff --git a/src/patternfly/components/Masthead/masthead-logo.hbs b/src/patternfly/components/Masthead/masthead-logo.hbs
new file mode 100644
index 0000000000..c46eba734e
--- /dev/null
+++ b/src/patternfly/components/Masthead/masthead-logo.hbs
@@ -0,0 +1,6 @@
+<div class="{{pfv}}masthead__logo{{#if masthead-logo--modifier}} {{masthead-logo--modifier}}{{/if}}"
+  {{#if masthead-logo--attribute}}
+    {{{masthead-logo--attribute}}}
+  {{/if}}>
+  {{> @partial-block}}
+</div>
\ No newline at end of file
diff --git a/src/patternfly/components/Masthead/masthead.scss b/src/patternfly/components/Masthead/masthead.scss
index 53a4489405..cec1a5f5e8 100644
--- a/src/patternfly/components/Masthead/masthead.scss
+++ b/src/patternfly/components/Masthead/masthead.scss
@@ -45,10 +45,10 @@ $pf-v5-c-masthead--inset-map: build-spacer-map("none", "sm", "md", "lg", "xl", "
 .#{$masthead} {
   --#{$masthead}--PaddingLeft: var(--#{$masthead}--inset);
   --#{$masthead}--PaddingRight: var(--#{$masthead}--inset);
-  --#{$masthead}--BackgroundColor: var(--#{$pf-global}--BackgroundColor--dark-100);
+  --#{$masthead}--BackgroundColor: var(--pf-t--global--background--color--secondary--default);
 
   // Insets
-  --#{$masthead}--inset: var(--#{$pf-global}--spacer--md); // match page insets
+  --#{$masthead}--inset: var(--pf-t--global--spacer--lg); // match page insets
   --#{$masthead}--xl--inset: var(--#{$pf-global}--spacer--lg); // match page insets
 
   // Stack
@@ -94,7 +94,7 @@ $pf-v5-c-masthead--inset-map: build-spacer-map("none", "sm", "md", "lg", "xl", "
   // Main border
   --#{$masthead}__main--before--Right: calc(var(--#{$masthead}--inset) * -1);
   --#{$masthead}__main--before--Left: calc(var(--#{$masthead}--inset) * -1);
-  --#{$masthead}__main--before--BorderBottomWidth: var(--#{$pf-global}--BorderWidth--sm);
+  --#{$masthead}__main--before--BorderBottomWidth: var(--pf-t--global--border--width--divider--default);
   --#{$masthead}__main--before--BorderBottomColor: var(--#{$pf-global}--palette--black-600);
 
   // Toggle
@@ -103,18 +103,18 @@ $pf-v5-c-masthead--inset-map: build-spacer-map("none", "sm", "md", "lg", "xl", "
   --#{$masthead}__toggle--c-button--FontSize: var(--#{$pf-global}--FontSize--2xl);
 
   // Light 100
-  --#{$masthead}--m-light--BackgroundColor: var(--#{$pf-global}--BackgroundColor--100);
+  --#{$masthead}--m-light--BackgroundColor: var(--pf-t--global--background--color--primary--default);
   --#{$masthead}--m-light__main--BorderBottomColor: var(--#{$pf-global}--BorderColor--300);
 
   // Light 200
-  --#{$masthead}--m-light-200--BackgroundColor: var(--#{$pf-global}--BackgroundColor--200);
-  --#{$masthead}--m-light-200__main--BorderBottomColor: var(--#{$pf-global}--BorderColor--100);
+  --#{$masthead}--m-light-200--BackgroundColor: var(--pf-t--global--background--color--secondary--default);
+  --#{$masthead}--m-light-200__main--BorderBottomColor: var(--pf-t--global--border--color--default);
 
   // Toolbar item
   --#{$masthead}--c-toolbar__item--Display: flex;
 
   // Borders
-  --#{$masthead}--item-border-color--base: var(--#{$pf-global}--palette--black-800);
+  --#{$masthead}--item-border-color--base: var(--pf-t--global--border--color--default);
 
   // Context selector
   --#{$masthead}--c-context-selector--Width: auto;
@@ -145,7 +145,7 @@ $pf-v5-c-masthead--inset-map: build-spacer-map("none", "sm", "md", "lg", "xl", "
   --#{$masthead}--c-toolbar__expandable-content--PaddingRight: var(--#{$masthead}--inset);
   --#{$masthead}--c-toolbar__expandable-content--PaddingBottom: var(--#{$pf-global}--spacer--md);
   --#{$masthead}--c-toolbar__expandable-content--PaddingLeft: var(--#{$masthead}--inset);
-  --#{$masthead}--c-toolbar__expandable-content--before--BorderTopWidth: var(--#{$pf-global}--BorderWidth--sm);
+  --#{$masthead}--c-toolbar__expandable-content--before--BorderTopWidth: var(--pf-t--global--border--width--divider--default);
   --#{$masthead}--c-toolbar__expandable-content--before--BorderTopColor: var(--#{$masthead}--item-border-color--base);
 
   // Set layout to stack by default
@@ -286,6 +286,11 @@ $pf-v5-c-masthead--inset-map: build-spacer-map("none", "sm", "md", "lg", "xl", "
   }
 }
 
+.#{$masthead}__logo {
+  display: flex;
+  gap: var(--pf-t--global--spacer--md);
+}
+
 // Content
 .#{$masthead}__content {
   display: flex;
diff --git a/src/patternfly/components/Page/page-main-list.hbs b/src/patternfly/components/Page/page-main-list.hbs
new file mode 100644
index 0000000000..b46ed944c6
--- /dev/null
+++ b/src/patternfly/components/Page/page-main-list.hbs
@@ -0,0 +1,6 @@
+<div class="{{pfv}}page__main-list{{#if page-main-list--modifier}} {{page-main-list--modifier}}{{/if}}" tabindex="-1"
+  {{#if page-main-list--attribute}}
+    {{{page-main-list--attribute}}}
+  {{/if}}>
+  {{> @partial-block}}
+</div>
\ No newline at end of file
diff --git a/src/patternfly/components/Page/page-sidebar-header.hbs b/src/patternfly/components/Page/page-sidebar-header.hbs
new file mode 100644
index 0000000000..293b071b02
--- /dev/null
+++ b/src/patternfly/components/Page/page-sidebar-header.hbs
@@ -0,0 +1,6 @@
+<div class="{{pfv}}page__sidebar-header{{#if page-sidebar-header--modifier}} {{page-sidebar-header--modifier}}{{/if}}"
+  {{#if page-sidebar-header--attribute}}
+    {{{page-sidebar-header--attribute}}}
+  {{/if}}>
+  {{> @partial-block}}
+</div>
\ No newline at end of file
diff --git a/src/patternfly/components/Page/page-sidebar-title.hbs b/src/patternfly/components/Page/page-sidebar-title.hbs
new file mode 100644
index 0000000000..76a70a2ef6
--- /dev/null
+++ b/src/patternfly/components/Page/page-sidebar-title.hbs
@@ -0,0 +1,6 @@
+<h2 class="{{pfv}}page__sidebar-title{{#if page-sidebar-title--modifier}} {{page-sidebar-title--modifier}}{{/if}}"
+  {{#if page-sidebar-title--attribute}}
+    {{{page-sidebar-title--attribute}}}
+  {{/if}}>
+  {{> @partial-block}}
+</h2>
\ No newline at end of file
diff --git a/src/patternfly/components/Table/table-grid.scss b/src/patternfly/components/Table/table-grid.scss
index ed6954f028..fed2bd96b9 100644
--- a/src/patternfly/components/Table/table-grid.scss
+++ b/src/patternfly/components/Table/table-grid.scss
@@ -38,19 +38,19 @@
   // ============================================================ //
 
   // Table
-  --#{$table}--responsive--BorderColor: var(--#{$pf-global}--BorderColor--300);
+  --#{$table}--responsive--BorderColor: var(--pf-t--global--border--color--default);
 
   // Body
-  --#{$table}__tbody--responsive--border-width--base: var(--#{$pf-global}--spacer--sm);
+  --#{$table}__tbody--responsive--border-width--base: var(--pf-t--global--border--width--divider--default);
   --#{$table}__tbody--after--border-width--base: var(--#{$pf-global}--BorderWidth--lg);
   --#{$table}__tbody--after--BorderLeftWidth: 0;
-  --#{$table}__tbody--after--BorderColor: var(--#{$pf-global}--active-color--100);
+  --#{$table}__tbody--after--BorderColor: var(--pf-t--global--border--color--active);
 
   // Row
-  --#{$table}__tr--responsive--border-width--base: var(--#{$pf-global}--spacer--sm);
+  --#{$table}__tr--responsive--border-width--base: var(--pf-t--global--border--width--divider--default);
   --#{$table}__tr--responsive--last-child--BorderBottomWidth: var(--#{$pf-global}--BorderWidth--sm);
   --#{$table}__tr--responsive--GridColumnGap: var(--#{$pf-global}--spacer--md);
-  --#{$table}__tr--responsive--MarginTop: var(--#{$pf-global}--spacer--sm);
+  --#{$table}__tr--responsive--MarginTop: var(--pf-t--global--border--width--divider--default);
   --#{$table}__tr--responsive--PaddingTop: var(--#{$pf-global}--spacer--md);
   --#{$table}__tr--responsive--PaddingRight: var(--#{$pf-global}--spacer--lg);
   --#{$table}__tr--responsive--xl--PaddingRight: var(--#{$pf-global}--spacer--md);
@@ -76,7 +76,7 @@
 
   // selected
   --#{$table}__tbody--m-selected--after__tr--BorderLeftWidth: var(--#{$table}__expandable-row--after--border-width--base);
-  --#{$table}__tbody--m-selected--after__tr--BorderLeftColor: var(--#{$pf-global}--active-color--100);
+  --#{$table}__tbody--m-selected--after__tr--BorderLeftColor: var(--pf-t--global--border--color--active);
 
   // Cell display
   --#{$table}--m-grid--cell--hidden-visible--Display: grid;
@@ -109,7 +109,7 @@
   --#{$table}__expandable-row-content--responsive--PaddingLeft: var(--#{$pf-global}--spacer--lg);
   --#{$table}__expandable-row-content--responsive--xl--PaddingRight: var(--#{$pf-global}--spacer--md);
   --#{$table}__expandable-row-content--responsive--xl--PaddingLeft: var(--#{$pf-global}--spacer--md);
-  --#{$table}__expandable-row-content--BackgroundColor: var(--#{$pf-global}--BackgroundColor--100);
+  --#{$table}__expandable-row-content--BackgroundColor: var(--pf-t--global--background--color--primary--default);
 
   @media screen and (max-width: $pf-v5-global--breakpoint--xl) {
     --#{$table}__expandable-row-content--responsive--PaddingRight: var(--#{$table}__expandable-row-content--responsive--xl--PaddingRight);
@@ -117,7 +117,7 @@
   }
 
   // Check
-  --#{$table}__check--responsive--MarginLeft: var(--#{$pf-global}--spacer--sm);
+  --#{$table}__check--responsive--MarginLeft: var(--pf-t--global--border--width--divider--default);
   --#{$table}__check--responsive--MarginTop: #{pf-size-prem(14px)};
 
   // Favorite

From 89bd60999592e33d33444049f6c66540fb9a8c2c Mon Sep 17 00:00:00 2001
From: Michael Coker <35148959+mcoker@users.noreply.github.com>
Date: Wed, 4 Oct 2023 11:03:42 -0500
Subject: [PATCH 2/5] Update
 src/patternfly/components/Masthead/masthead-logo.hbs

---
 src/patternfly/components/Masthead/masthead-logo.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/patternfly/components/Masthead/masthead-logo.hbs b/src/patternfly/components/Masthead/masthead-logo.hbs
index c46eba734e..eb7db04f12 100644
--- a/src/patternfly/components/Masthead/masthead-logo.hbs
+++ b/src/patternfly/components/Masthead/masthead-logo.hbs
@@ -3,4 +3,4 @@
     {{{masthead-logo--attribute}}}
   {{/if}}>
   {{> @partial-block}}
-</div>
\ No newline at end of file
+</div>

From 9ff03096463a9a2d3378f53ca76f1924a37123b6 Mon Sep 17 00:00:00 2001
From: Michael Coker <35148959+mcoker@users.noreply.github.com>
Date: Wed, 4 Oct 2023 11:03:47 -0500
Subject: [PATCH 3/5] Update src/patternfly/components/Page/page-main-list.hbs

---
 src/patternfly/components/Page/page-main-list.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/patternfly/components/Page/page-main-list.hbs b/src/patternfly/components/Page/page-main-list.hbs
index b46ed944c6..179416ecc3 100644
--- a/src/patternfly/components/Page/page-main-list.hbs
+++ b/src/patternfly/components/Page/page-main-list.hbs
@@ -3,4 +3,4 @@
     {{{page-main-list--attribute}}}
   {{/if}}>
   {{> @partial-block}}
-</div>
\ No newline at end of file
+</div>

From 74b8832ef725c676882c515cfd78848dca349907 Mon Sep 17 00:00:00 2001
From: Michael Coker <35148959+mcoker@users.noreply.github.com>
Date: Wed, 4 Oct 2023 11:03:52 -0500
Subject: [PATCH 4/5] Update
 src/patternfly/components/Page/page-sidebar-header.hbs

---
 src/patternfly/components/Page/page-sidebar-header.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/patternfly/components/Page/page-sidebar-header.hbs b/src/patternfly/components/Page/page-sidebar-header.hbs
index 293b071b02..265cced9fc 100644
--- a/src/patternfly/components/Page/page-sidebar-header.hbs
+++ b/src/patternfly/components/Page/page-sidebar-header.hbs
@@ -3,4 +3,4 @@
     {{{page-sidebar-header--attribute}}}
   {{/if}}>
   {{> @partial-block}}
-</div>
\ No newline at end of file
+</div>

From 1036e493abafaf8fcf869c9128452642919aee09 Mon Sep 17 00:00:00 2001
From: Michael Coker <35148959+mcoker@users.noreply.github.com>
Date: Wed, 4 Oct 2023 11:03:56 -0500
Subject: [PATCH 5/5] Update
 src/patternfly/components/Page/page-sidebar-title.hbs

---
 src/patternfly/components/Page/page-sidebar-title.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/patternfly/components/Page/page-sidebar-title.hbs b/src/patternfly/components/Page/page-sidebar-title.hbs
index 76a70a2ef6..924cc7869f 100644
--- a/src/patternfly/components/Page/page-sidebar-title.hbs
+++ b/src/patternfly/components/Page/page-sidebar-title.hbs
@@ -3,4 +3,4 @@
     {{{page-sidebar-title--attribute}}}
   {{/if}}>
   {{> @partial-block}}
-</h2>
\ No newline at end of file
+</h2>