Skip to content
This repository has been archived by the owner on Nov 13, 2023. It is now read-only.

Merge Stage to Main #943

Merged
merged 13 commits into from
Jul 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion express/blocks/browse-by-category/browse-by-category.css
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ main .browse-by-category-wrapper.fullwidth {
object-fit: contain;
max-width: 110px;
max-height: 97px;
height: 100%;
transform: matrix(1, -0.01, 0.01, 1, 0, 0);
box-shadow: 0 0 6px #0000001f;
border-radius: 8px;
Expand Down
6 changes: 5 additions & 1 deletion express/blocks/template-list/breadcrumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,12 @@ function getCrumbsForSEOPage(templatesUrl, allTemplatesMetadata, taskCategories,
}
crumbs.push(segmentCrumb);
});
const shortTitle = getMetadata('short-title');
if (!shortTitle) {
return crumbs;
}
const lastCrumb = createTag('li');
lastCrumb.textContent = getMetadata('short-title');
lastCrumb.textContent = shortTitle;
crumbs.push(lastCrumb);
return crumbs;
}
Expand Down
2 changes: 1 addition & 1 deletion express/blocks/template-list/template-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -1606,7 +1606,7 @@ export async function decorateTemplateList($block, props) {
}
}

if (placeholders['template-filter-premium']) {
if (placeholders['template-filter-premium'] && !$block.classList.contains('mini')) {
document.addEventListener('linkspopulated', async (e) => {
// desktop/mobile fires the same event
if ($parent.contains(e.detail[0])) {
Expand Down
7 changes: 6 additions & 1 deletion express/scripts/gnav.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,12 @@ function loadIMS() {
locale: getLocale(window.location),
environment: 'prod',
};
loadScript('https://auth.services.adobe.com/imslib/imslib.min.js');
if (!['www.stage.adobe.com'].includes(window.location.hostname)) {
loadScript('https://auth.services.adobe.com/imslib/imslib.min.js');
} else {
loadScript('https://auth-stg1.services.adobe.com/imslib/imslib.min.js');
window.adobeid.environment = 'stg1';
}
}

async function loadFEDS() {
Expand Down