diff --git a/css/block/expandable-content.css b/css/block/expandable-content.css index 59a55648..c1344596 100644 --- a/css/block/expandable-content.css +++ b/css/block/expandable-content.css @@ -1,198 +1,193 @@ /* * Styles for expandable content paragraph - * -*/ + */ .ucb-expandable-content .vertical-tab-content { - width: 100%; + width: 100%; } .ucb-expandable-content .horizontal-tab-accordion .nav-tabs, .ucb-expandable-content .vertical-tab-accordion .vertical-tabs { - display: none; + display: none; } .ucb-expandable-content .accordion-button, .ucb-expandable-content .accordion-button:not(.collapsed), .ucb-expandable-content .accordion-button:focus { - color: #0277bd; - font-size: 18px; - font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; - background-color: transparent; - box-shadow: none; - + color: #0277bd; + font-size: 18px; + font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; + background-color: transparent; + box-shadow: none; } .ucb-expandable-content .accordion-button:not(.collapsed)::after, .ucb-expandable-content .accordion-button::after { - background: none; + background: none; } -.ucb-expandable-content .accordion-button::before { - flex-shrink: 0; - margin-right: 0.25em; - content: "\f0fe"; - transition: transform 0.2s ease-in-out; - font-family: 'Font Awesome 5 Free', sans-serif; - font-weight: 900; - color: #0277bd; +.ucb-expandable-content .accordion-button .ucb-accordion-button-content-icon-expand, +.ucb-expandable-content .accordion-button .ucb-accordion-button-content-icon-collapse { + flex-shrink: 0; + margin-right: 0.25em; } -.ucb-expandable-content .accordion-button:not(.collapsed)::before { - content: "\f146"; +.ucb-expandable-content .accordion-button.collapsed .ucb-accordion-button-content-icon-collapse, +.ucb-expandable-content .accordion-button:not(.collapsed) .ucb-accordion-button-content-icon-expand { + display: none; } .ucb-expandable-content .accordion-button:hover { - color: #b71c1c; + color: #b71c1c; } .ucb-expandable-content .accordion-button:hover::before { - color: #b71c1c; + color: #b71c1c; } .ucb-expandable-content .accordion-button, .ucb-expandable-content .accordion-body { - padding-left: 0; - padding-right: 0; + padding-left: 0; + padding-right: 0; } .ucb-bootstrap-layout-section-dark .ucb-expandable-content .accordion-button { - color: var(--ucb-gold); + color: var(--ucb-gold); } .ucb-bootstrap-layout-section-dark .ucb-expandable-content .accordion-button::before { - color: var(--ucb-gold); + color: var(--ucb-gold); } .ucb-bootstrap-layout-section-dark .ucb-expandable-content .accordion-button:hover { - color: var(--ucb-white); + color: var(--ucb-white); } .ucb-bootstrap-layout-section-dark .ucb-expandable-content .accordion-button:hover::before { - color: var(--ucb-white); + color: var(--ucb-white); } .ucb-bootstrap-layout-section-dark .ucb-expandable-content .horizontal-tab-link.nav-link{ - color: var(--ucb-white); + color: var(--ucb-white); } .ucb-bootstrap-layout-section-light .ucb-expandable-content .horizontal-tab-link.nav-link{ - color: var(--ucb-black); + color: var(--ucb-black); } .ucb-expandable-content .horizontal-tab-link.nav-link.active { - color: var(--ucb-white); - background-color: var(--ucb-black); - border-radius: 0; + color: var(--ucb-white); + background-color: var(--ucb-black); + border-radius: 0; } .ucb-bootstrap-layout-section-dark .ucb-expandable-content .horizontal-tab-link.nav-link.active { - color: var(--ucb-black); - background-color: var(--ucb-white); + color: var(--ucb-black); + background-color: var(--ucb-white); } .ucb-expandable-content .horizontal-tab-link.nav-link { - font-weight: bold; - line-height: 1.2em; - padding: 8px 15px; + font-weight: bold; + line-height: 1.2em; + padding: 8px 15px; } .ucb-expandable-content .horizontal-tab-link.nav-link, .ucb-expandable-content .horizontal-tab-link.nav-link:hover, .ucb-expandable-content .horizontal-tab-link.nav-link:focus { - border: none; - border-radius: 0; + border: none; + border-radius: 0; } .ucb-expandable-content .vertical-tab-link.nav-link { - color: #6a6a6a; - background-color: #e7e7e7; - font-weight: bold; - text-align: left; - border-radius: 0; + color: #6a6a6a; + background-color: #e7e7e7; + font-weight: bold; + text-align: left; + border-radius: 0; } .ucb-bootstrap-layout-section-dark .ucb-expandable-content .vertical-tab-link.nav-link { - color: #cccccc; - background-color: rgba(128, 128, 128, 0.333); + color: #cccccc; + background-color: rgba(128, 128, 128, 0.333); } .ucb-expandable-content .vertical-tab-link.nav-link.active { - color: var(--ucb-black); - background-color: var(--ucb-white); + color: var(--ucb-black); + background-color: var(--ucb-white); } .ucb-bootstrap-layout-section-dark .ucb-expandable-content .vertical-tab-link.nav-link.active { - color: var(--ucb-white); - background-color: var(--ucb-black); + color: var(--ucb-white); + background-color: var(--ucb-black); } .ucb-expandable-content .accordian-content .collapse:not(.show), .ucb-expandable-content .horizontal-tab-content .collapse:not(.show), .ucb-expandable-content .vertical-tab-content .collapse:not(.show) { - display: none; + display: none; } .ucb-expandable-content .accordian-content .collapse.show, .ucb-expandable-content .horizontal-tab-content .collapse.show, .ucb-expandable-content .vertical-tab-content .collapse.show, .ucb-expandable-content .accordian-content .collapsing, .ucb-expandable-content .horizontal-tab-content .collapsing, .ucb-expandable-content .vertical-tab-content .collapsing { - display: block; + display: block; } .ucb-expandable-content .accordion-item { - color: inherit; - background-color: inherit; - border-bottom: 1px solid rgba(128, 128, 128, 0.333); + color: inherit; + background-color: inherit; + border-bottom: 1px solid rgba(128, 128, 128, 0.333); } @media (min-width: 768px) { - .ucb-expandable-content .horizontal-tab-accordion .nav-tabs, - .ucb-expandable-content .vertical-tab-accordion .vertical-tabs { - display: flex; - } - - .ucb-expandable-content .horizontal-tab-accordion .nav-tabs { - border-bottom: 2px solid var(--ucb-black); - } - - .ucb-bootstrap-layout-section-dark .ucb-expandable-content .horizontal-tab-accordion .nav-tabs { - border-bottom: 2px solid var(--ucb-white); - } - - .ucb-expandable-content .horizontal-tab-content .accordion-header, .ucb-expandable-content .vertical-tab-content .accordion-header, - .ucb-expandable-content .horizontal-tab-content .collapse.show, .ucb-expandable-content .vertical-tab-content .collapse.show { - display: none; - } - - .ucb-expandable-content .horizontal-tab-content .collapse.active, .ucb-expandable-content .vertical-tab-content .collapse.active { - display: block; - } - - .ucb-expandable-content .vertical-tab-accordion .vertical-tabs { - width: 100%; - max-width: 25%; - background-color: #f2f2f2; - } - - .ucb-bootstrap-layout-section-dark .ucb-expandable-content .vertical-tab-accordion .vertical-tabs { - background-color: rgba(128, 128, 128, 0.333); - } - - .ucb-expandable-content .vertical-tab-accordion .vertical-tab-content { - display: flex; - max-width: 75%; - padding: 0 1em; - } - - .ucb-expandable-content .horizontal-tab-accordion .horizontal-accordion-tab, - .ucb-expandable-content .vertical-tab-accordion .vertical-accordion-tab { - display: none; - } - - .ucb-expandable-content .horizontal-tab-content .accordion-item, .ucb-expandable-content .vertical-tab-content .accordion-item { - border-bottom: none; - } - - .ucb-expandable-content .horizontal-tab-content .accordion-body, .ucb-expandable-content .vertical-tab-content .accordion-body { - padding-top: 20px; - padding-bottom: 0; - } - - .ucb-expandable-content .vertical-tab-accordion { - background: none; - border: 1px solid rgba(128, 128, 128, 0.333); - } + .ucb-expandable-content .horizontal-tab-accordion .nav-tabs, + .ucb-expandable-content .vertical-tab-accordion .vertical-tabs { + display: flex; + } + + .ucb-expandable-content .horizontal-tab-accordion .nav-tabs { + border-bottom: 2px solid var(--ucb-black); + } + + .ucb-bootstrap-layout-section-dark .ucb-expandable-content .horizontal-tab-accordion .nav-tabs { + border-bottom: 2px solid var(--ucb-white); + } + + .ucb-expandable-content .horizontal-tab-content .accordion-header, .ucb-expandable-content .vertical-tab-content .accordion-header, + .ucb-expandable-content .horizontal-tab-content .collapse.show, .ucb-expandable-content .vertical-tab-content .collapse.show { + display: none; + } + + .ucb-expandable-content .horizontal-tab-content .collapse.active, .ucb-expandable-content .vertical-tab-content .collapse.active { + display: block; + } + + .ucb-expandable-content .vertical-tab-accordion .vertical-tabs { + width: 100%; + max-width: 25%; + background-color: #f2f2f2; + } + + .ucb-bootstrap-layout-section-dark .ucb-expandable-content .vertical-tab-accordion .vertical-tabs { + background-color: rgba(128, 128, 128, 0.333); + } + + .ucb-expandable-content .vertical-tab-accordion .vertical-tab-content { + display: flex; + max-width: 75%; + padding: 0 1em; + } + + .ucb-expandable-content .horizontal-tab-accordion .horizontal-accordion-tab, + .ucb-expandable-content .vertical-tab-accordion .vertical-accordion-tab { + display: none; + } + + .ucb-expandable-content .horizontal-tab-content .accordion-item, .ucb-expandable-content .vertical-tab-content .accordion-item { + border-bottom: none; + } + + .ucb-expandable-content .horizontal-tab-content .accordion-body, .ucb-expandable-content .vertical-tab-content .accordion-body { + padding-top: 20px; + padding-bottom: 0; + } + + .ucb-expandable-content .vertical-tab-accordion { + background: none; + border: 1px solid rgba(128, 128, 128, 0.333); + } } diff --git a/css/styleguide/type.css b/css/styleguide/type.css index 7fbfa7f9..281b3905 100755 --- a/css/styleguide/type.css +++ b/css/styleguide/type.css @@ -123,7 +123,7 @@ ul.list-style-border > li { list-style: none; border: 1px solid rgba(128, 128, 1 ul.list-style-icon-1, ul.list-style-icon-2, ul.list-style-icon-3, ul.list-style-icon-4, ul.list-style-icon-5, ul.list-style-icon-6, ul.list-style-icon-check, ul.list-style-icon-checkbox, ul.list-style-icon-angle-double, ul.list-style-icon-circle-arrow, ul.list-style-icon-star, ul.list-style-icon-finger { list-style: none; list-style-image: none; overflow: hidden; } ul.list-style-icon-1 > li, ul.list-style-icon-2 > li, ul.list-style-icon-3 > li, ul.list-style-icon-4 > li, ul.list-style-icon-5 > li, ul.list-style-icon-6 > li, ul.list-style-icon-check > li, ul.list-style-icon-checkbox > li, ul.list-style-icon-angle-double > li, ul.list-style-icon-circle-arrow > li, ul.list-style-icon-star > li, ul.list-style-icon-finger > li { list-style: none !important; list-style-image: none !important; position: relative; } -ul.list-style-icon-1 li:before, ul.list-style-icon-2 li:before, ul.list-style-icon-3 li:before, ul.list-style-icon-4 li:before, ul.list-style-icon-5 li:before, ul.list-style-icon-6 li:before, ul.list-style-icon-check li:before, ul.list-style-icon-checkbox li:before, ul.list-style-icon-angle-double li:before, ul.list-style-icon-circle-arrow li:before, ul.list-style-icon-star li:before, ul.list-style-icon-finger li:before { font-family: "Font Awesome 5 Free", "FontAwesome"; position: absolute; top: 0; left: -20px; color: #cfb87c; } +ul.list-style-icon-1 li:before, ul.list-style-icon-2 li:before, ul.list-style-icon-3 li:before, ul.list-style-icon-4 li:before, ul.list-style-icon-5 li:before, ul.list-style-icon-6 li:before, ul.list-style-icon-check li:before, ul.list-style-icon-checkbox li:before, ul.list-style-icon-angle-double li:before, ul.list-style-icon-circle-arrow li:before, ul.list-style-icon-star li:before, ul.list-style-icon-finger li:before { font-family: "Font Awesome 6 Free"; position: absolute; top: 0; left: -20px; color: #cfb87c; } ul.list-style-icon-1 > li:before, ul.list-style-icon-check > li:before { content: '\f00c'; font-weight: 900; } diff --git a/css/ucb-article.css b/css/ucb-article.css index 7f1fbe8e..3a96c47d 100644 --- a/css/ucb-article.css +++ b/css/ucb-article.css @@ -13,7 +13,7 @@ font-weight: 700; } -i.far.fa-calendar { +i.fa-regular.fa-calendar { color: #999; } @@ -32,7 +32,7 @@ i.far.fa-calendar { line-height: 1em; } -.ucb-article-category-icon, .ucb-article-tag-icon{ +.ucb-article-category-icon, .ucb-article-tag-icon { background-color: #555555; color: #e7e7e7; height: 16px; @@ -71,9 +71,9 @@ i.far.fa-calendar { color: #fff; } -.ucb-article-tags i.fas, -.ucb-article-categories i.fas -.ucb-article-issue i.fas { +.ucb-article-tags i.fa-solid, +.ucb-article-categories i.fa-solid, +.ucb-article-issue i.fa-solid { padding: 0.5em; background: #555; color: #fff; diff --git a/css/ucb-person.css b/css/ucb-person.css index de1fde45..65dcbeb0 100644 --- a/css/ucb-person.css +++ b/css/ucb-person.css @@ -1,126 +1,124 @@ .ucb-person-header { - margin-bottom: 10px; + margin-bottom: 10px; } .ucb-person-name { - margin-bottom: 0; + margin-bottom: 0; } .ucb-person-pronouns { - list-style: none; - font-size: 1.1em; - margin: 0; - padding: 0; + list-style: none; + font-size: 1.1em; + margin: 0; + padding: 0; } .ucb-person-section { - margin-bottom: 10px; + margin-bottom: 10px; } .ucb-person-main img { - max-width: 300px; - height: auto; - border-radius: 2px; + max-width: 300px; + height: auto; + border-radius: 2px; } ul.ucb-person-email-address, ul.ucb-person-links, ul.ucb-person-phone-numbers { - list-style: none; - padding: 0; - color: #aaa; - margin: 0; + list-style: none; + padding: 0; + color: #aaa; + margin: 0; } -a.ucb-person-social-link i.fa, -a.ucb-person-social-link i.fab { - color: #aaa; +a.ucb-person-social-link i.fa-solid, +a.ucb-person-social-link i.fa-brands { + color: #aaa; } .ucb-person-contact-section { - margin-top: 0.5em; + margin-top: 0.5em; } .ucb-person-contact p { - margin: 5px; - padding-top:10px; - padding-bottom:10px; + margin: 5px; + padding-top:10px; + padding-bottom:10px; } .ucb-articles-by-person-block{ - display: block; - margin-bottom: 20px; + display: block; + margin-bottom: 20px; } .ucb-article-card-title{ - margin: 0; - margin-bottom: 10px; - margin-top: 10px; + margin: 0; + margin-bottom: 10px; + margin-top: 10px; } @media screen and (min-width: 768px) { - .ucb-person-img { - float: right; - margin-left: 20px; - } - .ucb-person-img .media-image-caption { - text-align: center; - } + .ucb-person-img { + float: right; + margin-left: 20px; + } + .ucb-person-img .media-image-caption { + text-align: center; + } } .ucb-person-section-header { - display: block; - font-weight: bold; + display: block; + font-weight: bold; } .ucb-person-section.ucb-person-links, .ucb-person-section.ucb-person-address, .ucb-person-section.ucb-person-office-hours, .ucb-person-section.ucb-person-body { - margin-top: 20px; + margin-top: 20px; } ul.ucb-person-title li:not(:first-child):before, ul.ucb-person-department li:not(:first-child):before { - font-family: "Font Awesome 5 Free"; - font-weight: 900; - font-size: .25em; - content: "\f111"; - vertical-align: middle; - padding-left: .25em; - padding-right: 1em; + font-weight: 900; + content: '\2022'; + vertical-align: middle; + padding-left: .0625em; + padding-right: .25em; } .ucb-person-title li, .ucb-person-department li { - display: inline-block; + display: inline-block; } .ucb-person-title, .ucb-person-department { - padding-left: 0; - margin-bottom: 0; + padding-left: 0; + margin-bottom: 0; } .ucb-person-img { - clear: both; - margin-bottom: 20px; + clear: both; + margin-bottom: 20px; } .ucb-person-img img { - padding-bottom: 0; + padding-bottom: 0; } .ucb-person-img .media-image-caption { - display: block; - padding-top: .2em; + display: block; + padding-top: .2em; } .primaryLinkIcon { - color: gray; + color: gray; } .ucb-article-card-title-only{ - border-bottom: solid rgba(128, 128, 128, 0.333); + border-bottom: solid rgba(128, 128, 128, 0.333); } diff --git a/js/ucb-category-cloud.js b/js/ucb-category-cloud.js index b1bca4c8..d7dd16a9 100644 --- a/js/ucb-category-cloud.js +++ b/js/ucb-category-cloud.js @@ -45,7 +45,7 @@ class CategoryCloudElement extends HTMLElement { container.appendChild(span) const icon = document.createElement('i'); - icon.className = 'fas fa-exclamation-triangle' + icon.className = 'fa-solid fa-triangle-exclamation' span.appendChild(icon) const message = document.createElement('p'); diff --git a/js/ucb-current-issue-block.js b/js/ucb-current-issue-block.js index 7171db71..48379182 100644 --- a/js/ucb-current-issue-block.js +++ b/js/ucb-current-issue-block.js @@ -70,7 +70,7 @@ class CurrentIssueElement extends HTMLElement { container.appendChild(span) const icon = document.createElement('i'); - icon.className = 'fas fa-exclamation-triangle' + icon.className = 'fa-solid fa-triangle-exclamation' span.appendChild(icon) const message = document.createElement('p'); diff --git a/js/ucb-hero-unit.js b/js/ucb-hero-unit.js index b470f4cf..ce580f17 100644 --- a/js/ucb-hero-unit.js +++ b/js/ucb-hero-unit.js @@ -174,11 +174,11 @@ } function showVideoHeroPauseIcon(playPauseButtonElement) { - playPauseButtonElement.innerHTML = ''; + playPauseButtonElement.innerHTML = ''; } function showVideoHeroPlayIcon(playPauseButtonElement) { - playPauseButtonElement.innerHTML = ''; + playPauseButtonElement.innerHTML = ''; } function videoHeroErrorHandler(videoWrapperElement, videoPlayerWrapperElement) { diff --git a/js/ucb-latest-issue-block.js b/js/ucb-latest-issue-block.js index f0e1e02f..e767db5f 100644 --- a/js/ucb-latest-issue-block.js +++ b/js/ucb-latest-issue-block.js @@ -85,7 +85,7 @@ class LatestIssueElement extends HTMLElement { container.appendChild(span) const icon = document.createElement('i'); - icon.className = 'fas fa-exclamation-triangle' + icon.className = 'fa-solid fa-triangle-exclamation' span.appendChild(icon) const message = document.createElement('p'); diff --git a/js/ucb-people-list-block.js b/js/ucb-people-list-block.js index a90045c7..3793c87f 100644 --- a/js/ucb-people-list-block.js +++ b/js/ucb-people-list-block.js @@ -92,7 +92,7 @@ class PeopleListBlockElement extends HTMLElement { messageElement.className = 'ucb-list-msg'; messageElement.setAttribute('hidden', ''); loadingElement.className = 'ucb-loading-data'; - loadingElement.innerHTML = ''; + loadingElement.innerHTML = ''; chromeElement.appendChild(userFormElement); chromeElement.appendChild(messageElement); chromeElement.appendChild(loadingElement); @@ -469,7 +469,7 @@ class PeopleListBlockElement extends HTMLElement { ${ personEmail ? ` - + ${personEmail} @@ -479,7 +479,7 @@ class PeopleListBlockElement extends HTMLElement { ${ personPhone ? ` - + ${personPhone} @@ -582,65 +582,65 @@ class PeopleListBlockElement extends HTMLElement { else element.removeAttribute('hidden'); } generateLinkIcon(linkURI) { - var linkIcon = "fas fa-link primaryLinkIcon"; + var linkIcon = "fa-solid fa-link primaryLinkIcon"; if (linkURI.indexOf("internal:/") == 0) { return linkIcon; } else { const linkData = new URL(linkURI).hostname.split(".")[1].toUpperCase(); switch (linkData) { case 'FACEBOOK' : - linkIcon = "fab fa-facebook primaryLinkIcon"; + linkIcon = "fa-brands fa-facebook primaryLinkIcon"; break; case 'TWITTER' : - linkIcon = "fab fa-twitter primaryLinkIcon"; + linkIcon = "fa-brands fa-twitter primaryLinkIcon"; break; case 'FLICKR' : - linkIcon = "fab fa-flickr primaryLinkIcon"; + linkIcon = "fa-brands fa-flickr primaryLinkIcon"; break; case 'LINKEDIN' : - linkIcon = "fab fa-linkedin primaryLinkIcon"; + linkIcon = "fa-brands fa-linkedin primaryLinkIcon"; break; case 'YOUTUBE' : - linkIcon = "fab fa-youtube primaryLinkIcon"; + linkIcon = "fa-brands fa-youtube primaryLinkIcon"; break; case 'INSTAGRAM' : - linkIcon = "fab fa-instagram primaryLinkIcon"; + linkIcon = "fa-brands fa-instagram primaryLinkIcon"; break; case 'DISCORD' : - linkIcon = "fab fa-discord primaryLinkIcon"; + linkIcon = "fa-brands fa-discord primaryLinkIcon"; break; case 'PINTREST' : - linkIcon = "fab fa-pinterest-p primaryLinkIcon"; + linkIcon = "fa-brands fa-pinterest-p primaryLinkIcon"; break; case 'VIMEO' : - linkIcon = "fab fa-vimeo-v primaryLinkIcon"; + linkIcon = "fa-brands fa-vimeo-v primaryLinkIcon"; break; case 'WORDPRESS' : - linkIcon = "fab fa-wordpress-simple primaryLinkIcon"; + linkIcon = "fa-brands fa-wordpress-simple primaryLinkIcon"; break; case 'TIKTOK' : - linkIcon = "fab fa-tiktok primaryLinkIcon"; + linkIcon = "fa-brands fa-tiktok primaryLinkIcon"; break; case 'REDDIT' : - linkIcon = "fab fa--reddit-alien primaryLinkIcon"; + linkIcon = "fa-brands fa--reddit-alien primaryLinkIcon"; break; case 'PATREON' : - linkIcon = "fab fa-patreon primaryLinkIcon"; + linkIcon = "fa-brands fa-patreon primaryLinkIcon"; break; default : - linkIcon = "fas fa-link primaryLinkIcon"; + linkIcon = "fa-solid fa-link primaryLinkIcon"; } } return linkIcon; diff --git a/js/ucb-people-list.js b/js/ucb-people-list.js index d7ca7e87..cf843e35 100644 --- a/js/ucb-people-list.js +++ b/js/ucb-people-list.js @@ -92,7 +92,7 @@ class PeopleListElement extends HTMLElement { messageElement.className = 'ucb-list-msg'; messageElement.setAttribute('hidden', ''); loadingElement.className = 'ucb-loading-data'; - loadingElement.innerHTML = ''; + loadingElement.innerHTML = ''; chromeElement.appendChild(userFormElement); chromeElement.appendChild(messageElement); chromeElement.appendChild(loadingElement); @@ -490,7 +490,7 @@ class PeopleListElement extends HTMLElement { ${ personEmail ? ` - + ${personEmail} @@ -500,7 +500,7 @@ class PeopleListElement extends HTMLElement { ${ personPhone ? ` - + ${personPhone} @@ -570,7 +570,7 @@ class PeopleListElement extends HTMLElement { ${ personEmail ? ` - + ${personEmail} @@ -580,7 +580,7 @@ class PeopleListElement extends HTMLElement { ${ personPhone ? ` - + ${personPhone} @@ -745,65 +745,65 @@ class PeopleListElement extends HTMLElement { } } generateLinkIcon(linkURI) { - var linkIcon = "fas fa-link primaryLinkIcon"; + var linkIcon = "fa-solid fa-link primaryLinkIcon"; if (linkURI.indexOf("internal:/") == 0) { return linkIcon; } else { const linkData = new URL(linkURI).hostname.split(".")[1].toUpperCase(); switch (linkData) { case 'FACEBOOK' : - linkIcon = "fab fa-facebook primaryLinkIcon"; + linkIcon = "fa-brands fa-facebook primaryLinkIcon"; break; case 'TWITTER' : - linkIcon = "fab fa-twitter primaryLinkIcon"; + linkIcon = "fa-brands fa-twitter primaryLinkIcon"; break; case 'FLICKR' : - linkIcon = "fab fa-flickr primaryLinkIcon"; + linkIcon = "fa-brands fa-flickr primaryLinkIcon"; break; case 'LINKEDIN' : - linkIcon = "fab fa-linkedin primaryLinkIcon"; + linkIcon = "fa-brands fa-linkedin primaryLinkIcon"; break; case 'YOUTUBE' : - linkIcon = "fab fa-youtube primaryLinkIcon"; + linkIcon = "fa-brands fa-youtube primaryLinkIcon"; break; case 'INSTAGRAM' : - linkIcon = "fab fa-instagram primaryLinkIcon"; + linkIcon = "fa-brands fa-instagram primaryLinkIcon"; break; case 'DISCORD' : - linkIcon = "fab fa-discord primaryLinkIcon"; + linkIcon = "fa-brands fa-discord primaryLinkIcon"; break; case 'PINTREST' : - linkIcon = "fab fa-pinterest-p primaryLinkIcon"; + linkIcon = "fa-brands fa-pinterest-p primaryLinkIcon"; break; case 'VIMEO' : - linkIcon = "fab fa-vimeo-v primaryLinkIcon"; + linkIcon = "fa-brands fa-vimeo-v primaryLinkIcon"; break; case 'WORDPRESS' : - linkIcon = "fab fa-wordpress-simple primaryLinkIcon"; + linkIcon = "fa-brands fa-wordpress-simple primaryLinkIcon"; break; case 'TIKTOK' : - linkIcon = "fab fa-tiktok primaryLinkIcon"; + linkIcon = "fa-brands fa-tiktok primaryLinkIcon"; break; case 'REDDIT' : - linkIcon = "fab fa--reddit-alien primaryLinkIcon"; + linkIcon = "fa-brands fa--reddit-alien primaryLinkIcon"; break; case 'PATREON' : - linkIcon = "fab fa-patreon primaryLinkIcon"; + linkIcon = "fa-brands fa-patreon primaryLinkIcon"; break; default : - linkIcon = "fas fa-link primaryLinkIcon"; + linkIcon = "fa-solid fa-link primaryLinkIcon"; } } return linkIcon; diff --git a/js/ucb-rave-alert.js b/js/ucb-rave-alert.js index 650cbd37..32226053 100644 --- a/js/ucb-rave-alert.js +++ b/js/ucb-rave-alert.js @@ -33,7 +33,7 @@ class RaveAlertElement extends HTMLElement { alertTextElement.innerText = descriptionText; alertLinkElement.target = '_blank'; alertLinkElement.href = linkText; - alertLinkElement.innerHTML = `Read More `; + alertLinkElement.innerHTML = `Read More `; alertElement.appendChild(alertTextElement); alertElement.innerHTML += ' '; alertElement.appendChild(alertLinkElement); diff --git a/js/ucb-status-page-block.js b/js/ucb-status-page-block.js index 65f89222..11418452 100644 --- a/js/ucb-status-page-block.js +++ b/js/ucb-status-page-block.js @@ -41,19 +41,19 @@ class StatusPageElement extends HTMLElement { switch (response.status.indicator) { case 'none': container.classList.add('ucb-status-none'); - link.firstChild.classList = 'far fa-smile' + link.firstChild.classList = 'fa-regular fa-face-smile' break; case 'minor': container.classList.add('ucb-status-minor') - link.firstChild.classList = 'far fa-question-circle' + link.firstChild.classList = 'fa-regular fa-circle-question' break; case 'major': container.classList.add('ucb-status-major') - link.firstChild.classList = 'fas fa-exclamation-triangle' + link.firstChild.classList = 'fa-solid fa-triangle-exclamation' break; case 'critical': container.classList.add('ucb-status-crtical') - link.firstChild.classList = 'fas fa-exclamation-triangle' + link.firstChild.classList = 'fa-solid fa-triangle-exclamation' break; default: @@ -73,7 +73,7 @@ class StatusPageElement extends HTMLElement { container.appendChild(span) const icon = document.createElement('i'); - icon.className = 'ucb-status-block-icon fas fa-exclamation-triangle' + icon.className = 'ucb-status-block-icon fa-solid fa-triangle-exclamation' span.appendChild(icon) const message = document.createElement('p'); diff --git a/js/ucb-tag-cloud.js b/js/ucb-tag-cloud.js index dfa7fd1e..80086b2f 100644 --- a/js/ucb-tag-cloud.js +++ b/js/ucb-tag-cloud.js @@ -45,7 +45,7 @@ class TagCloudElement extends HTMLElement { container.appendChild(span) const icon = document.createElement('i'); - icon.className = 'fas fa-exclamation-triangle' + icon.className = 'fa-solid fa-triangle-exclamation' span.appendChild(icon) const message = document.createElement('p'); diff --git a/templates/block/block--article-list-block.html.twig b/templates/block/block--article-list-block.html.twig index 0ccf9cc0..66707952 100644 --- a/templates/block/block--article-list-block.html.twig +++ b/templates/block/block--article-list-block.html.twig @@ -180,7 +180,7 @@ count="{{content.field_art_list_block_item_count|render|striptags|trim}}" >
- +
@@ -165,13 +165,13 @@
diff --git a/templates/block/block--expandable-content.html.twig b/templates/block/block--expandable-content.html.twig index 80a40bc0..b99d99a4 100644 --- a/templates/block/block--expandable-content.html.twig +++ b/templates/block/block--expandable-content.html.twig @@ -8,13 +8,13 @@ {{ attach_library('boulder_base/ucb-expandable-content') }} {% set classes = [ - 'container', - 'block', - 'block-' ~ configuration.provider|clean_class, - 'block-' ~ plugin_id|clean_class, - bundle ? 'block--type-' ~ bundle|clean_class, - view_mode ? 'block--view-mode-' ~ view_mode|clean_class, - 'ucb-expandable-content' + 'container', + 'block', + 'block-' ~ configuration.provider|clean_class, + 'block-' ~ plugin_id|clean_class, + bundle ? 'block--type-' ~ bundle|clean_class, + view_mode ? 'block--view-mode-' ~ view_mode|clean_class, + 'ucb-expandable-content' ] %} {% set entity = content['#block_content'] %}{% set id = entity.uuid.value %} @@ -22,60 +22,60 @@ {% set accordianContent %}
- {% for key, item in entity.field_expandable_content_copy %}{% set itemExpanded = loop.first and (layoutSelection != 0 or entity.field_expandable_content_open.value) %} - -
-

- {% set expandableHeaderID = item.entity.field_expandable_content_title|view %} - - {{ item.entity.field_expandable_content_title|view }} - -

-
-
- {{ item.entity.field_expandable_content_body|view }} -
-
-
- {% endfor %} + {% for key, item in entity.field_expandable_content_copy %}{% set itemExpanded = loop.first and (layoutSelection != 0 or entity.field_expandable_content_open.value) %} +
+

+ {% set expandableHeaderID = item.entity.field_expandable_content_title|view %} + + + {{ item.entity.field_expandable_content_title|view }} + +

+
+
+ {{ item.entity.field_expandable_content_body|view }} +
+
+
+ {% endfor %}
{% endset %} {% block content %} - - {{ title_prefix }} - {% if label %} - {{ label }} - {% endif %} - {{ title_suffix }} - {% if layoutSelection == 1 %} -
- -
- {{ accordianContent }} -
-
- {% elseif layoutSelection == 2 %} -
- -
- {{ accordianContent }} -
-
- {% else %} -
- {{ accordianContent }} -
- {% endif %} -
+ + {{ title_prefix }} + {% if label %} + {{ label }} + {% endif %} + {{ title_suffix }} + {% if layoutSelection == 1 %} +
+ +
+ {{ accordianContent }} +
+
+ {% elseif layoutSelection == 2 %} +
+ +
+ {{ accordianContent }} +
+
+ {% else %} +
+ {{ accordianContent }} +
+ {% endif %} + {% endblock content %} diff --git a/templates/block/block--hero-unit.html.twig b/templates/block/block--hero-unit.html.twig index bb27462c..9fbcb451 100644 --- a/templates/block/block--hero-unit.html.twig +++ b/templates/block/block--hero-unit.html.twig @@ -91,7 +91,7 @@
- +
diff --git a/templates/block/block--site-info.html.twig b/templates/block/block--site-info.html.twig index d0e8a4af..101713db 100644 --- a/templates/block/block--site-info.html.twig +++ b/templates/block/block--site-info.html.twig @@ -56,9 +56,9 @@ {% if email.visible == '1' %}
{% if email.label %} - {% if icons_visible %} {% endif %}{{ email.label }} + {% if icons_visible %} {% endif %}{{ email.label }} {% endif %} - {% if not email.label and icons_visible %} {% endif %}{{ email.value }}
+ {% if not email.label and icons_visible %} {% endif %}{{ email.value }} {% endif %} {% endfor %} @@ -69,9 +69,9 @@ {% if phone.visible == '1' %}
{% if phone.label %} - {% if icons_visible %} {% endif %}{{ phone.label }} + {% if icons_visible %} {% endif %}{{ phone.label }} {% endif %} - {% if not phone.label and icons_visible %} {% endif %}{{ phone.value }}
+ {% if not phone.label and icons_visible %} {% endif %}{{ phone.value }} {% endif %} {% endfor %} diff --git a/templates/block/block--ucb-article-feature.html.twig b/templates/block/block--ucb-article-feature.html.twig index 04ed0480..86885ebd 100644 --- a/templates/block/block--ucb-article-feature.html.twig +++ b/templates/block/block--ucb-article-feature.html.twig @@ -179,7 +179,7 @@ imgSize="{{content.field_article_feature_image_size|render|striptags|trim}}" >
- +