From e18e8b58dd233d05a776a18e66dd91ff9885ab98 Mon Sep 17 00:00:00 2001 From: Bryan Stopp Date: Mon, 30 Oct 2023 12:30:02 -0500 Subject: [PATCH 1/4] Fix icons which are SVGs. (#166) * Fix icons which are SVGs. * Fix lint. --- blocks/info-mouseover/info-mouseover.css | 23 +++++++++---------- blocks/library-metadata/library-metadata.css | 1 + blocks/library-metadata/library-metadata.js | 1 + .../liveby-demographics.css | 2 +- blocks/liveby-schools/liveby-schools.css | 10 +++++--- blocks/liveby-schools/liveby-schools.js | 21 ++++++++--------- 6 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 blocks/library-metadata/library-metadata.css create mode 100644 blocks/library-metadata/library-metadata.js diff --git a/blocks/info-mouseover/info-mouseover.css b/blocks/info-mouseover/info-mouseover.css index 7b224c1b..e2f23a35 100644 --- a/blocks/info-mouseover/info-mouseover.css +++ b/blocks/info-mouseover/info-mouseover.css @@ -4,17 +4,6 @@ margin-left: 4px; } - -.info-mouseover.block span.icon { - display: block; -} - -.info-mouseover.block span.icon svg { - display: block; - height: 13px; - width: 13px; -} - .info-mouseover.block .info-content-wrapper { display: block; position: absolute; @@ -93,6 +82,16 @@ width: 100%; } +.info-mouseover.block span.icon { + display: block; +} + +.info-mouseover.block span.icon img { + display: block; + height: 13px; + width: 13px; +} + @media screen and (min-width: 900px) { .info-mouseover.block .info-content-wrapper { left: -20px; @@ -105,4 +104,4 @@ .info-mouseover.block .info-content-wrapper::after { left: 18px; } -} \ No newline at end of file +} diff --git a/blocks/library-metadata/library-metadata.css b/blocks/library-metadata/library-metadata.css new file mode 100644 index 00000000..91a4abfc --- /dev/null +++ b/blocks/library-metadata/library-metadata.css @@ -0,0 +1 @@ +/* Empty file for handling PSI checks on Block Library pages. */ diff --git a/blocks/library-metadata/library-metadata.js b/blocks/library-metadata/library-metadata.js new file mode 100644 index 00000000..24b2385a --- /dev/null +++ b/blocks/library-metadata/library-metadata.js @@ -0,0 +1 @@ +// Empty file for handling PSI checks on Block Library pages. diff --git a/blocks/liveby-demographics/liveby-demographics.css b/blocks/liveby-demographics/liveby-demographics.css index ef8acf04..32719a89 100644 --- a/blocks/liveby-demographics/liveby-demographics.css +++ b/blocks/liveby-demographics/liveby-demographics.css @@ -55,7 +55,7 @@ font-size: var(--body-font-size-xxl); } -.liveby-demographics.block > div .census-item .icon-bubble span.icon svg { +.liveby-demographics.block > div .census-item .icon-bubble span.icon img { font-size: var(--body-font-size-xxl); color: var(--primary-color); height: 1em; diff --git a/blocks/liveby-schools/liveby-schools.css b/blocks/liveby-schools/liveby-schools.css index e4d9f6dc..f5bed92b 100644 --- a/blocks/liveby-schools/liveby-schools.css +++ b/blocks/liveby-schools/liveby-schools.css @@ -42,8 +42,13 @@ main .section.liveby-schools-container p { margin: 1em 0; } +.liveby-schools .actions p.button-container { + text-align: center; +} + .liveby-schools .actions p.button-container a { padding: .85em 1.15em; + margin: 0 auto; font-size: var(--body-font-size-m); color: var(--white); background-color: var(--primary-color); @@ -90,13 +95,12 @@ main .section.liveby-schools-container p { opacity: .625; } - .liveby-schools .school-lists section .school-item .school-details h3 { margin: 0; font-family: var(--font-family-georgia); font-weight: var(--font-weight-bold); font-size: var(--heading-font-size-xs); - line-height: var(--line-height-reg); + line-height: var(--line-height-m); border-bottom: none; } @@ -162,4 +166,4 @@ main .section.liveby-schools-container p { flex-basis: 33%; margin: 1em; } -} \ No newline at end of file +} diff --git a/blocks/liveby-schools/liveby-schools.js b/blocks/liveby-schools/liveby-schools.js index 51b60591..b994d59c 100644 --- a/blocks/liveby-schools/liveby-schools.js +++ b/blocks/liveby-schools/liveby-schools.js @@ -1,4 +1,3 @@ -import { decorateIcons } from '../../scripts/aem.js'; import { LIVEBY_API } from '../../scripts/scripts.js'; const ES_GRADES = ['PK', 'KG', '01', '02', '03', '04', '05', '06']; @@ -50,7 +49,8 @@ const sortMap = { rating: ratingSort, }; -function buildSchoolList(type, schools, sort = ratingSort) { +async function buildSchoolList(type, schools, sort = ratingSort) { + const star = await fetch('/icons/liveby_rating.svg').then((resp) => (resp.ok ? resp.text() : '')); const sorted = schools.sort(sort); const section = document.createElement('section'); @@ -86,6 +86,7 @@ function buildSchoolList(type, schools, sort = ratingSort) { if (s.rating >= i) { span.classList.add('filled'); } + span.innerHTML = star; rating.append(span); } } else { @@ -95,8 +96,6 @@ function buildSchoolList(type, schools, sort = ratingSort) { item.append(rating); section.append(item); }); - - decorateIcons(section); return section; } @@ -152,9 +151,9 @@ export default async function decorate(block) { sections.classList.add('school-lists'); sections.append( - buildSchoolList('Elementary', elementary), - buildSchoolList('Middle', middle), - buildSchoolList('High', high), + await buildSchoolList('Elementary', elementary), + await buildSchoolList('Middle', middle), + await buildSchoolList('High', high), ); block.append(sections); @@ -173,14 +172,14 @@ export default async function decorate(block) { }); block.append(more); - block.querySelector('.sort select').addEventListener('change', (e) => { + block.querySelector('.sort select').addEventListener('change', async (e) => { e.preventDefault(); e.stopPropagation(); const resort = sortMap[e.target.value || 'name']; sections.replaceChildren( - buildSchoolList('Elementary', elementary, resort), - buildSchoolList('Middle', middle, resort), - buildSchoolList('High', high, resort), + await buildSchoolList('Elementary', elementary, resort), + await buildSchoolList('Middle', middle, resort), + await buildSchoolList('High', high, resort), ); }); } From 42027337dd67c10ee776bfb494bae633248e4abb Mon Sep 17 00:00:00 2001 From: Bryan Stopp Date: Tue, 31 Oct 2023 09:06:27 -0500 Subject: [PATCH 2/4] Remove unnecssary config. (#167) --- blocks/juicer/juicer.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/blocks/juicer/juicer.js b/blocks/juicer/juicer.js index 79ec594d..6de0dc83 100644 --- a/blocks/juicer/juicer.js +++ b/blocks/juicer/juicer.js @@ -31,10 +31,7 @@ export default async function decorate(block) { block.innerHTML = `

${config.title}

+ data-feed-id="${config['feed-id']}"> `; io.observe(block); } From 4745ae889e347d3ecee73de996eed81239acf08c Mon Sep 17 00:00:00 2001 From: Bryan Stopp Date: Tue, 31 Oct 2023 10:40:10 -0500 Subject: [PATCH 3/4] Fix issues with icon covering nav elements. (#169) * Fix issues with icon covering nav elements. * Fix lint. --- blocks/header/header.css | 15 ++++++++++----- blocks/rows/rows.css | 37 ++++++++++++++++++------------------- icons/heart.svg | 3 ++- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/blocks/header/header.css b/blocks/header/header.css index 1369cf15..c2264db7 100644 --- a/blocks/header/header.css +++ b/blocks/header/header.css @@ -32,16 +32,20 @@ body.light-nav { height: 100vh; } -.header.block nav svg { +.header.block nav .nav-primary-wrapper { + display: contents; +} + +.header.block nav span.icon { + display: block; +} + +.header.block nav span.icon img { display: inline-block; height: 100%; width: 100%; } -.header.block nav .nav-primary-wrapper { - display: contents; -} - .header.block nav .nav-logo { display: flex; position: sticky; @@ -64,6 +68,7 @@ body.light-nav { margin: auto 0; } +/* stylelint-disable-next-line no-descending-specificity */ .header.block nav .nav-logo img { display: block; max-height: calc(var(--nav-height) - 30px); diff --git a/blocks/rows/rows.css b/blocks/rows/rows.css index b39c6a01..02f26a28 100644 --- a/blocks/rows/rows.css +++ b/blocks/rows/rows.css @@ -1,35 +1,34 @@ .rows.block .row-content { - display: flex; - flex-wrap: wrap; - justify-content: space-between; + display: flex; + flex-wrap: wrap; + justify-content: space-between; } -.rows.block .row-title { - width: 50%; - line-height: var(--line-height-m); +.rows.block .row-title { + width: 50%; + line-height: var(--line-height-m); } .rows.block .button-container a { - font-size: var(--body-font-size-xs); + font-size: var(--body-font-size-xs); } .rows.block.white-gray > div { - padding: 0 15px; - + padding: 0 15px; } .rows.block.white-gray > div:nth-child(even) { - background: var(--light-grey); + background: var(--light-grey); } @media (max-width: 600px) { - .rows.block .row-content { - display: flex; - flex-direction: column; - justify-content: flex-start; - } + .rows.block .row-content { + display: flex; + flex-direction: column; + justify-content: flex-start; + } - .rows.block .row-title { - width: 100%; - } -} \ No newline at end of file + .rows.block .row-title { + width: 100%; + } +} diff --git a/icons/heart.svg b/icons/heart.svg index fca9def6..d2eed1c9 100644 --- a/icons/heart.svg +++ b/icons/heart.svg @@ -2,7 +2,8 @@ class="saved-properties" role="img" aria-hidden="true" - tabindex="-1"> + tabindex="-1" + viewBox="0 0 16 14"> From dd197fbc2ad2fa273aaaa15e601e77771c181cd9 Mon Sep 17 00:00:00 2001 From: Bryan Stopp Date: Wed, 1 Nov 2023 13:47:27 -0500 Subject: [PATCH 4/4] Change Document source. --- fstab.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fstab.yaml b/fstab.yaml index 17d72a20..64975b70 100644 --- a/fstab.yaml +++ b/fstab.yaml @@ -1,5 +1,5 @@ mountpoints: - /: https://adobe.sharepoint.com/:f:/r/sites/HelixProjects/Shared%20Documents/sites/hsf/commonmoves + /: https://hsoa.sharepoint.com/:f:/r/sites/Franklin/Shared%20Documents/Website folders: /blog/blog-detail/: /blog/blog-detail