Merge branch 'main' into DEVX-2980

saucelabs · Aug 2, 2024 · c382bcc · c382bcc
2 parents 3539db9 + 39598f7
commit c382bcc
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 94 deletions.
diff --git a/docusaurus.config.js b/docusaurus.config.js
@@ -8,9 +8,9 @@ const docusaurusConfig = {
     baseUrl: '/',
     onBrokenLinks: 'throw',
     onBrokenMarkdownLinks: 'throw',
-    favicon: 'favicon.ico',
     organizationName: 'saucelabs',
     projectName: 'sauce-docs',
+    // TODO: I don't think google-site-verification is working at all, confirm with P.O.
     customFields: {
         headTags: [
             {
@@ -22,6 +22,26 @@ const docusaurusConfig = {
             },
         ],
     },
+    headTags: [
+        {
+            tagName: 'link',
+            attributes: {
+                rel: 'icon',
+                type: 'image/png',
+                sizes: '16x16',
+                href: '/img/favicon-16x16.png',
+            },
+        },
+        {
+            tagName: 'link',
+            attributes: {
+                rel: 'icon',
+                type: 'image/png',
+                sizes: '32x32',
+                href: '/img/favicon-32x32.png',
+            },
+        },
+    ],
     scripts: [
         '/scripts/hide.js',
         // Need Help? button
@@ -39,11 +59,6 @@ const docusaurusConfig = {
         },
     ],
     themeConfig: {
-        beamer: {
-            product_id: `'WyhkZHOU27797'`,
-            display: `'popup'`,
-            // selector: `'.beamerContainer'`,
-        },
         prism: {
             additionalLanguages: [
                 'java',
@@ -100,12 +115,6 @@ const docusaurusConfig = {
                     position: 'left',
                     to: '/error-reporting/getting-started',
                 },
-                {
-                    type: 'html',
-                    position: 'right',
-                    className: 'beamerTrigger',
-                    value: '<img src="/img/beamer.svg" width="22" height="22" class="beamer-navbar-bell" alt="Product Updates">',
-                },
             ],
         },
         /* this is a swizzled component, see inside theme folder */
@@ -155,7 +164,6 @@ const docusaurusConfig = {
         ],
     ],
     themes: ['docusaurus-theme-github-codeblock'],
-    plugins: ['./src/plugins/beamer'],
 };
 
 if (!process.env.SAUCE_DOCS_DEV) {

diff --git a/sidebars.js b/sidebars.js
@@ -1695,7 +1695,7 @@ module.exports = {
                         'visual-testing/workflows/test-execution',
                         'visual-testing/workflows/review',
                         'visual-testing/workflows/ci',
-                        'visual-testing/workflows/api-lifecycle'
+                        'visual-testing/workflows/api-lifecycle',
                     ],
                 },
                 {

diff --git a/src/css/beamer.css b/src/css/beamer.css
diff --git a/src/css/custom.css b/src/css/custom.css
@@ -16,7 +16,6 @@
 @import "footer-styles.css";
 @import "fw-badge-override.css";
 @import "homesearchbar.css";
-@import "beamer.css";
 @import "./variables/colors.modules.css";
 @import "./variables/fonts.modules.css";
 

diff --git a/src/plugins/beamer/index.js b/src/plugins/beamer/index.js
diff --git a/static/404.html b/static/404.html
@@ -4,10 +4,15 @@
         <title>404 Error | Sauce Docs</title>
         <link rel="stylesheet" href="/css/404.css" />
         <link
-            data-react-helmet="true"
-            rel="shortcut icon"
-            href="/img/favicon.ico"
-        />
+            rel="icon"
+            type="image/png"
+            href="/img/favicon-32x32.png"
+            sizes="32x32" />
+        <link
+            rel="icon"
+            type="image/png"
+            href="/img/favicon-16x16.png"
+            sizes="16x16" />
     </head>
     <body>
         <div class="container">

diff --git a/static/favicon.ico b/static/favicon.ico