Skip to content
This repository has been archived by the owner on Dec 11, 2024. It is now read-only.

AEMFDEV-113 Bullet Spacing #101

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
ed15459
Update README.md
fkakatie Oct 24, 2022
7348ae8
Update robots.txt
fkakatie Oct 24, 2022
dfce287
Update helix-sitemap.yaml
fkakatie Oct 24, 2022
3bab360
Update fstab.yaml
fkakatie Oct 24, 2022
2aec52b
fix: branding colors, fonts
fkakatie Oct 24, 2022
864b91c
Merge remote-tracking branch 'upstream/main'
fkakatie Oct 25, 2022
868edc0
Merge remote-tracking branch 'upstream/main'
fkakatie Oct 25, 2022
048433b
feat: add banner icon
fkakatie Oct 27, 2022
1579bb1
feat: build leaderboard full variant
fkakatie Oct 27, 2022
fe444bb
fix: footer spacing
fkakatie Oct 27, 2022
b6ad97c
fix: teaser branding
fkakatie Oct 27, 2022
419a53c
fix: branding colors
fkakatie Oct 28, 2022
82bbb4f
fix: use placeholders, fetch fr content on fr sites
fkakatie Oct 28, 2022
34daf0f
Merge remote-tracking branch 'upstream/main'
fkakatie Oct 28, 2022
5e797ef
feat: president-specific header
fkakatie Oct 28, 2022
beb7332
feat: president-specific header
fkakatie Oct 28, 2022
38604e6
chore: lint
fkakatie Oct 28, 2022
475ecb4
feat: header leaderboard
fkakatie Oct 28, 2022
e0efea4
fix: update field for pres cup
fkakatie Nov 1, 2022
39ef490
chore: lint
fkakatie Nov 1, 2022
02f1c46
chore: lint
fkakatie Nov 1, 2022
ee49aaf
feat: int variant for international
fkakatie Nov 1, 2022
05c01f7
feat: build standings block
fkakatie Nov 1, 2022
8711b70
fix: branding colors
fkakatie Nov 1, 2022
5cc8848
fix: bug fix
fkakatie Nov 1, 2022
a5b3842
fix: update for variants
fkakatie Nov 1, 2022
d79709d
fix: flag fix
fkakatie Nov 1, 2022
2a5c6ab
fix: bug fix
fkakatie Nov 1, 2022
4181a7c
feat: records block
fkakatie Nov 1, 2022
9732283
fix: intl variant
fkakatie Nov 1, 2022
81c071e
fix: update for pres cup
fkakatie Nov 1, 2022
d34c9a7
Merge remote-tracking branch 'upstream/main'
fkakatie Nov 2, 2022
bc657a6
Merge remote-tracking branch 'upstream/main'
fkakatie Nov 2, 2022
a50e869
Merge remote-tracking branch 'upstream/main'
fkakatie Nov 3, 2022
dabc868
fix: branding colors
fkakatie Nov 3, 2022
5929e90
fix: use placeholders for strings
fkakatie Nov 3, 2022
c80d350
fix: use placeholders for strings
fkakatie Nov 3, 2022
8f6bb82
Merge remote-tracking branch 'upstream/main'
fkakatie Nov 4, 2022
610b4a4
fix: update favicon for presidents cup
shsteimer Nov 7, 2022
68741aa
Merge pull request #1 from hlxsites/favicon
Nov 7, 2022
7663e27
chore: update pr template site links
shsteimer Nov 7, 2022
5d524bf
Merge remote-tracking branch 'upstream/main' into merge-upstream
shsteimer Nov 9, 2022
ec03add
Merge remote-tracking branch 'upstream/main'
shsteimer Nov 10, 2022
5c7479c
chore: merge
fkakatie Nov 14, 2022
926c566
chore: merge
fkakatie Nov 14, 2022
15a3e08
fix: small images bug fix
fkakatie Nov 15, 2022
beee0d0
fix: styles for internal vs external data
fkakatie Nov 15, 2022
f66d48b
Merge branch 'hlxsites:main' into main
Nov 16, 2022
3492959
temp: turn off weather
fkakatie Nov 22, 2022
82798a7
Merge branch 'hlxsites:main' into main
Nov 22, 2022
6bd5c4f
fix: proud partners size
fkakatie Nov 22, 2022
bae9869
fix: lint
fkakatie Nov 22, 2022
28760b0
chore: merge
fkakatie Nov 22, 2022
c70bb73
temp: turn off weather
fkakatie Nov 22, 2022
9175052
Merge branch 'hlxsites:main' into main
Nov 22, 2022
ca1a1b9
revert: replace custom global partners with standard
fkakatie Nov 22, 2022
8f698d9
Merge pull request #2 from hlxsites/revert-partners
fkakatie Nov 23, 2022
24ff725
feat: add language to index so it can be used to filter
shsteimer Dec 12, 2022
123f597
Merge pull request #4 from hlxsites/index-lang
Dec 12, 2022
e7182fc
feat: add lang filter to news
shsteimer Dec 12, 2022
00868d9
Merge branch 'hlxsites:main' into main
Dec 13, 2022
a6b7e5d
chore: merge
fkakatie Jan 6, 2023
1380ea0
Merge remote-tracking branch 'upstream/main'
fkakatie Jan 18, 2023
bfac1f6
chore: merge
fkakatie Feb 7, 2023
1e8e158
Merge remote-tracking branch 'upstream/main'
fkakatie Feb 9, 2023
579fbe9
Merge branch 'hlxsites:main' into main
Feb 13, 2023
a519b51
Merge branch 'hlxsites:main' into main
Feb 14, 2023
f98d234
Merge remote-tracking branch 'upstream/main'
shsteimer Mar 13, 2023
0ff306c
Merge remote-tracking branch 'upstream/main' into merge
shsteimer Apr 19, 2023
22a562d
chore: sk conf
shsteimer Apr 19, 2023
29bec87
Merge pull request #5 from hlxsites/merge
Apr 19, 2023
7309a14
Merge remote-tracking branch 'upstream/main'
shsteimer Apr 20, 2023
0c9d88f
fix: filter to show only language news for locals
shsteimer May 2, 2023
a4541a9
Merge pull request #6 from hlxsites/fr-news
May 2, 2023
9ae7386
Merge branch 'hlxsites:main' into main
Mark-M-Ensemble Jun 5, 2023
d80ccd5
Updated Table Color
Mark-M-Ensemble Jun 5, 2023
ace70c0
Merge pull request #7 from hlxsites/AEMFDEV-62--Table-Color
Mark-M-Ensemble Jun 5, 2023
29f403c
Merge branch 'hlxsites:main' into main
Mark-M-Ensemble Jun 5, 2023
a1fb981
Merge branch 'hlxsites:main' into main
shsteimer Aug 7, 2023
58c0d1a
Merge branch 'hlxsites:main' into main
Mark-M-Ensemble Aug 17, 2023
763bfdd
- Removed added margins on lists
Mark-M-Ensemble Sep 8, 2023
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
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ Fix #<gh-issue-id>
Please update the [block inventory](https://adobe.sharepoint.com/:w:/r/sites/HelixProjects/_layouts/15/Doc.aspx?sourcedoc=%7B3DCA0821-E21F-4AFE-94E6-6EA820D45D96%7D&file=block-inventory.docx&action=default&mobileredirect=true) with any relevant block changes as a result of this PR.

Test URLs:
- Before: https://main--theplayers--hlxsites.hlx.page/
- After: https://<branch>--theplayers--hlxsites.hlx.page/
- Before: https://main--pga-presidents-cup--hlxsites.hlx.page/
- After: https://<branch>--pga-presidents-cup--hlxsites.hlx.page/
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Your Project's Title...
Your project's description...
# presidentscup.com Helix Site

## Environments
- Preview: https://main--theplayers--hlxsites.hlx.page/
- Live: https://main--theplayers--hlxsites.hlx.live/
- Preview: https://main--pga-presidents-cup--hlxsites.hlx.page/
- Live: https://main--pga-presidents-cup--hlxsites.hlx.live/
- Production: https://www.presidentscup.com

## Installation

Expand Down
12 changes: 6 additions & 6 deletions blocks/carousel/carousel.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
main .carousel-container {
--carousel-btn-primary-color: var(--color-tan-95);
--carousel-btn-secondary-color: var(--color-blue-95);
--carousel-btn-primary-color: var(--color-gold-95);
--carousel-btn-secondary-color: var(--color-black-95);
--carousel-btn-secondary-hover-color: var(--color-white);
--carousel-course-bg-color: var(--color-blue);
--carousel-course-bg-color-transparent: var(--color-blue-95);
--carousel-course-bg-color: var(--color-black);
--carousel-course-bg-color-transparent: var(--color-black-95);
--carousel-course-stats-outline-color: var(--color-white);
--carousel-course-stats-border-color: var(--color-blue);
--carousel-course-stats-border-color: var(--color-black);
--carousel-course-stats-title-color: var(--color-gray);
--carousel-cource-btn-color: var(--color-blue);
--carousel-cource-btn-color: var(--color-black);
--carousel-cource-btn-selected-color: var(--color-white);

padding: 0;
Expand Down
4 changes: 0 additions & 4 deletions blocks/carousel/carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ async function insertCourseFeedSlides(block) {
for (const hole of json.courses[0].holes) {
const damSrc = `${damPrefix}/${code}${perm}/${courseId}/holes/hole${hole.holeNum}.jpg`;
const holeJpg = `${cloudinaryPrefix},w_1290/v1/pgatour/courses/${code}${perm}/${courseId}/holes/hole${hole.holeNum}.jpg`;
const holePng = `${cloudinaryPrefix},w_150/holes_${config.year || new Date().getFullYear()}_${code}_${perm}_${courseId}_overhead_full_${hole.holeNum}.png`;
// eslint-disable-next-line no-await-in-loop
const metaresp = await fetchCors(`${damSrc}/jcr:content/metadata.json`);
// eslint-disable-next-line no-await-in-loop
Expand Down Expand Up @@ -103,9 +102,6 @@ async function insertCourseFeedSlides(block) {
<h3>PAR ${hole.par}, ${hole.yards} Yards</h3>
</div>
<p class="course-hole">
<picture>
<img src="${holePng}" alt="${metaTitle}" />
</picture>
</p>
<p>${metaDesc}</p>
</div>
Expand Down
5 changes: 2 additions & 3 deletions blocks/course/course.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
main .course-container {
--course-background-color: var(--color-blue);
--course-background-transparent-color: var(--color-blue-95);
--course-background-color: var(--color-black);
--course-background-transparent-color: var(--color-black-95);
--course-border-color: var(--color-white);
--course-buttons-background-color: var(--color-black-95);
--course-button-color: var(--color-gray);
--course-button-color-selected: var(--color-white);

Expand Down
18 changes: 9 additions & 9 deletions blocks/course/course.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ async function loadStats(block) {
holes.forEach((hole, i) => {
const stats = allStats[i];
const par = hole.querySelector('.course-hole-par');
if (par && stats.par) par.textContent = `Par ${stats.par},`;
if (par && stats.par) par.textContent = `${placeholders.par} ${stats.par},`;
const yards = hole.querySelector('.course-hole-yards');
if (yards && stats.yards) yards.textContent = `${stats.yards} Yards`;
if (yards && stats.yards) yards.textContent = `${stats.yards} ${placeholders.yards}`;
const title = hole.querySelector('.course-hole-stats h3');
if (title) title.textContent = `${json.year || ''} Statistics`.trim();
if (title) title.textContent = `${json.year || ''} ${placeholders.statistics}`.trim();
const avgEl = hole.querySelector('.course-hole-avg');
const avg = stats.stats.find((stat) => stat.id === '43108').eV2;
if (avgEl && avg) avgEl.innerHTML = `<span>${avg}</span> Scoring Avg`;
if (avgEl && avg) avgEl.innerHTML = `<span>${avg}</span> ${placeholders.scoringAvg}`;
const table = hole.querySelector('.course-hole-chart tbody');
if (table) {
const holeStats = stats.stats.filter((stat) => stat.id !== '43108');
Expand All @@ -48,11 +48,11 @@ async function loadStats(block) {
return parseInt(a, 10) + parseInt(b.eV2, 10);
});
const tableStats = [
{ stat: 'Eagle', value: findStatPercent('43106', holeStats, statsDivisor) },
{ stat: 'Birdie', value: findStatPercent('43107', holeStats, statsDivisor) },
{ stat: 'Par', value: findStatPercent('43523', holeStats, statsDivisor) },
{ stat: 'Bogey', value: findStatPercent('41184', holeStats, statsDivisor) },
{ stat: '2+ Bogey', value: findStatPercent('43520', holeStats, statsDivisor) },
{ stat: placeholders.eagle, value: findStatPercent('43106', holeStats, statsDivisor) },
{ stat: placeholders.birdie, value: findStatPercent('43107', holeStats, statsDivisor) },
{ stat: placeholders.par, value: findStatPercent('43523', holeStats, statsDivisor) },
{ stat: placeholders.bogey, value: findStatPercent('41184', holeStats, statsDivisor) },
{ stat: placeholders['bogey-2'], value: findStatPercent('43520', holeStats, statsDivisor) },
];
tableStats.forEach((s) => table.append(buildStatRow(s.stat, s.value)));
}
Expand Down
4 changes: 2 additions & 2 deletions blocks/field/field.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
main .field {
--field-text-color: var(--color-blue);
--field-highlight-color: var(--color-tan);
--field-text-color: var(--color-gray-dark);
--field-highlight-color: var(--color-gold);
}

main .field p {
Expand Down
2 changes: 1 addition & 1 deletion blocks/field/field.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default async function decorate(block) {
if (latestInitial !== lastInitial) card.setAttribute('data-last', lastInitial);
latestInitial = lastInitial;
card.id = player.TournamentPlayerId;
card.innerHTML = `<img src="https://pga-tour-res.cloudinary.com/image/upload/c_fill,dpr_2.0,f_auto,q_auto,r_max,g_face:center,d_headshots_default.png,h_190,w_190/headshots_${player.TournamentPlayerId}.png" alt="${player.PlayerFirstName} ${player.PlayerLastName}" />
card.innerHTML = `<img src="https://pga-tour-res.cloudinary.com/image/upload/c_fill,dpr_2.0,f_auto,q_auto,r_max,g_face:center,d_headshots_default.png,h_190,w_190/headshots_pcup_${year}_${player.TournamentPlayerId}.png" alt="${player.PlayerFirstName} ${player.PlayerLastName}" />
<p>${player.PlayerName}</p>`;
wrapper.append(card);
});
Expand Down
8 changes: 4 additions & 4 deletions blocks/footer/footer.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
footer {
--footer-color: var(--color-blue);
--footer-color: var(--color-gray-78);
--footer-text-color: var(--color-white);
--footer-ribbon-color: var(--color-white);
--footer-ribbon-text-color: var(--color-blue);
--footer-ribbon-text-color: var(--color-gray);
--footer-border-color: var(--color-gray-light);

font-size: var(--body-font-size-xs);
Expand Down Expand Up @@ -133,7 +133,7 @@ footer .footer .footer-links img {
width: auto;
max-width: 130px;
height: auto;
max-height: 60px;
max-height: 40px;
}

footer .footer .footer-links ul {
Expand All @@ -153,7 +153,7 @@ footer .footer .footer-links li {
@media (min-width: 900px) {
footer .footer .footer-links {
display: grid;
grid-template-columns: 60px 1fr 130px;
grid-template-columns: 65px 1fr 65px;
align-items: center;
gap: 0 10px;
font-size: var(--body-font-size-xs);
Expand Down
Loading
Loading