Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Release] Stage to Main #227

Merged
merged 10 commits into from
Jul 24, 2024
Merged

[Release] Stage to Main #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
76e7fe5
Update helix-sitemap.yaml
beekerr May 9, 2024
c6de0c3
Delete sitemap-index.xml
beekerr May 9, 2024
67c8a4a
Update helix-sitemap.yaml to correct IN language code
beekerr Jul 9, 2024
d15a5dc
Merge branch 'adobecom:stage' into stage
beekerr Jul 11, 2024
98c536a
MWPW-154250 Update India lang code
Brandon32 Jul 11, 2024
2d37374
Revert "MWPW-154562 Fix resource form margins (#224)"
Brandon32 Jul 22, 2024
1748377
Merge pull request #226 from adobecom/revert-224-bmarshal/marketo-margin
Brandon32 Jul 22, 2024
d938127
Merge pull request #223 from adobecom/bmarshal/in-lang
Brandon32 Jul 22, 2024
3415fdc
Merge pull request #222 from beekerr/stage
Brandon32 Jul 22, 2024
143d68e
Merge branch 'main' into stage
Brandon32 Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helix-sitemap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ sitemaps:
source: /in/query-index.json
alternate: /in/{path}.html
destination: /in/sitemap.xml
hreflang: en-GB
hreflang: en-IN
in_hi:
source: /in_hi/query-index.json
alternate: /in_hi/{path}.html
Expand Down
2 changes: 1 addition & 1 deletion scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const CONFIG = {
il_en: { ietf: 'en-IL', tk: 'hah7vzn.css' },
il_he: { ietf: 'he', tk: 'qxw8hzm.css', dir: 'rtl' },
in_hi: { ietf: 'hi', tk: 'qxw8hzm.css' },
in: { ietf: 'en-GB', tk: 'hah7vzn.css' },
in: { ietf: 'en-IN', tk: 'hah7vzn.css' },
it: { ietf: 'it-IT', tk: 'hah7vzn.css' },
jp: { ietf: 'ja-JP', tk: 'dvg6awq' },
kr: { ietf: 'ko-KR', tk: 'qjs5sfm' },
Expand Down
12 changes: 0 additions & 12 deletions styles/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@ main .section.five-up {
padding-right: var(--grid-margins-width);
}

main .resource-form.section.two-up .marketo {
margin-left: calc(var(--grid-margins-width) * -1);
margin-right: calc(var(--grid-margins-width) * -1);
}

@media screen and (min-width: 1200px) {
main .section.grid-width-10 {
padding-left: var(--grid-margins-width-10);
Expand All @@ -98,10 +93,3 @@ main .resource-form.section.two-up .marketo {
padding-right: var(--grid-margins-width-6);
}
}

@media screen and (min-width: 600px) {
main .resource-form.section.two-up .marketo {
margin-left: 0;
margin-right: 0;
}
}
Loading