Fix tracking

.eslintignore

@@ -1,4 +1,7 @@
 helix-importer-ui
-tools/sitemap
-solutions/plugins/experimentation
-solutions/vendor
+_src/scripts/lib-franklin-api.js
+_src/scripts/vendor
+_src/scripts/zuora.js
+_src/vendor
+_src/plugins
+tools

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+# @global-owner1 and @global-owner2 will be requested for
+# review when someone opens a pull request.
+*       @enake

.github/pull_request_template.md

@@ -3,5 +3,5 @@ Please always provide the [GitHub issue(s)](../issues) your PR is for, as well a
 Fix #<gh-issue-id>
 
 Test URLs:
-- Before: https://main--bitdefender--hlxsites.hlx.page/solutions/
-- After: https://<branch>--bitdefender--hlxsites.hlx.page/solutions/
+- Before: https://main--www-websites--bitdefender.hlx.page/zh-hk/
+- After: https://<branch>--www-websites--bitdefender.hlx.page/zh-hk/

.github/workflows/run-tests.yaml

@@ -16,20 +16,20 @@ jobs:
     - name: Use node.js
       uses: actions/setup-node@v3
       with:
-        node-version: '16' #required for npm 8 or later.
+        node-version: '20' #required for npm 8 or later.
     - run: npm install
     - run: npm run lint
       env:
         CI: true
-  ghost_inspector_tests:
-    needs: linting
-    runs-on: ubuntu-latest
-    steps:
-      - name: execute Ghost Inspector test
-        uses: docker://ghostinspector/cli
-        with:
-          args: suite execute ${{ secrets.GI_SUITE }} \
-            --apiKey ${{ secrets.GI_API_KEY }} \
-            --branchName ${{ env.BRANCH_NAME }} \
-            --errorOnFail \
-            --errorOnScreenshotFail
+  # ghost_inspector_tests:
+  #   needs: linting
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: execute Ghost Inspector test
+  #       uses: docker://ghostinspector/cli
+  #       with:
+  #         args: suite execute ${{ secrets.GI_SUITE }} \
+  #           --apiKey ${{ secrets.GI_API_KEY }} \
+  #           --branchName ${{ env.BRANCH_NAME }} \
+  #           --errorOnFail \
+  #           --errorOnScreenshotFail

404.html

@@ -9,12 +9,15 @@
   </script>
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta property="og:title" content="Page not found">
-  <script src="/solutions/scripts/scripts.js" type="module" crossorigin="use-credentials"></script>
+  <script src="/_src/scripts/scripts.js" type="module" crossorigin="use-credentials"></script>
   <script type="module">
-    import { decorateButtons, sampleRUM } from '/solutions/scripts/lib-franklin.js';
-
+    import { decorateButtons, sampleRUM } from '/_src/scripts/lib-franklin.js';
+    import { getDomain } from '/_src/scripts/scripts.js';
+
+    const domain = getDomain();
+
     window.addEventListener('load', async () => {
-      const response = await fetch('/solutions/404.plain.html');
+      const response = await fetch(`/${domain}/consumer/404.plain.html`);
       if (response.ok) {
         const htmlContent = await response.text();
         const specialSection = document.querySelector('.link-section');
@@ -23,8 +26,8 @@
       }
       sampleRUM('404', { source: document.referrer, target: window.location.href });
     });
-  </script>  
-  <link rel="stylesheet" href="/solutions/styles/styles.css">
+  </script>
+  <link rel="stylesheet" href="/_src/styles/styles.css">
   <style>
 
     :root {
@@ -67,7 +70,7 @@
       font-weight: var(--font-weight-bold);
     }
 
-   
+
 /* Default styles (mobile-first) */
 
 main .link-section {
@@ -91,10 +94,10 @@
 
 .link-section > div:last-child {
   margin-top: 1rem;
-  column-count: 1; 
+  column-count: 1;
   width: 100%;
   display: flex;
-  flex-direction: column; 
+  flex-direction: column;
   align-items: center;
 }
 
@@ -126,13 +129,13 @@
 
   .link-section > div:last-child {
     column-count: 2;
-    display: block; 
+    display: block;
     align-items: initial;
   }
 }
 
   </style>
-  <link rel="stylesheet" href="/solutions/styles/lazy-styles.css">
+  <link rel="stylesheet" href="/_src/styles/lazy-styles.css">
 </head>
 
 <body>
@@ -146,7 +149,7 @@ <h2 class="error-message">Page Not Found</h2>
       <p>The page you are looking for might have been removed, had its name changed, or is temporarily unavailable.</p>
     </div>
     <div class="link-section">
-    </div>  
+    </div>
   </main>
   <footer></footer>
 </body>

solutions/blocks/accordion/accordion.css → _src/blocks/accordion/accordion.css

@@ -2,13 +2,23 @@
   padding: 0 var(--body-padding);
 }
 
+.accordion-container > .default-content-wrapper:last-of-type p.info-button-container a {
+  display: flex;
+  text-align: center;
+  margin-top: 2em;
+}
+
+.accordion-container > .default-content-wrapper:last-of-type p.info-button-container a::before {
+  margin-right: 5px;
+}
+
 .accordion {
   cursor: pointer;
 }
 
 .accordion .accordion-item {
   margin: 16px 0;
-  padding: 18px 54px;
+  padding: 1em 2em;
   border-radius: 10px;
   border-color: rgb(229 231 235);
   border-width: 0;
@@ -82,6 +92,7 @@
 
 .accordion-item-content ul {
   padding-left: 20px;
+  margin-top: 5px;
 }
 
 .accordion-item-content li {
@@ -92,9 +103,15 @@
 }
 
 .accordion-item-content p {
-  font-size: 16px;
+  color: #3c3c3c;
+  font-size: var(--body-font-size-m);
   word-break: break-word;
   max-width: 1110px;
+  margin-top: 5px;
+}
+
+.accordion-item-content p strong {
+  color: #3c3c3c;
 }
 
 .accordion-item.expanded .accordion-item-content {
@@ -108,9 +125,12 @@
 }
 
 @media (min-width: 992px) { /* desktop */
-
   .accordion .accordion-item-header h3 {
-    font-size: var(--heading-font-size-s);
+    font-size: var(--body-font-size-xl);
+  }
+
+  .accordion.smaller-text .accordion-item-content p {
+    font-size: var(--body-font-size-s)!important;
   }
 
   .accordion.terms-of-use .accordion-item-header h3 {
@@ -129,7 +149,6 @@
     max-width: var(--section-large-desktop-max-width);
     padding: 0 var(--section-large-desktop-padding);
   }
-
 }
 
 .accordion.faq .accordion-item,
@@ -162,3 +181,21 @@
   margin-bottom: 0;
 }
 
+@media (max-width: 500px) {
+  .accordion .accordion-item {
+    padding: 1em;
+  }
+}
+
+@media (max-width: 768px) {
+  .accordion-item-content p {
+    font-size: var(--body-font-size-s);
+  }
+}
+
+@media (max-width: 992px) {
+  .accordion-container .default-content-wrapper {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+}

solutions/blocks/awards-search/awards-search.css → _src/blocks/awards-search/awards-search.css

@@ -102,8 +102,8 @@ main .section .awards-search .awards-results-container .award-item-container h2
     width: 1.5rem;
     height: 1.3125rem;
     /* stylelint-disable-next-line property-no-vendor-prefix */
-    -webkit-mask: url('/solutions/icons/arrow-right.svg');
-    mask: url('/solutions/icons/arrow-right.svg');
+    -webkit-mask: url('/_src/icons/arrow-right.svg');
+    mask: url('/_src/icons/arrow-right.svg');
     background-color: var(--read-more-text-color);
     display: inline-block;
     opacity: 1;