Merge b5e00a5 into main

carbon-design-system · Jul 19, 2024 · b60dcd8 · b60dcd8
2 parents ff7aa9e + b5e00a5
commit b60dcd8
Show file tree

Hide file tree

Showing 4 changed files with 112 additions and 8 deletions.
diff --git a/packages/web-components/.storybook/manager-head.html b/packages/web-components/.storybook/manager-head.html
@@ -29,15 +29,66 @@
 </script>
 
 <footer>
-  <c4d-footer-container disable-locale-button="true" size="micro" />
+  <dds-footer-container
+    key="footer"
+    disable-locale-button="true"
+    size="micro" />,
 </footer>
 
 <script
+  key="8"
   type="module"
-  src="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/latest/footer.min.js"></script>
+  src="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/footer.min.js" />
+
+<!-- Tealium/GA Set up -->
+<script type="text/javascript">
+  window._ibmAnalytics = {
+    settings: {
+      name: 'CarbonDotcomWebComponentsStorybook',
+      isSpa: true,
+      tealiumProfileName: 'ibm-web-app',
+    },
+    onLoad: [['ibmStats.pageview', []]],
+  };
+  digitalData = {
+    page: {
+      pageInfo: {
+        ibm: {
+          siteId: 'IBM_' + _ibmAnalytics.settings.name,
+        },
+      },
+      category: {
+        primaryCategory: 'PC100',
+      },
+    },
+  };
+</script>
+<script
+  src="//1.www.s81c.com/common/stats/ibm-common.js"
+  type="text/javascript"
+  async="async"></script>
 
 <!-- Minimum setting to use IBM Plex font -->
 <style type="text/css">
+  /* This style is required because of the compliance footer */
+  #root > div {
+    height: calc(100vh - 48px);
+  }
+
+  /* This style is required because of the compliance footer in smaller screens */
+  @media (max-width: 671px) {
+    nav[class^='css-'] {
+      height: 281px;
+    }
+  }
+
+  footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 99999;
+  }
+
   @font-face {
     font-weight: 400;
     font-family: 'IBM Plex Sans';

diff --git a/packages/web-components/.storybook/preview-head.html b/packages/web-components/.storybook/preview-head.html
@@ -497,9 +497,6 @@
   }
 </script>
 
-<!-- IBM Tag Management and Site Analytics -->
-<script src="//1.www.s81c.com/common/stats/ibm-common.js" defer></script>
-
 <style>
   @media only percy {
     [data-autoid='cds--privacy-cp'] {

diff --git a/packages/web-components/.storybook/react/manager-head.html b/packages/web-components/.storybook/react/manager-head.html
@@ -19,8 +19,67 @@
   document.title = 'Carbon for IBM.com Web Components with React';
 </script>
 
+<footer>
+  <dds-footer-container
+    key="footer"
+    disable-locale-button="true"
+    size="micro" />,
+</footer>
+
+<script
+  key="8"
+  type="module"
+  src="https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/footer.min.js" />
+
+<!-- Tealium/GA Set up -->
+<script type="text/javascript">
+  window._ibmAnalytics = {
+    settings: {
+      name: 'CarbonDotcomWebComponentsStorybook',
+      isSpa: true,
+      tealiumProfileName: 'ibm-web-app',
+    },
+    onLoad: [['ibmStats.pageview', []]],
+  };
+  digitalData = {
+    page: {
+      pageInfo: {
+        ibm: {
+          siteId: 'IBM_' + _ibmAnalytics.settings.name,
+        },
+      },
+      category: {
+        primaryCategory: 'PC100',
+      },
+    },
+  };
+</script>
+<script
+  src="//1.www.s81c.com/common/stats/ibm-common.js"
+  type="text/javascript"
+  async="async"></script>
+
 <!-- Minimum setting to use IBM Plex font -->
 <style type="text/css">
+  /* This style is required because of the compliance footer */
+  #root > div {
+    height: calc(100vh - 48px);
+  }
+
+  /* This style is required because of the compliance footer in smaller screens */
+  @media (max-width: 671px) {
+    nav[class^='css-'] {
+      height: 281px;
+    }
+  }
+
+  footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    z-index: 99999;
+  }
+
   @font-face {
     font-weight: 400;
     font-family: 'IBM Plex Sans';

diff --git a/packages/web-components/.storybook/react/preview-head.html b/packages/web-components/.storybook/react/preview-head.html
@@ -497,9 +497,6 @@
   }
 </script>
 
-<!-- IBM Tag Management and Site Analytics -->
-<script src="//1.www.s81c.com/common/stats/ibm-common.js" defer></script>
-
 <style>
   @media only percy {
     [data-autoid='cds--privacy-cp'] {