Skip to content

Commit

Permalink
Sync main branch with stage (adobecom#30)
Browse files Browse the repository at this point in the history
* WPS-21878 MWPW-127801 Changing git scrips and css lib folder name to creativecloud

* MWPW-127801 Changing eslint folders to creativecloud

* Update codeql.yml

* Update run-tests.yaml

* move icons to /creativecloud/img/icons

* fix preview issue for promotions page

* Update article-promotion.js

* fix preview issue for promotions page

* Update article-promotion.js

* Update article-promotion.js

* Update article-promotion.js

* Adding more CC locales

* Update scripts.js

* Update article-promotion.js

* Update scripts.js

* Update codeql.yml

* Update run-tests.yaml

* Update scripts.js

* Update scripts.js

* Update scripts.js

* Update scripts.js

* Return if promotion block exists withour data-attribute

* Update scripts.js

* Update scripts.js

* Update contentRoot (adobecom#33)

* Re-adding content root

---------

Co-authored-by: mathuria <mathuria@adobe.com>
Co-authored-by: Solène Duprat <solene.duprat@gmail.com>
Co-authored-by: Ruchika Sinha <tek10248@Ruchikas-MacBook-Pro.local>
  • Loading branch information
4 people authored Apr 24, 2023
1 parent 1875ebf commit ec4cf97
Show file tree
Hide file tree
Showing 27 changed files with 398 additions and 83 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ "main" ]
branches: [ "stage", "main" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main" ]
branches: [ "stage", "main" ]
schedule:
# Scheduled to run at 06:18 every Friday
- cron: '18 6 * * 5'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ name: Unit Tests and Linting
on:
push:
branches:
- stage
- main
pull_request:
types: [opened, synchronize, reopened, edited]
branches:
- stage
- main
jobs:
run-tests:
Expand Down
2 changes: 1 addition & 1 deletion 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>404</title>
<meta name="template" content="404" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<script src="cc/scripts/scripts.js" type="module"></script>
<script src="/creativecloud/scripts/scripts.js" type="module"></script>
<link rel="icon" href="data:," />
</head>

Expand Down
75 changes: 0 additions & 75 deletions cc/scripts/scripts.js

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export default async function init(el, promotionPath = '/creativecloud/promotions/hub') {
const promotionName = el.getAttribute('data-promotion');
if (!promotionName) return;
const response = await window.fetch(`${promotionPath}/${promotionName}.plain.html`);
if (!response.ok) return;
const promotionContent = await response.text();
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
27 changes: 27 additions & 0 deletions creativecloud/img/icons/3d-assets.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 25 additions & 0 deletions creativecloud/img/icons/designer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions creativecloud/img/icons/modeler.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 44 additions & 0 deletions creativecloud/img/icons/painter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 44 additions & 0 deletions creativecloud/img/icons/sampler.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ec4cf97

Please sign in to comment.