From 994aa295fe47b1c655b8762743a222940f1de4a0 Mon Sep 17 00:00:00 2001 From: Michael Greene Date: Fri, 20 May 2022 11:44:47 -0400 Subject: [PATCH] update libsass and remove build errors --- library/pom.xml | 4 ++-- .../src/morpheus-master/js/src/sakai.morpheus.more.sites.js | 4 ++-- ...duke-alumni_overrides.scss => _duke-alumni-overrides.scss} | 0 .../morpheus-master/sass/modules/tool/profile2/_profile2.scss | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename library/src/morpheus-master/sass/{_duke-alumni_overrides.scss => _duke-alumni-overrides.scss} (100%) diff --git a/library/pom.xml b/library/pom.xml index f34f0d2c09d..70d475422a3 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -669,10 +669,10 @@ com.gitlab.haynes libsass-maven-plugin - 0.2.26 + 0.2.28 - process-resources + compile compile diff --git a/library/src/morpheus-master/js/src/sakai.morpheus.more.sites.js b/library/src/morpheus-master/js/src/sakai.morpheus.more.sites.js index f2db425b736..0a0ced418e0 100755 --- a/library/src/morpheus-master/js/src/sakai.morpheus.more.sites.js +++ b/library/src/morpheus-master/js/src/sakai.morpheus.more.sites.js @@ -513,7 +513,7 @@ $PBJQ(document).ready(function($){ } /** - * @func syncFavoritesToServer + * @function syncFavoritesToServer * @desc Reusable method to sync fav changes to the server * @param {Array} favs - List of SiteIds to be used as favourites * @param {Function} onError - Error function to be called on AJAX failure @@ -543,7 +543,7 @@ $PBJQ(document).ready(function($){ } /** - * @func topNavFavorite + * @function topNavFavorite * @desc Toggles favouriting from the top navigation * @param {*} event - jQuery Event for item clicked */ diff --git a/library/src/morpheus-master/sass/_duke-alumni_overrides.scss b/library/src/morpheus-master/sass/_duke-alumni-overrides.scss similarity index 100% rename from library/src/morpheus-master/sass/_duke-alumni_overrides.scss rename to library/src/morpheus-master/sass/_duke-alumni-overrides.scss diff --git a/library/src/morpheus-master/sass/modules/tool/profile2/_profile2.scss b/library/src/morpheus-master/sass/modules/tool/profile2/_profile2.scss index 39a953e38ae..6dbffedab8c 100644 --- a/library/src/morpheus-master/sass/modules/tool/profile2/_profile2.scss +++ b/library/src/morpheus-master/sass/modules/tool/profile2/_profile2.scss @@ -263,7 +263,7 @@ } .infoIcon { - @extend .fa.fa-info-circle; + @extend .fa, .fa-info-circle; } /* sideLink styles */