From 8855bba8b56b1bb1616df356bf934dd5a1508cfa Mon Sep 17 00:00:00 2001
From: Oscar Merida <oscar.merida@gsa.gov>
Date: Mon, 13 Jan 2025 16:27:45 -0500
Subject: [PATCH 01/24] Change the menu bar in guides to align left to line up
 with the header and minimize horizontal scrolling.

---
 .../digital.gov/src/scss/new/guides/_guide-menu-bar.scss  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
index 7bd001f8aa..9043f5b104 100644
--- a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
+++ b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
@@ -7,10 +7,11 @@
   align-items: center;
   background-color: color("gray-10");
   height: units(10);
-  justify-content: center;
+  justify-content: left;
   position: sticky;
   top: -1px;
   white-space: nowrap;
+  padding-left: calc(50vw - 32rem);
 
   @include at-media("mobile-lg") {
     display: flex;
@@ -31,10 +32,9 @@
 
   &-links {
     // Fade out overflowing items when scrolling
-    mask: linear-gradient(90deg, #0000, #000 5% 95%, #0000);
+    mask: linear-gradient(90deg, #0000, #000 1rem 95%, #0000);
     overflow-x: scroll;
     overflow-y: hidden;
-    padding: 0 units(3);
     scrollbar-width: none;
   }
 
@@ -60,8 +60,6 @@
   }
 
   &.sticky {
-    justify-content: space-evenly;
-
     .dg-guide__menu-bar-image-container {
       align-items: flex-end;
       display: flex;

From be8d7a47adc120ded30f79588c27c2eebc048c3d Mon Sep 17 00:00:00 2001
From: Nick Lyons <nick.lyons@gsa.gov>
Date: Tue, 14 Jan 2025 14:40:31 -0500
Subject: [PATCH 02/24] Updated markup and classes to be consistent with best
 practices

---
 .../partials/core/guides/guide-menu-bar.html  |  5 +++-
 .../src/scss/new/guides/_guide-menu-bar.scss  | 26 ++++++++++++++-----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html b/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html
index 19a2410ce9..d203e0242b 100644
--- a/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html
+++ b/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html
@@ -45,7 +45,10 @@
       </button>
     {{- end -}}
   </div>
-  <nav class="dg-guide__menu-bar-links" aria-label="Secondary menu bar">
+  <nav
+    class="dg-guide__menu-bar-links grid-container grid-container-desktop"
+    aria-label="Secondary menu bar"
+  >
     {{ partial "core/guides/guide-menu-links.html" (dict "guideData" $guideData "currentPage" $currentPage "pageScope" .) }}
   </nav>
 </div>
diff --git a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
index 9043f5b104..0ccfda149a 100644
--- a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
+++ b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
@@ -1,25 +1,28 @@
 @use "uswds-core" as *;
 
+// nav
+
 // Styles the desktop horizontal menu bar
 .dg-guide__menu-bar {
   @include u-border-y("1px", "gray-cool-30", "solid");
   @include u-z(200);
-  align-items: center;
+  // align-items: center;
   background-color: color("gray-10");
   height: units(10);
-  justify-content: left;
+  // justify-content: left;
   position: sticky;
   top: -1px;
   white-space: nowrap;
-  padding-left: calc(50vw - 32rem);
+  // padding-left: calc(50vw - 32rem);
 
   @include at-media("mobile-lg") {
-    display: flex;
+    // display: flex;
   }
 
   &-image-container {
     flex-shrink: 0;
-    margin: 0 units(3);
+    margin-left: units(3);
+    margin-right: units(3);
 
     a {
       text-decoration: none;
@@ -31,6 +34,11 @@
   }
 
   &-links {
+    align-items: center;
+    display: flex;
+    flex-direction: row;
+    height: 100%;
+    justify-content: flex-start;
     // Fade out overflowing items when scrolling
     mask: linear-gradient(90deg, #0000, #000 1rem 95%, #0000);
     overflow-x: scroll;
@@ -43,10 +51,11 @@
   }
 
   .dg-guide__menu-bar-link {
+    border-bottom: units(0.5) solid transparent;
     color: color("ink");
     font-size: size("sans", "md");
     font-weight: font-weight("light");
-    margin: 0 units(3);
+    margin-right: units(5);
     text-decoration: none;
 
     &:hover {
@@ -60,6 +69,11 @@
   }
 
   &.sticky {
+    @include at-media("mobile-lg") {
+      align-items: center;
+      display: flex;
+      justify-content: left;
+    }
     .dg-guide__menu-bar-image-container {
       align-items: flex-end;
       display: flex;

From ea3c701860f91d4a905f76641cf8c7af72d32259 Mon Sep 17 00:00:00 2001
From: Nick Lyons <nick.lyons@gsa.gov>
Date: Wed, 22 Jan 2025 17:28:12 -0500
Subject: [PATCH 03/24] Refactored markup to address menubar style breaks

---
 .../partials/core/guides/guide-menu-bar.html  | 69 ++++++++++---------
 themes/digital.gov/src/js/guide-menu-bar.js   | 13 +++-
 .../src/scss/new/guides/_guide-menu-bar.scss  | 14 ++--
 3 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html b/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html
index d203e0242b..87c94ea41b 100644
--- a/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html
+++ b/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html
@@ -15,42 +15,43 @@
 
 
 <div class="dg-guide__menu-bar">
-  <div class="dg-guide__menu-bar-image-container" hidden>
-    <a href="{{- .Site.BaseURL -}}" title="{{- .Site.Title }} Home">
-      <picture class="dg-guide__menu-bar-image">
-        <source
-          srcset="{{- "img/digitalgov-logo.svg" | relURL -}}"
-          media="(min-width: 480px)"
-        />
-        <img
-          src="{{- "img/digit-100.svg" | relURL -}}"
-          alt="Digital Gov Logo"
-        />
-      </picture>
-    </a>
-    {{- if $glossary -}}
-      <button title="Show glossary" class="dg-glossary__toggle">
-        <svg
-          class="dg-glossary__toggle-icon"
-          width="100%"
-          height="100%"
-          viewBox="0 0 21 21"
-          aria-hidden="true"
-          focusable="false"
-        >
-          <path
-            d="M13.9583 2.99612C13.9583 2.25376 13.5274 1.631 12.9074 1.25803C12.2875 0.885127 11.4706 0.755653 10.6759 0.999207L7.41667 1.99802L4.15746 0.999208C3.36272 0.755654 2.54584 0.885127 1.92596 1.25803C1.30597 1.631 0.875 2.25376 0.875 2.99612V11.6299C0.875 12.5372 1.54014 13.3298 2.50921 13.6268L7.41667 15.1307L12.3241 13.6268C13.2932 13.3298 13.9583 12.5372 13.9583 11.6299V2.99612ZM11.1429 2.17693C11.4882 2.07112 11.8416 2.12807 12.107 2.28774C12.3723 2.44735 12.5417 2.7033 12.5417 2.99612V11.6299C12.5417 11.9855 12.2789 12.3198 11.8571 12.4491L8.125 13.5928V3.10179L11.1429 2.17693ZM2.29167 2.99612C2.29167 2.7033 2.46099 2.44735 2.7263 2.28774C2.99172 2.12808 3.34516 2.07112 3.69046 2.17694L6.70833 3.10179V13.5928L2.97621 12.4491C2.55441 12.3198 2.29167 11.9855 2.29167 11.6299V2.99612Z"
+  <div
+    class="dg-guide__menu-bar-container grid-container grid-container-desktop"
+  >
+    <div class="dg-guide__menu-bar-image-container" hidden>
+      <a href="{{- .Site.BaseURL -}}" title="{{- .Site.Title }} Home">
+        <picture class="dg-guide__menu-bar-image">
+          <source
+            srcset="{{- "img/digitalgov-logo.svg" | relURL -}}"
+            media="(min-width: 480px)"
           />
-        </svg>
-      </button>
-    {{- end -}}
+          <img
+            src="{{- "img/digit-100.svg" | relURL -}}"
+            alt="Digital Gov Logo"
+          />
+        </picture>
+      </a>
+      {{- if $glossary -}}
+        <button title="Show glossary" class="dg-glossary__toggle">
+          <svg
+            class="dg-glossary__toggle-icon"
+            width="100%"
+            height="100%"
+            viewBox="0 0 21 21"
+            aria-hidden="true"
+            focusable="false"
+          >
+            <path
+              d="M13.9583 2.99612C13.9583 2.25376 13.5274 1.631 12.9074 1.25803C12.2875 0.885127 11.4706 0.755653 10.6759 0.999207L7.41667 1.99802L4.15746 0.999208C3.36272 0.755654 2.54584 0.885127 1.92596 1.25803C1.30597 1.631 0.875 2.25376 0.875 2.99612V11.6299C0.875 12.5372 1.54014 13.3298 2.50921 13.6268L7.41667 15.1307L12.3241 13.6268C13.2932 13.3298 13.9583 12.5372 13.9583 11.6299V2.99612ZM11.1429 2.17693C11.4882 2.07112 11.8416 2.12807 12.107 2.28774C12.3723 2.44735 12.5417 2.7033 12.5417 2.99612V11.6299C12.5417 11.9855 12.2789 12.3198 11.8571 12.4491L8.125 13.5928V3.10179L11.1429 2.17693ZM2.29167 2.99612C2.29167 2.7033 2.46099 2.44735 2.7263 2.28774C2.99172 2.12808 3.34516 2.07112 3.69046 2.17694L6.70833 3.10179V13.5928L2.97621 12.4491C2.55441 12.3198 2.29167 11.9855 2.29167 11.6299V2.99612Z"
+            />
+          </svg>
+        </button>
+      {{- end -}}
+    </div>
+    <nav class="dg-guide__menu-bar-links" aria-label="Secondary menu bar">
+      {{ partial "core/guides/guide-menu-links.html" (dict "guideData" $guideData "currentPage" $currentPage "pageScope" .) }}
+    </nav>
   </div>
-  <nav
-    class="dg-guide__menu-bar-links grid-container grid-container-desktop"
-    aria-label="Secondary menu bar"
-  >
-    {{ partial "core/guides/guide-menu-links.html" (dict "guideData" $guideData "currentPage" $currentPage "pageScope" .) }}
-  </nav>
 </div>
 
 <div class="usa-accordion guide-mobile-menu">
diff --git a/themes/digital.gov/src/js/guide-menu-bar.js b/themes/digital.gov/src/js/guide-menu-bar.js
index caa9e1d295..38d6a37f43 100644
--- a/themes/digital.gov/src/js/guide-menu-bar.js
+++ b/themes/digital.gov/src/js/guide-menu-bar.js
@@ -1,15 +1,17 @@
 // Uses manual breakpoints because USWDS breakpoints are not accessible within JS
 const deviceBreakpoint = 480;
-const menuBarScrollOffsetMobile = 150;
-const menuBarScrollOffsetFull = 320;
-const menuBarScrollOffsetDefault = 30;
+const menuBarScrollOffsetMobile = 600;
+const menuBarScrollOffsetFull = 600;
+const menuBarScrollOffsetDefault = 600;
 let menuBarLinks = null;
 let menuBarImage = null;
+let menuBarContainer = null;
 
 const menuBar = document.querySelector(".dg-guide__menu-bar");
 if (menuBar) {
   menuBarLinks = menuBar.querySelector(".dg-guide__menu-bar-links");
   menuBarImage = menuBar.querySelector(".dg-guide__menu-bar-image-container");
+  menuBarContainer = menuBar.querySelector(".dg-guide__menu-bar-container");
 }
 
 // Scroll the guide menu bar so that the currently selected item is in view
@@ -24,6 +26,10 @@ function intersection(e) {
   // Check if menu bar intersected the top of the page
   if (!e.isIntersecting && e.boundingClientRect.top < 1) {
     menuBar.classList.add("sticky");
+    menuBarContainer.classList.remove(
+      "grid-container",
+      "grid-container-desktop"
+    );
     menuBarImage.removeAttribute("hidden");
     menuBarImage.setAttribute("tabindex", "0");
 
@@ -38,6 +44,7 @@ function intersection(e) {
     menuBarImage.setAttribute("hidden", "");
     menuBarImage.setAttribute("tabindex", "-1");
     menuBar.classList.remove("sticky");
+    menuBarContainer.classList.add("grid-container", "grid-container-desktop");
     scrollMenuBar(menuBarScrollOffsetDefault);
   }
 }
diff --git a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
index 0ccfda149a..a773070108 100644
--- a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
+++ b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
@@ -6,17 +6,18 @@
 .dg-guide__menu-bar {
   @include u-border-y("1px", "gray-cool-30", "solid");
   @include u-z(200);
-  // align-items: center;
   background-color: color("gray-10");
   height: units(10);
-  // justify-content: left;
   position: sticky;
   top: -1px;
   white-space: nowrap;
-  // padding-left: calc(50vw - 32rem);
 
-  @include at-media("mobile-lg") {
-    // display: flex;
+  &-container {
+    display: flex;
+    height: 100%;
+    justify-content: center;
+    justify-content: space-evenly;
+    width: 100%;
   }
 
   &-image-container {
@@ -40,7 +41,7 @@
     height: 100%;
     justify-content: flex-start;
     // Fade out overflowing items when scrolling
-    mask: linear-gradient(90deg, #0000, #000 1rem 95%, #0000);
+    // mask: linear-gradient(90deg, #0000, #000 1rem 95%, #0000);
     overflow-x: scroll;
     overflow-y: hidden;
     scrollbar-width: none;
@@ -76,6 +77,7 @@
     }
     .dg-guide__menu-bar-image-container {
       align-items: flex-end;
+      align-self: center;
       display: flex;
     }
   }

From ac6efefb3bf3ceb93328c8a25b61401d56ae6b0b Mon Sep 17 00:00:00 2001
From: Nick Lyons <nick.lyons@gsa.gov>
Date: Tue, 4 Feb 2025 16:08:36 -0500
Subject: [PATCH 04/24] Fixed styles for menubar

---
 ...osts-first-ever-technology-industry-day-in-washington-d-c.md | 2 --
 .../06/2020-06-30-bringing-our-humanity-work-5-ingredients.md   | 1 -
 themes/digital.gov/src/js/guide-menu-bar.js                     | 2 ++
 themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss     | 2 --
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md b/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md
index 6209f8c411..654f6ec698 100644
--- a/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md
+++ b/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md
@@ -24,8 +24,6 @@ On September 8, 2016 Administrator Denise Turner Roth of the [U.S. General Servi
 
 "The General Services Administration has a long history of being a strong leader in adopting technology in government," said Administrator Roth when giving her opening remarks at GSA's Technology Industry Day.
 
-{{< tweet user="18F" id="773873292746723328" >}}
-
 In a moderated panel, the leadership team shared their insights about the future of GSA’s role in making it easier for agencies to create and buy technology. The panel included GSA Administrator Denise Turner Roth, Acting [Technology Transformation Service](http://www.gsa.gov/portal/category/25729) (TTS) Commissioner David Shive, Chief Technology Officer Navin Vembar, Assistant Commissioner of [Integrated Technology Services](http://www.gsa.gov/portal/content/105150) Mary Davie and Executive Director of [18F](http://www.gsa.gov/portal/content/124182) Aaron Snow.
 
 {{< tweet user="USGSA" id="773881444896739328" >}}
diff --git a/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md b/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md
index 7dc906f67a..d04961f47b 100644
--- a/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md
+++ b/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md
@@ -98,7 +98,6 @@ This month, we’re focusing on large group meetings: divisional Town Halls or o
 
 <p>We also encourage gratitude and reflection. Kudos are another staple of our meetings: we set aside a timeblock for teammates to thank each other, in their own words. The moderator can gather names ahead of time and call on each person to unmute. They can also read off kudos for anyone who can’t attend or would prefer not to unmute.</p>
 
-{{< tweet user="18F" id="1180123465963188224" >}}</li>
 </ol>
 
 We hope you’ll stir together our five ingredients and create the dish that best serves your audience. Stay tuned for the next piece, focused on small team meetings.
diff --git a/themes/digital.gov/src/js/guide-menu-bar.js b/themes/digital.gov/src/js/guide-menu-bar.js
index 38d6a37f43..9ae0a2e5bd 100644
--- a/themes/digital.gov/src/js/guide-menu-bar.js
+++ b/themes/digital.gov/src/js/guide-menu-bar.js
@@ -30,6 +30,7 @@ function intersection(e) {
       "grid-container",
       "grid-container-desktop"
     );
+    menuBarLinks.style.paddingLeft = "calc(50vw - 45.2rem)";
     menuBarImage.removeAttribute("hidden");
     menuBarImage.setAttribute("tabindex", "0");
 
@@ -43,6 +44,7 @@ function intersection(e) {
   } else {
     menuBarImage.setAttribute("hidden", "");
     menuBarImage.setAttribute("tabindex", "-1");
+    menuBarLinks.style.paddingLeft = 0;
     menuBar.classList.remove("sticky");
     menuBarContainer.classList.add("grid-container", "grid-container-desktop");
     scrollMenuBar(menuBarScrollOffsetDefault);
diff --git a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
index a773070108..95cff94c5c 100644
--- a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
+++ b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
@@ -15,8 +15,6 @@
   &-container {
     display: flex;
     height: 100%;
-    justify-content: center;
-    justify-content: space-evenly;
     width: 100%;
   }
 

From 9144c1668701d94e09824c7394202a1597033ed7 Mon Sep 17 00:00:00 2001
From: Nick Lyons <nick.lyons@gsa.gov>
Date: Thu, 6 Feb 2025 16:39:10 -0500
Subject: [PATCH 05/24] Updated menubar styles for regular and hcd guides

---
 themes/digital.gov/layouts/guides/single.html |  2 +-
 .../partials/core/guides/guide-menu-bar.html  |  4 ---
 themes/digital.gov/src/js/guide-menu-bar.js   | 25 +++++++++++++++++--
 .../src/scss/new/guides/_guide-content.scss   |  4 +++
 .../src/scss/new/guides/_guide-menu-bar.scss  |  4 +++
 .../src/scss/new/guides/_guide-nav.scss       |  4 +--
 .../src/scss/new/shortcodes/_note.scss        |  2 +-
 7 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/themes/digital.gov/layouts/guides/single.html b/themes/digital.gov/layouts/guides/single.html
index cca3374f15..dc3c35a84e 100644
--- a/themes/digital.gov/layouts/guides/single.html
+++ b/themes/digital.gov/layouts/guides/single.html
@@ -8,7 +8,7 @@
         {{- $guideData = index $.Site.Data.guidenav (.Params.guide) -}}
       {{ end }}
       {{- if $guideData.showInPageNav -}}
-        <div class="dg-guide__container">
+        <div class="dg-guide__container grid-container grid-container-desktop">
           <aside class="dg-guide__nav">
             {{- partial "core/guides/guide-sidenav.html" . -}}
           </aside>
diff --git a/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html b/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html
index 87c94ea41b..9bc00570a5 100644
--- a/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html
+++ b/themes/digital.gov/layouts/partials/core/guides/guide-menu-bar.html
@@ -21,10 +21,6 @@
     <div class="dg-guide__menu-bar-image-container" hidden>
       <a href="{{- .Site.BaseURL -}}" title="{{- .Site.Title }} Home">
         <picture class="dg-guide__menu-bar-image">
-          <source
-            srcset="{{- "img/digitalgov-logo.svg" | relURL -}}"
-            media="(min-width: 480px)"
-          />
           <img
             src="{{- "img/digit-100.svg" | relURL -}}"
             alt="Digital Gov Logo"
diff --git a/themes/digital.gov/src/js/guide-menu-bar.js b/themes/digital.gov/src/js/guide-menu-bar.js
index 9ae0a2e5bd..3fe13e43e4 100644
--- a/themes/digital.gov/src/js/guide-menu-bar.js
+++ b/themes/digital.gov/src/js/guide-menu-bar.js
@@ -7,6 +7,7 @@ let menuBarLinks = null;
 let menuBarImage = null;
 let menuBarContainer = null;
 
+const guideSideNav = document.querySelector(".dg-guide__nav");
 const menuBar = document.querySelector(".dg-guide__menu-bar");
 if (menuBar) {
   menuBarLinks = menuBar.querySelector(".dg-guide__menu-bar-links");
@@ -21,6 +22,23 @@ function scrollMenuBar(offset) {
   menuBarLinks.scrollLeft = currentItem.offsetLeft - offset;
 }
 
+// Slightly adjust the padding on the menu bar links to keep in alignment with content and HCD guides
+function applyGuideResponsivePadding() {
+  if (guideSideNav) {
+    menuBarLinks.style.paddingLeft = `calc(50vw - 38.75rem)`;
+  } else {
+    menuBarLinks.style.paddingLeft = `calc(50vw - 35rem)`;
+  }
+}
+
+// Slightly adjust the padding on the menu bar links to keep in alignment with content and regular guides
+function applyResponsivePadding() {
+  if (window.matchMedia("(max-width: 87.5rem)").matches) {
+    menuBarLinks.style.paddingLeft = `calc(50vw - 36rem)`;
+  } else {
+    menuBarLinks.style.paddingLeft = `calc(50vw - 35rem)`;
+  }
+}
 // Handler for intersection events between the menu bar and the window
 function intersection(e) {
   // Check if menu bar intersected the top of the page
@@ -30,10 +48,10 @@ function intersection(e) {
       "grid-container",
       "grid-container-desktop"
     );
-    menuBarLinks.style.paddingLeft = "calc(50vw - 45.2rem)";
+    applyResponsivePadding();
+    applyGuideResponsivePadding();
     menuBarImage.removeAttribute("hidden");
     menuBarImage.setAttribute("tabindex", "0");
-
     // Check if viewing on mobile device
     if (window.innerWidth < deviceBreakpoint) {
       scrollMenuBar(menuBarScrollOffsetMobile);
@@ -57,6 +75,9 @@ const observer = new IntersectionObserver(([e]) => intersection(e), {
   threshold: [1],
 });
 
+// Listen for window resize
+window.addEventListener("resize", applyResponsivePadding);
+
 // Scroll the menu bar to the correct location on page load
 document.addEventListener("DOMContentLoaded", () => {
   if (menuBar) {
diff --git a/themes/digital.gov/src/scss/new/guides/_guide-content.scss b/themes/digital.gov/src/scss/new/guides/_guide-content.scss
index 75c647c3cc..4bf4dd1711 100644
--- a/themes/digital.gov/src/scss/new/guides/_guide-content.scss
+++ b/themes/digital.gov/src/scss/new/guides/_guide-content.scss
@@ -2,6 +2,10 @@
 
 .dg-guide__container {
   display: flex;
+
+  .dg-guide__menu-bar-links {
+    // padding-left: calc(50vw - 36rem);
+  }
 }
 
 .dg-guide__content {
diff --git a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
index 95cff94c5c..a9e4118714 100644
--- a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
+++ b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
@@ -43,6 +43,10 @@
     overflow-x: scroll;
     overflow-y: hidden;
     scrollbar-width: none;
+
+    @media (max-width: 87.5rem) {
+      padding-left: calc(50vw - 36rem);
+    }
   }
 
   &-links::-webkit-scrollbar {
diff --git a/themes/digital.gov/src/scss/new/guides/_guide-nav.scss b/themes/digital.gov/src/scss/new/guides/_guide-nav.scss
index e314efcf6b..23c2effdae 100644
--- a/themes/digital.gov/src/scss/new/guides/_guide-nav.scss
+++ b/themes/digital.gov/src/scss/new/guides/_guide-nav.scss
@@ -3,7 +3,7 @@
 .dg-guide__nav-container {
   display: none;
   flex-shrink: 0;
-  margin: units(5) units(2) units(0) units(2);
+  margin-top: units(7);
   position: sticky;
   top: units(15);
   width: 10rem;
@@ -13,7 +13,7 @@
   }
 
   @include at-media("desktop") {
-    margin: units(5);
+    margin-top: units(7);
     width: 15rem;
   }
 
diff --git a/themes/digital.gov/src/scss/new/shortcodes/_note.scss b/themes/digital.gov/src/scss/new/shortcodes/_note.scss
index 791c10f0fd..b6b5c38aab 100644
--- a/themes/digital.gov/src/scss/new/shortcodes/_note.scss
+++ b/themes/digital.gov/src/scss/new/shortcodes/_note.scss
@@ -56,7 +56,7 @@
       margin-bottom: units(0.5);
     }
   }
-  
+
   // For notes within list items
   li .note {
     @include u-padding-y("05");

From f2e50291b939fefb4842773ed2acb86783ab80c8 Mon Sep 17 00:00:00 2001
From: Nick Lyons <nick.lyons@gsa.gov>
Date: Fri, 7 Feb 2025 16:41:29 -0500
Subject: [PATCH 06/24] Refactored menubar links padding to be dynamic

---
 themes/digital.gov/src/js/guide-menu-bar.js   | 53 +++++++++++++------
 .../src/scss/new/guides/_guide-menu-bar.scss  |  2 +-
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/themes/digital.gov/src/js/guide-menu-bar.js b/themes/digital.gov/src/js/guide-menu-bar.js
index 3fe13e43e4..7163445467 100644
--- a/themes/digital.gov/src/js/guide-menu-bar.js
+++ b/themes/digital.gov/src/js/guide-menu-bar.js
@@ -6,13 +6,18 @@ const menuBarScrollOffsetDefault = 600;
 let menuBarLinks = null;
 let menuBarImage = null;
 let menuBarContainer = null;
+let guideContent = null;
+let guideContainer = null;
 
 const guideSideNav = document.querySelector(".dg-guide__nav");
 const menuBar = document.querySelector(".dg-guide__menu-bar");
+
 if (menuBar) {
   menuBarLinks = menuBar.querySelector(".dg-guide__menu-bar-links");
   menuBarImage = menuBar.querySelector(".dg-guide__menu-bar-image-container");
   menuBarContainer = menuBar.querySelector(".dg-guide__menu-bar-container");
+  guideContent = document.querySelector(".dg-guide__content");
+  guideContainer = document.querySelector(".dg-guide__container");
 }
 
 // Scroll the guide menu bar so that the currently selected item is in view
@@ -22,23 +27,37 @@ function scrollMenuBar(offset) {
   menuBarLinks.scrollLeft = currentItem.offsetLeft - offset;
 }
 
-// Slightly adjust the padding on the menu bar links to keep in alignment with content and HCD guides
-function applyGuideResponsivePadding() {
+/**
+ * Dynamically adjust the padding on the menu bar links to keep
+ * in alignment with dg-guide__content and HCD guides dg-guide__container
+ * */
+function adjustMenuPadding() {
+  let container = null;
   if (guideSideNav) {
-    menuBarLinks.style.paddingLeft = `calc(50vw - 38.75rem)`;
+    container = guideContainer;
   } else {
-    menuBarLinks.style.paddingLeft = `calc(50vw - 35rem)`;
+    container = guideContent;
   }
-}
 
-// Slightly adjust the padding on the menu bar links to keep in alignment with content and regular guides
-function applyResponsivePadding() {
-  if (window.matchMedia("(max-width: 87.5rem)").matches) {
-    menuBarLinks.style.paddingLeft = `calc(50vw - 36rem)`;
-  } else {
-    menuBarLinks.style.paddingLeft = `calc(50vw - 35rem)`;
-  }
+  const containerStyles = window.getComputedStyle(container);
+  const containerMarginLeft = parseFloat(containerStyles.marginLeft);
+  const containerPaddingLeft = parseFloat(containerStyles.paddingLeft);
+
+  // Get the width of the sibling element
+  const menuBarImageStyles = window.getComputedStyle(menuBarImage);
+  const menuBarMarginLeft = parseFloat(menuBarImageStyles.marginLeft);
+  const menuBarMarginRight = parseFloat(menuBarImageStyles.marginRight);
+
+  const menuBarImageOffsetWidth = menuBarImage.offsetWidth;
+  const menuBarImageWidth =
+    menuBarMarginLeft + menuBarMarginRight + menuBarImageOffsetWidth;
+  const containerMargin = containerMarginLeft + containerPaddingLeft;
+
+  // Calculate the new padding-left for the menu
+  const newPaddingLeft = containerMargin - menuBarImageWidth;
+  menuBarLinks.style.paddingLeft = `${newPaddingLeft}px`;
 }
+
 // Handler for intersection events between the menu bar and the window
 function intersection(e) {
   // Check if menu bar intersected the top of the page
@@ -48,8 +67,8 @@ function intersection(e) {
       "grid-container",
       "grid-container-desktop"
     );
-    applyResponsivePadding();
-    applyGuideResponsivePadding();
+
+    adjustMenuPadding();
     menuBarImage.removeAttribute("hidden");
     menuBarImage.setAttribute("tabindex", "0");
     // Check if viewing on mobile device
@@ -75,9 +94,6 @@ const observer = new IntersectionObserver(([e]) => intersection(e), {
   threshold: [1],
 });
 
-// Listen for window resize
-window.addEventListener("resize", applyResponsivePadding);
-
 // Scroll the menu bar to the correct location on page load
 document.addEventListener("DOMContentLoaded", () => {
   if (menuBar) {
@@ -85,3 +101,6 @@ document.addEventListener("DOMContentLoaded", () => {
   }
   scrollMenuBar(false);
 });
+
+// Adjust padding when the window resizes
+window.addEventListener("resize", adjustMenuPadding);
\ No newline at end of file
diff --git a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
index a9e4118714..5f94d6befb 100644
--- a/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
+++ b/themes/digital.gov/src/scss/new/guides/_guide-menu-bar.scss
@@ -45,7 +45,7 @@
     scrollbar-width: none;
 
     @media (max-width: 87.5rem) {
-      padding-left: calc(50vw - 36rem);
+      // padding-left: calc(50vw - 36rem);
     }
   }
 

From d3ee1b639f5b102da65f616d97c7624613b1f467 Mon Sep 17 00:00:00 2001
From: Nick Lyons <nick.lyons@gsa.gov>
Date: Fri, 7 Feb 2025 17:07:47 -0500
Subject: [PATCH 07/24] Fixed broken tweet

---
 ...from-our-livestream-host-and-full-recording-now-available.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md b/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md
index 27820a5c33..e07c3388cf 100644
--- a/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md
+++ b/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md
@@ -62,8 +62,6 @@ Federal agencies were also invited to showcase their programs, tools and innovat
 
 {{< tweet user="jakegab" id="601206392905674752" >}}
 
-{{< tweet user="lauraandotis" id="601432623186051072" >}}
-
 {{< tweet user="FedRAMP" id="601370769533308928" >}}
 
 The Summit's hashtag, [&#35;DigitalGov15](https://twitter.com/hashtag/DigitalGov15?src=hash), became a top trend across the United States on Twitter. Thank you to everyone who came in person to attend, tuned in online via livestream, tweeted throughout the event, put us in the top US trends, and helped to make &#35;DigitalGov15 such a success!

From 771f563d4ee0a15b08a6bebf7665ba6cfba04e0e Mon Sep 17 00:00:00 2001
From: Nick Lyons <nick.lyons@gsa.gov>
Date: Mon, 10 Feb 2025 09:44:45 -0500
Subject: [PATCH 08/24] Updated resize event logic

---
 themes/digital.gov/src/js/guide-menu-bar.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/themes/digital.gov/src/js/guide-menu-bar.js b/themes/digital.gov/src/js/guide-menu-bar.js
index 7163445467..c573c6704b 100644
--- a/themes/digital.gov/src/js/guide-menu-bar.js
+++ b/themes/digital.gov/src/js/guide-menu-bar.js
@@ -32,6 +32,7 @@ function scrollMenuBar(offset) {
  * in alignment with dg-guide__content and HCD guides dg-guide__container
  * */
 function adjustMenuPadding() {
+  console.log("calling resize");
   let container = null;
   if (guideSideNav) {
     container = guideContainer;
@@ -67,8 +68,8 @@ function intersection(e) {
       "grid-container",
       "grid-container-desktop"
     );
-
-    adjustMenuPadding();
+    
+    window.addEventListener("resize", adjustMenuPadding);
     menuBarImage.removeAttribute("hidden");
     menuBarImage.setAttribute("tabindex", "0");
     // Check if viewing on mobile device
@@ -83,6 +84,7 @@ function intersection(e) {
     menuBarImage.setAttribute("tabindex", "-1");
     menuBarLinks.style.paddingLeft = 0;
     menuBar.classList.remove("sticky");
+    window.removeEventListener("resize", adjustMenuPadding);
     menuBarContainer.classList.add("grid-container", "grid-container-desktop");
     scrollMenuBar(menuBarScrollOffsetDefault);
   }
@@ -103,4 +105,3 @@ document.addEventListener("DOMContentLoaded", () => {
 });
 
 // Adjust padding when the window resizes
-window.addEventListener("resize", adjustMenuPadding);
\ No newline at end of file

From a0cfd998fc727759e610998785dc90e8cd9597a6 Mon Sep 17 00:00:00 2001
From: Nick Lyons <nick.lyons@gsa.gov>
Date: Mon, 10 Feb 2025 10:35:02 -0500
Subject: [PATCH 09/24] Cleaned up code

---
 themes/digital.gov/src/js/guide-menu-bar.js | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/themes/digital.gov/src/js/guide-menu-bar.js b/themes/digital.gov/src/js/guide-menu-bar.js
index c573c6704b..b0a8719b5d 100644
--- a/themes/digital.gov/src/js/guide-menu-bar.js
+++ b/themes/digital.gov/src/js/guide-menu-bar.js
@@ -1,7 +1,4 @@
 // Uses manual breakpoints because USWDS breakpoints are not accessible within JS
-const deviceBreakpoint = 480;
-const menuBarScrollOffsetMobile = 600;
-const menuBarScrollOffsetFull = 600;
 const menuBarScrollOffsetDefault = 600;
 let menuBarLinks = null;
 let menuBarImage = null;
@@ -32,7 +29,6 @@ function scrollMenuBar(offset) {
  * in alignment with dg-guide__content and HCD guides dg-guide__container
  * */
 function adjustMenuPadding() {
-  console.log("calling resize");
   let container = null;
   if (guideSideNav) {
     container = guideContainer;
@@ -68,16 +64,12 @@ function intersection(e) {
       "grid-container",
       "grid-container-desktop"
     );
-    
-    window.addEventListener("resize", adjustMenuPadding);
+
     menuBarImage.removeAttribute("hidden");
     menuBarImage.setAttribute("tabindex", "0");
-    // Check if viewing on mobile device
-    if (window.innerWidth < deviceBreakpoint) {
-      scrollMenuBar(menuBarScrollOffsetMobile);
-    } else {
-      scrollMenuBar(menuBarScrollOffsetFull);
-    }
+    // call function to reset the menubar when menuBarImage is displayed
+    adjustMenuPadding();
+    window.addEventListener("resize", adjustMenuPadding);
     // Menu bar is no longer intersecting
   } else {
     menuBarImage.setAttribute("hidden", "");

From 60660af037e6f2bd17fef753366b1ed5bec9de4e Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 09:19:14 -0500
Subject: [PATCH 10/24] Fix remaining topic page layouts

---
 content/topics/research/_index.md | 36 ++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/content/topics/research/_index.md b/content/topics/research/_index.md
index 3f9a9925ad..467f82c072 100644
--- a/content/topics/research/_index.md
+++ b/content/topics/research/_index.md
@@ -6,9 +6,10 @@ slug: "research"
 
 # Topic Title
 title: "Research"
+deck: "Use thoughtful exploration and learning to support continuous, strategic decision-making"
 
 # description — keep it short and clear
-summary: ""
+summary: "Research is an important tool to help you understand real user needs, behaviors, and experiences. By using tools like surveys, analytics, and interviews, you can make informed decisions on products, programs, and projects."
 
 aliases:
   - /topics/18f-methods/
@@ -23,6 +24,39 @@ aliases:
 # Weight
 weight: 2
 
+# Set the legislation card title and link
+legislation:
+  title: "Executive Order 14058 and OMB Circular A-11, Section 280"
+  link: "https://digital.gov/resources/requirements-for-transforming-federal-customer-experience-and-service-delivery/"
+
+# Featured resource to display at the top of the page
+featured_resources:
+  resources:
+  - link: "guides/hcd/"
+
+# Featured community to display at the top of the page
+featured_communities:
+  - "user-experience"
+  - "web-analytics"
+
+# Curated list of content, can be internal or external links
+featured_links:
+  title: "Research: Essential knowledge"
+  resources:
+  - title: "Unsolicited data: A valuable resource for digital customer experience enhancement"
+    summary: "Learn how user-initiated feedback can help you shape your customer experience approach."
+    href: "https://digital.gov/2024/06/25/unsolicited-data-a-valuable-resource-for-digital-customer-experience-enhancement/"
+  - title: "18F User Experience Guide: Research"
+    summary: "Find information about conducting ethical, inclusive, and unbiased research with people from start to finish."
+    href: "https://guides.18f.gov/ux-guide/research/"
+  - title: "A guide to the Paperwork Reduction Act"
+    summary: "Explore common questions related to the Paperwork Reduction Act, a law governing how federal agencies collect information from the public."
+    href: "https://pra.digital.gov "
+  - title: "Uncovering impactful solutions through user research"
+    summary: "Understand the needs and behaviors of your users so you can develop a product or service that supports them."
+    href: "https://digital.gov/2024/10/04/uncovering-impactful-solutions-through-user-research/ "
+
 # For more information on managing topics,
 # see https://github.com/GSA/digitalgov.gov/wiki
+
 ---
\ No newline at end of file

From 84e41f32899caa78c21b636c3335c17013258f37 Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 09:26:13 -0500
Subject: [PATCH 11/24] Remove space in PRA href

---
 content/topics/research/_index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/topics/research/_index.md b/content/topics/research/_index.md
index 467f82c072..5bf61dcc08 100644
--- a/content/topics/research/_index.md
+++ b/content/topics/research/_index.md
@@ -51,7 +51,7 @@ featured_links:
     href: "https://guides.18f.gov/ux-guide/research/"
   - title: "A guide to the Paperwork Reduction Act"
     summary: "Explore common questions related to the Paperwork Reduction Act, a law governing how federal agencies collect information from the public."
-    href: "https://pra.digital.gov "
+    href: "https://pra.digital.gov"
   - title: "Uncovering impactful solutions through user research"
     summary: "Understand the needs and behaviors of your users so you can develop a product or service that supports them."
     href: "https://digital.gov/2024/10/04/uncovering-impactful-solutions-through-user-research/ "
@@ -59,4 +59,4 @@ featured_links:
 # For more information on managing topics,
 # see https://github.com/GSA/digitalgov.gov/wiki
 
----
\ No newline at end of file
+---

From 56db5ecf90a9d4bbe02affae184b13544795d06f Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 09:34:23 -0500
Subject: [PATCH 12/24] Update APIs topic

---
 .../_index.md                                 | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/content/topics/application-programming-interface/_index.md b/content/topics/application-programming-interface/_index.md
index 412f1cdad4..346b0e3b33 100644
--- a/content/topics/application-programming-interface/_index.md
+++ b/content/topics/application-programming-interface/_index.md
@@ -6,9 +6,10 @@ slug: "application-programming-interface"
 
 # Topic Title
 title: "Application programming interface"
+deck: "Use application programming interfaces (APIs) to support interoperability and openness"
 
 # description — keep it short and clear
-summary: ""
+summary: "Application programming interfaces, or APIs, have the potential to enhance innovation. When used creatively and securely, APIs can improve the efficiency of many workflows that are important to delivering excellent digital experiences."
 
 aliases:
   - /topics/api/
@@ -18,6 +19,30 @@ aliases:
 # Weight
 weight: 2
 
+# Set the legislation card title and link
+legislation:
+  title: "21st Century Integrated Digital Experience Act and OMB M-23-22"
+  link: "https://digital.gov/resources/delivering-digital-first-public-experience/"
+
+# Featured resource at the top of the page
+featured_resources:
+  resources:
+  - title: "API.Data.gov"
+    summary: "A free API management service for federal agencies."
+    link: "https://api.data.gov"
+
+# Featured community to display at the top of the page
+featured_communities:
+  - "web-managers-forum"
+
+# Curated list of content, can be internal or external links
+featured_links:
+  title: "Customer experience: Essential knowledge"
+  resources:
+  - title: "Data.gov"
+    summary: "Explore the home of the U.S. government’s open data, including a catalog of federal APIs."
+    href: "https://data.gov/"
+
 # For more information on managing topics,
 # see https://github.com/GSA/digitalgov.gov/wiki
 ---

From 1aa8ec8e8f5384ea4aa9a71f5f4ca23875486562 Mon Sep 17 00:00:00 2001
From: Nick Lyons <104778659+nick-mon1@users.noreply.github.com>
Date: Tue, 11 Feb 2025 09:43:40 -0500
Subject: [PATCH 13/24] Removed broken tweets

---
 ...from-our-livestream-host-and-full-recording-now-available.md | 2 --
 ...osts-first-ever-technology-industry-day-in-washington-d-c.md | 2 --
 .../06/2020-06-30-bringing-our-humanity-work-5-ingredients.md   | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md b/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md
index 27820a5c33..e07c3388cf 100644
--- a/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md
+++ b/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md
@@ -62,8 +62,6 @@ Federal agencies were also invited to showcase their programs, tools and innovat
 
 {{< tweet user="jakegab" id="601206392905674752" >}}
 
-{{< tweet user="lauraandotis" id="601432623186051072" >}}
-
 {{< tweet user="FedRAMP" id="601370769533308928" >}}
 
 The Summit's hashtag, [&#35;DigitalGov15](https://twitter.com/hashtag/DigitalGov15?src=hash), became a top trend across the United States on Twitter. Thank you to everyone who came in person to attend, tuned in online via livestream, tweeted throughout the event, put us in the top US trends, and helped to make &#35;DigitalGov15 such a success!
diff --git a/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md b/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md
index 6209f8c411..654f6ec698 100644
--- a/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md
+++ b/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md
@@ -24,8 +24,6 @@ On September 8, 2016 Administrator Denise Turner Roth of the [U.S. General Servi
 
 "The General Services Administration has a long history of being a strong leader in adopting technology in government," said Administrator Roth when giving her opening remarks at GSA's Technology Industry Day.
 
-{{< tweet user="18F" id="773873292746723328" >}}
-
 In a moderated panel, the leadership team shared their insights about the future of GSA’s role in making it easier for agencies to create and buy technology. The panel included GSA Administrator Denise Turner Roth, Acting [Technology Transformation Service](http://www.gsa.gov/portal/category/25729) (TTS) Commissioner David Shive, Chief Technology Officer Navin Vembar, Assistant Commissioner of [Integrated Technology Services](http://www.gsa.gov/portal/content/105150) Mary Davie and Executive Director of [18F](http://www.gsa.gov/portal/content/124182) Aaron Snow.
 
 {{< tweet user="USGSA" id="773881444896739328" >}}
diff --git a/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md b/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md
index 7dc906f67a..03f4990588 100644
--- a/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md
+++ b/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md
@@ -98,7 +98,7 @@ This month, we’re focusing on large group meetings: divisional Town Halls or o
 
 <p>We also encourage gratitude and reflection. Kudos are another staple of our meetings: we set aside a timeblock for teammates to thank each other, in their own words. The moderator can gather names ahead of time and call on each person to unmute. They can also read off kudos for anyone who can’t attend or would prefer not to unmute.</p>
 
-{{< tweet user="18F" id="1180123465963188224" >}}</li>
+</li>
 </ol>
 
 We hope you’ll stir together our five ingredients and create the dish that best serves your audience. Stay tuned for the next piece, focused on small team meetings.

From d35235f90ef6dc06aa0f6dac5d997ed33fd1d19b Mon Sep 17 00:00:00 2001
From: Nick Lyons <104778659+nick-mon1@users.noreply.github.com>
Date: Tue, 11 Feb 2025 09:46:04 -0500
Subject: [PATCH 14/24] Remove broken tweets

---
 ...rom-our-livestream-host-and-full-recording-now-available.md | 2 --
 ...sts-first-ever-technology-industry-day-in-washington-d-c.md | 2 --
 .../06/2020-06-30-bringing-our-humanity-work-5-ingredients.md  | 3 +--
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md b/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md
index 27820a5c33..e07c3388cf 100644
--- a/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md
+++ b/content/news/2015/06/2015-06-12-digitalgov-citizen-services-summit-reflections-from-our-livestream-host-and-full-recording-now-available.md
@@ -62,8 +62,6 @@ Federal agencies were also invited to showcase their programs, tools and innovat
 
 {{< tweet user="jakegab" id="601206392905674752" >}}
 
-{{< tweet user="lauraandotis" id="601432623186051072" >}}
-
 {{< tweet user="FedRAMP" id="601370769533308928" >}}
 
 The Summit's hashtag, [&#35;DigitalGov15](https://twitter.com/hashtag/DigitalGov15?src=hash), became a top trend across the United States on Twitter. Thank you to everyone who came in person to attend, tuned in online via livestream, tweeted throughout the event, put us in the top US trends, and helped to make &#35;DigitalGov15 such a success!
diff --git a/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md b/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md
index 6209f8c411..654f6ec698 100644
--- a/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md
+++ b/content/news/2016/09/2016-09-26-gsa-hosts-first-ever-technology-industry-day-in-washington-d-c.md
@@ -24,8 +24,6 @@ On September 8, 2016 Administrator Denise Turner Roth of the [U.S. General Servi
 
 "The General Services Administration has a long history of being a strong leader in adopting technology in government," said Administrator Roth when giving her opening remarks at GSA's Technology Industry Day.
 
-{{< tweet user="18F" id="773873292746723328" >}}
-
 In a moderated panel, the leadership team shared their insights about the future of GSA’s role in making it easier for agencies to create and buy technology. The panel included GSA Administrator Denise Turner Roth, Acting [Technology Transformation Service](http://www.gsa.gov/portal/category/25729) (TTS) Commissioner David Shive, Chief Technology Officer Navin Vembar, Assistant Commissioner of [Integrated Technology Services](http://www.gsa.gov/portal/content/105150) Mary Davie and Executive Director of [18F](http://www.gsa.gov/portal/content/124182) Aaron Snow.
 
 {{< tweet user="USGSA" id="773881444896739328" >}}
diff --git a/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md b/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md
index 7dc906f67a..c53d14c6d9 100644
--- a/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md
+++ b/content/news/2020/06/2020-06-30-bringing-our-humanity-work-5-ingredients.md
@@ -97,8 +97,7 @@ This month, we’re focusing on large group meetings: divisional Town Halls or o
 <p>A staple of TTS large group meetings is sharing “pets, children, and other cuteness.” Staff turn on their video cameras (if they weren’t already on) and show off their pets, children, or something else they enjoy. Photos can be shown to the camera, too. The icing on the cake: if you wait until the end of the meeting to reveal these, people will stay until the end!</p>
 
 <p>We also encourage gratitude and reflection. Kudos are another staple of our meetings: we set aside a timeblock for teammates to thank each other, in their own words. The moderator can gather names ahead of time and call on each person to unmute. They can also read off kudos for anyone who can’t attend or would prefer not to unmute.</p>
-
-{{< tweet user="18F" id="1180123465963188224" >}}</li>
+</li>
 </ol>
 
 We hope you’ll stir together our five ingredients and create the dish that best serves your audience. Stay tuned for the next piece, focused on small team meetings.

From e8765b878bb9ef898f1e13eccc268d2058956259 Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 09:56:06 -0500
Subject: [PATCH 15/24] Fix COP slug and update RPA layout

---
 content/topics/research/_index.md             |  2 +-
 .../robotic-process-automation/_index.md      | 23 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/content/topics/research/_index.md b/content/topics/research/_index.md
index 5bf61dcc08..7b68153c1b 100644
--- a/content/topics/research/_index.md
+++ b/content/topics/research/_index.md
@@ -37,7 +37,7 @@ featured_resources:
 # Featured community to display at the top of the page
 featured_communities:
   - "user-experience"
-  - "web-analytics"
+  - "web-analytics-and-optimization"
 
 # Curated list of content, can be internal or external links
 featured_links:
diff --git a/content/topics/robotic-process-automation/_index.md b/content/topics/robotic-process-automation/_index.md
index bf720e0c50..0b0b6c4175 100644
--- a/content/topics/robotic-process-automation/_index.md
+++ b/content/topics/robotic-process-automation/_index.md
@@ -6,15 +6,36 @@ slug: "robotic-process-automation"
 
 # Topic Title
 title: "Robotic process automation"
+deck: "Leverage more efficient, modernized technology in government"
 
 # description — keep it short and clear
-summary: ""
+summary: "Robotics process automation (RPA) technologies can automate repetitive, rules-based tasks. They can be used to rapidly design, test, and deploy automations and reduce low-value work in an organization."
 
 aliases:
   - /topics/rpa/
 
 # Weight
 weight: 2
+
+# Featured resource to display at the top of the page
+featured_resources:
+  resources:
+  - link: "guides/rpa/"
+
+# Featured community to display at the top of the page
+featured_communities:
+  - "web-content-managers"
+  - "rpa"
+
+# Curated list of content, can be internal or external links
+featured_links:
+  title: "Robotics process automation: Essential knowledge"
+  resources:
+  - title: "5 tips for implementing citizen development in your RPA program"
+    summary: "Explore best practices for federal robotic process automation programs looking to operationalize citizen developers."
+    href: "https://digital.gov/2021/08/16/5-tips-for-implementing-citizen-development-in-your-rpa-program/"
+
+
 # For more information on managing topics,
 # see https://github.com/GSA/digitalgov.gov/wiki
 ---

From fb8b3d4e48f40d0a26937213dadfdad4ed4d9c09 Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 10:04:21 -0500
Subject: [PATCH 16/24] Fix RPA copy

---
 content/topics/robotic-process-automation/_index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/topics/robotic-process-automation/_index.md b/content/topics/robotic-process-automation/_index.md
index 0b0b6c4175..20406d3866 100644
--- a/content/topics/robotic-process-automation/_index.md
+++ b/content/topics/robotic-process-automation/_index.md
@@ -9,7 +9,7 @@ title: "Robotic process automation"
 deck: "Leverage more efficient, modernized technology in government"
 
 # description — keep it short and clear
-summary: "Robotics process automation (RPA) technologies can automate repetitive, rules-based tasks. They can be used to rapidly design, test, and deploy automations and reduce low-value work in an organization."
+summary: "Robotic process automation (RPA) technologies can automate repetitive, rules-based tasks. They can be used to rapidly design, test, and deploy automations and reduce low-value work in an organization."
 
 aliases:
   - /topics/rpa/
@@ -29,7 +29,7 @@ featured_communities:
 
 # Curated list of content, can be internal or external links
 featured_links:
-  title: "Robotics process automation: Essential knowledge"
+  title: "Robotic process automation: Essential knowledge"
   resources:
   - title: "5 tips for implementing citizen development in your RPA program"
     summary: "Explore best practices for federal robotic process automation programs looking to operationalize citizen developers."

From 56e63298c72ab80fe215b5ab9a4b258fbbba96bf Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 10:05:47 -0500
Subject: [PATCH 17/24] Fix RPA CoPs

---
 content/topics/robotic-process-automation/_index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/topics/robotic-process-automation/_index.md b/content/topics/robotic-process-automation/_index.md
index 20406d3866..801c61e31e 100644
--- a/content/topics/robotic-process-automation/_index.md
+++ b/content/topics/robotic-process-automation/_index.md
@@ -24,8 +24,8 @@ featured_resources:
 
 # Featured community to display at the top of the page
 featured_communities:
-  - "web-content-managers"
-  - "rpa"
+  - "web-managers-forum"
+  - "rpa-community"
 
 # Curated list of content, can be internal or external links
 featured_links:

From aad81f6c1a21ce3ab4302372f66bd3f9913ca990 Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 10:14:08 -0500
Subject: [PATCH 18/24] Update product and project management

---
 .../product-and-project-management/_index.md  | 41 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/content/topics/product-and-project-management/_index.md b/content/topics/product-and-project-management/_index.md
index 2b7d8f0742..06475d3d89 100644
--- a/content/topics/product-and-project-management/_index.md
+++ b/content/topics/product-and-project-management/_index.md
@@ -6,9 +6,10 @@ slug: "product-and-project-management"
 
 # Topic Title
 title: "Product and project management"
+deck: "Strong product and project management steer federal agencies to successful service delivery."
 
 # description — keep it short and clear
-summary: ""
+summary: "Effective product and project management practices are cornerstones of success for federal agencies. They streamline resource allocation, mitigate risk, and ensure impactful delivery of essential digital services."
 
 aliases:
   - /topics/cio/
@@ -26,6 +27,44 @@ aliases:
 
 # Weight
 weight: 2
+
+# Set the legislation card title and link
+legislation:
+  title: "Program Management Improvement Accountability Act and OMB M-18-19"
+  link: "https://digital.gov/resources/requirements-for-improving-the-management-of-federal-programs-and-projects/"
+
+# Featured resource at the top of the page
+featured_resources:
+  resources:
+  - title: "Project Manager’s Guidebook"
+    summary: "Find practical concepts, best practices, and useful tools and templates for effective project management."
+    link: "https://www.fai.gov/content/fai-project-manager%E2%80%99s-guidebook"
+
+# Featured community to display at the top of the page
+featured_communities:
+  - "web-managers-forum"
+  - "federal-program-and-project-management-fedpm"
+
+# Curated list of content, can be internal or external links
+featured_links:
+  title: "Product and project management: Essential knowledge"
+  resources:
+  - title: "Federal Acquisition Certification for program and project managers"
+    summary: "Explore training for acquisition program and project management professionals."
+    href: "https://www.fai.gov/certification/fac-ppm"
+  - title: "Interpretive Guidance for Project Manager Positions (PDF, 653 KB, 26 pages)"
+    summary: "Find guidance for attracting, hiring, and retaining project managers."
+    href: "https://www.opm.gov/policy-data-oversight/classification-qualifications/reference-materials/interpretive-guidance-for-project-manager-positions.pdf"
+  - title: "Who is your website manager?"
+    summary: "Establish accountability in federal website management."
+    href: "https://digital.gov/2023/03/24/who-is-your-website-manager/"
+  - title: "The 18F Guide to Agile"
+    summary: "Understand the 18F approach to the fundamentals of Agile."
+    href: "https://guides.18f.gov/agile/"
+  - title: "Performance.gov"
+    summary: "Access current and past progress for improving federal government performance and accountability to the American public."
+    href: "https://www.performance.gov/"
+
 # For more information on managing topics,
 # see https://github.com/GSA/digitalgov.gov/wiki
 ---
\ No newline at end of file

From 761f2e89c04811f9b55e43e955b0b62f4e936cf2 Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 10:29:09 -0500
Subject: [PATCH 19/24] Update open source

---
 content/topics/open-source/_index.md | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/content/topics/open-source/_index.md b/content/topics/open-source/_index.md
index fa7a5610b7..4310e0d5ea 100644
--- a/content/topics/open-source/_index.md
+++ b/content/topics/open-source/_index.md
@@ -6,13 +6,31 @@ slug: "open-source"
 
 # Topic Title
 title: "Open source"
+deck: "Making software, source code, and the development process available to the public"
 
 # description — keep it short and clear
-summary: ""
+summary: "Open source development prioritizes using Open Source Software to make source code available for public use. Open Source Software encourages federal government teams to share technical knowledge and encourages a collaborative approach to the review and reuse of source code."
 
 aliases:
   - /2017/06/13/fractal-and-federalist-join-the-u-s-web-design-standards/
 
+# Set the legislation card title and link
+legislation:
+  title: "https://www.congress.gov/bill/118th-congress/house-bill/9566"
+  link: "Source Code Harmonization And Reuse in Information Technology Act"
+
+# Featured community to display at the top of the page
+featured_communities:
+  - "web-managers-forum"
+  - "web-analytics-and-optimization"
+
+# Curated list of content, can be internal or external links
+featured_links:
+  title: "Open source: Essential knowledge"
+  resources:
+  - title: "18F Open Source Policy"
+    summary: "Published open source policy guidelines from the 18F service delivery team."
+    href: "https://18f.gsa.gov/open-source-policy/"
 
 # Weight
 weight: 2

From 3db270a928c62e5a63d0fc018806ae8f8b8d3721 Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 10:38:05 -0500
Subject: [PATCH 20/24] Create intellectual property topic page

---
 .../topics/intellectual-property/_index.md    | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 content/topics/intellectual-property/_index.md

diff --git a/content/topics/intellectual-property/_index.md b/content/topics/intellectual-property/_index.md
new file mode 100644
index 0000000000..2ffa10db37
--- /dev/null
+++ b/content/topics/intellectual-property/_index.md
@@ -0,0 +1,40 @@
+---
+# This topic lives at
+# https://digital.gov/topics/intellectual-property
+
+slug: "intellectual-property"
+
+# Topic Title
+title: "Intellectual property"
+deck: "Understand the components of patent, trademark, and copyright in delivering digital services"
+
+summary: "Intellectual property describes creations of the mind—creative works or shareable ideas. Intellectual property is protected through patents, trademarks, copyrights, and trade secrets."
+
+# Weight
+weight: 2
+
+# Set the legislation card title and link
+legislation:
+  title: "U.S. Patent and Trademark Office: Intellection property policy"
+  link: "https://www.uspto.gov/ip-policy"
+
+# Featured community to display at the top of the page
+featured_communities:
+  - "communicators"
+  - "web-managers-forum"
+
+# Curated list of content, can be internal or external links
+featured_links:
+  title: "Intellectual property: Essential knowledge"
+  resources:
+  - title: "U.S. Patent and Trademark Office"
+    summary: "Explore resources from the federal agency that grants U.S. patents and registers trademarks."
+    href: "https://www.uspto.gov/"
+  - title: "U.S. Copyright Office"
+    summary: "Learn from the official source for copyright information, registration and records."
+    href: "https://www.copyright.gov/"
+  - title: "STOPfakes.gov"
+    summary: "A one-stop shop for U.S. government tools and resources on intellectual property rights."
+    href: "https://www.stopfakes.gov/welcome"
+
+---

From 0d8883422b05fac11877bc0c80645c321c42834b Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 10:47:06 -0500
Subject: [PATCH 21/24] Add intellectual property topic page to Resources
 landing page

---
 content/resources/_index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content/resources/_index.md b/content/resources/_index.md
index d795c85e55..8dc56665d0 100644
--- a/content/resources/_index.md
+++ b/content/resources/_index.md
@@ -59,6 +59,7 @@ resource_topics:
     - acquisition
     - budgeting-and-performance
     - contact-centers
+    - intellectual-property
     - product-and-project-management
     - privacy
     - records-management

From 98fe8701ae695ec5d2e6d29fcd36dc60ef41afa4 Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 10:57:04 -0500
Subject: [PATCH 22/24] Add FedPM kicker

---
 .../federal-program-and-project-management-fedpm.md            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/content/communities/federal-program-and-project-management-fedpm.md b/content/communities/federal-program-and-project-management-fedpm.md
index 6aa955b38e..ad901ecad5 100644
--- a/content/communities/federal-program-and-project-management-fedpm.md
+++ b/content/communities/federal-program-and-project-management-fedpm.md
@@ -3,6 +3,8 @@ date: 2023-11-16 12:16:00 -0500
 title: Federal Program and Project Management (FedPM)
 summary: The Federal Program and Project Management (FedPM) Community of Practice is the central source for the sharing of program and project management expertise across the entire federal government.
 
+kicker: "Join the Federal Program and Project Management Community"
+
 redirectto: https://community.max.gov/pages/viewpage.action?pageId=713787996
 
 # Controls how this page appears across the site
@@ -12,4 +14,5 @@ weight: 1
 
 slug: federal-program-and-project-management-fedpm
 
+
 ---

From 72d3bfc5f9bd9890c72267a9d9639151404dcdfa Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Tue, 11 Feb 2025 10:58:03 -0500
Subject: [PATCH 23/24] Add RPA Community kicker

---
 content/communities/rpa-community.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/content/communities/rpa-community.md b/content/communities/rpa-community.md
index 3d5c85ed65..a4d2b506e3 100644
--- a/content/communities/rpa-community.md
+++ b/content/communities/rpa-community.md
@@ -7,6 +7,8 @@ date: 2019-12-12 19:00:00 -0500
 title: "Robotic Process Automation (RPA)"
 summary: "A collaborative body designed to rapidly accelerate the adoption of Robotic Process Automation (RPA) technology across the federal government."
 
+kicker: "Join the RPA Community"
+
 # see all topics at https://digital.gov/topics
 topics:
   - emerging-tech

From 23bf13cfb877baebadc8d7d3aaf1805f9a31ca11 Mon Sep 17 00:00:00 2001
From: Makayla Hipke <makayla.hipke@gsa.gov>
Date: Wed, 12 Feb 2025 08:52:28 -0500
Subject: [PATCH 24/24] Fix Open Source policy name

---
 content/topics/open-source/_index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/topics/open-source/_index.md b/content/topics/open-source/_index.md
index 4310e0d5ea..74ed155a4e 100644
--- a/content/topics/open-source/_index.md
+++ b/content/topics/open-source/_index.md
@@ -16,8 +16,8 @@ aliases:
 
 # Set the legislation card title and link
 legislation:
-  title: "https://www.congress.gov/bill/118th-congress/house-bill/9566"
-  link: "Source Code Harmonization And Reuse in Information Technology Act"
+  title: "Source Code Harmonization And Reuse in Information Technology Act"
+  link: "https://www.congress.gov/bill/118th-congress/house-bill/9566"
 
 # Featured community to display at the top of the page
 featured_communities: