Merge pull request #185 from adobecom/stage

Stage to Main
adobecom · Mar 21, 2024 · e9ee879 · e9ee879
2 parents 11e80f0 + 6516f3f
commit e9ee879
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 132 deletions.
diff --git a/.kodiak/config.yaml b/.kodiak/config.yaml
@@ -0,0 +1,30 @@
+version: 1.0
+
+snow:
+  - id: 546046 # Milo Bacom (business.adobe.com)
+
+notifications:
+  jira:
+    default:
+      project: MWPW # Mandatory
+      filters:
+        include:
+          risk_rating: R5
+      fields:
+        assignee:
+          name: slavin
+        customfield_11800: MWPW-140779 #epic link
+        customfield_12900:  
+          value: 127741 # Magma team
+        watchers:
+          - casalino
+          - jmichnow
+          - mauchley
+          - bmarshal
+          - methomas
+        labels:
+          - "OriginatingProcess=Kodiak"
+          - "security"
+          - "kodiak-ticket"
+        components:
+          - name: "DevOps Security"
diff --git a/blocks/stats/stats.js b/blocks/stats/stats.js
@@ -1,19 +1,3 @@
-/*
- * Copyright 2022 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-/*
-* Stats for Customer Stories
-*/
-
 import { getLibs } from '../../scripts/utils.js';
 
 async function decorateRow(row, module) {

diff --git a/helix-query.yaml b/helix-query.yaml
@@ -336,22 +336,6 @@ indices:
     target: /co/query-index.xlsx
     properties:
       <<: *minProps
-  sitemap-cy_en:
-    include:
-      - '/cy_en/'
-      - '/cy_en/customer-success-stories/**'
-      - '/cy_en/resources/**'
-      - '/cy_en/why-adobe/**'
-      - '/cy_en/support/**'
-      - '/cy_en/solutions/**'
-      - '/cy_en/customers/**'
-      - '/cy_en/products/**'
-      - '/cy_en/request-consultation/**'
-    exclude:
-      - '**/fragments/**'
-    target: /cy_en/query-index.xlsx
-    properties:
-      <<: *minProps
   sitemap-cz:
     include:
       - '/cz/'
@@ -816,22 +800,6 @@ indices:
     target: /mena_en/query-index.xlsx
     properties:
       <<: *minProps
-  sitemap-mt:
-    include:
-      - '/mt/'
-      - '/mt/customer-success-stories/**'
-      - '/mt/resources/**'
-      - '/mt/why-adobe/**'
-      - '/mt/support/**'
-      - '/mt/solutions/**'
-      - '/mt/customers/**'
-      - '/mt/products/**'
-      - '/mt/request-consultation/**'
-    exclude:
-      - '**/fragments/**'
-    target: /mt/query-index.xlsx
-    properties:
-      <<: *minProps
   sitemap-mx:
     include:
       - '/mx/'
@@ -1398,11 +1366,6 @@ indices:
     include:
       - '/co/customer-success-stories/**'
     target: /co/customer-success-stories/query-index.xlsx
-  customer-success-stories-cy_en:
-    <<: *default
-    include:
-      - '/cy_en/customer-success-stories/**'
-    target: /cy_en/customer-success-stories/query-index.xlsx
   customer-success-stories-cz:
     <<: *default
     include:
@@ -1548,11 +1511,6 @@ indices:
     include:
       - '/mena_en/customer-success-stories/**'
     target: /mena_en/customer-success-stories/query-index.xlsx
-  customer-success-stories-mt:
-    <<: *default
-    include:
-      - '/mt/customer-success-stories/**'
-    target: /mt/customer-success-stories/query-index.xlsx
   customer-success-stories-mx:
     <<: *default
     include:

diff --git a/helix-sitemap.yaml b/helix-sitemap.yaml
@@ -111,11 +111,6 @@ sitemaps:
         alternate: /co/{path}.html
         destination: /co/sitemap.xml
         hreflang: es-CO
-      cy_en:
-        source: /cy_en/query-index.json
-        alternate: /cy_en/{path}.html
-        destination: /cy_en/sitemap.xml
-        hreflang: en-CY
       cz:
         source: /cz/query-index.json
         alternate: /cz/{path}.html
@@ -271,11 +266,6 @@ sitemaps:
         destination: /mena_en/sitemap.xml
         hreflang:
           - en-DZ
-      mt:
-        source: /mt/query-index.json
-        alternate: /mt/{path}.html
-        destination: /mt/sitemap.xml
-        hreflang: en-MT
       mx:
         source: /mx/query-index.json
         alternate: /mx/{path}.html

diff --git a/scripts/scripts.js b/scripts/scripts.js
@@ -1,15 +1,3 @@
-/*
- * Copyright 2022 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
 import { setLibs } from './utils.js';
 
 const LIBS = '/libs';
@@ -168,12 +156,6 @@ const loadStyle = (path) => {
   eagerLoad(marquee.querySelector('img'));
 }());
 
-/*
- * ------------------------------------------------------------
- * Edit below at your own risk
- * ------------------------------------------------------------
- */
-
 const miloLibs = setLibs(LIBS);
 
 (function loadStyles() {

diff --git a/scripts/utils.js b/scripts/utils.js
@@ -1,24 +1,3 @@
-/*
- * Copyright 2022 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
-/*
- * ------------------------------------------------------------
- * Edit below at your own risk
- * ------------------------------------------------------------
- */
-
-/**
- * The decision engine for where to get Milo's libs from.
- */
 export const [setLibs, getLibs] = (() => {
   let libs;
   return [

diff --git a/styles/styles.css b/styles/styles.css
@@ -1,15 +1,3 @@
-/*
- * Copyright 2022 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
 .white-columns .columns > .row {
   padding: 80px 0;
 }
@@ -77,7 +65,11 @@ main > .section[class*='-up'] > .content {
 main .section[class*='grid-width-'] {
   padding-left: unset;
   padding-right: unset;
-  display: block;
+  gap: 0;
+}
+
+main .section[class*='grid-width-'] .columns.contained {
+  margin: 0;
 }
 
 main .section.two-up,

diff --git a/tools/sidekick/config.js b/tools/sidekick/config.js
@@ -1,15 +1,3 @@
-/*
- * Copyright 2022 Adobe. All rights reserved.
- * This file is licensed to you under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License. You may obtain a copy
- * of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
- * OF ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-
 function hasSchema(host) {
   if (window.location.hostname === host) {
     const schema = document.querySelector('script[type="application/ld+json"]');