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

Fix icons which are SVGs. #166

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Fix icons which are SVGs. #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51d71d5
Fix icons which are SVGs.
bstopp Oct 30, 2023
10addb1
Fix lint.
bstopp Oct 30, 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
23 changes: 11 additions & 12 deletions blocks/info-mouseover/info-mouseover.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -105,4 +104,4 @@
.info-mouseover.block .info-content-wrapper::after {
left: 18px;
}
}
}
1 change: 1 addition & 0 deletions blocks/library-metadata/library-metadata.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* Empty file for handling PSI checks on Block Library pages. */
1 change: 1 addition & 0 deletions blocks/library-metadata/library-metadata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Empty file for handling PSI checks on Block Library pages.
2 changes: 1 addition & 1 deletion blocks/liveby-demographics/liveby-demographics.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 7 additions & 3 deletions blocks/liveby-schools/liveby-schools.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -162,4 +166,4 @@ main .section.liveby-schools-container p {
flex-basis: 33%;
margin: 1em;
}
}
}
21 changes: 10 additions & 11 deletions blocks/liveby-schools/liveby-schools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'];
Expand Down Expand Up @@ -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');
Expand Down Expand Up @@ -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 {
Expand All @@ -95,8 +96,6 @@ function buildSchoolList(type, schools, sort = ratingSort) {
item.append(rating);
section.append(item);
});

decorateIcons(section);
return section;
}

Expand Down Expand Up @@ -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);

Expand All @@ -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),
);
});
}
Expand Down