Merge pull request #424 from vrk-kpa/LIKA-586_footer-update

LIKA-586: Font Awesome 6, update footer
vrk-kpa · Feb 6, 2024 · d145a5e · d145a5e
2 parents 4afd582 + 4684500
commit d145a5e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/ckanext/ckanext-apicatalog/ckanext/apicatalog/templates/footer.html b/ckanext/ckanext-apicatalog/ckanext/apicatalog/templates/footer.html
@@ -21,13 +21,13 @@
 			<div class="container">
 				<div class="footer-bottom-links col-xs-12">
 					<div class="footer-bottom-link-container">
-						<a href="https://twitter.com/suomifiyritys">
-							<span class="fab fa-twitter"></span>{{_('@Suomifiyritys')}}
+						<a href="https://x.com/suomifi">
+							<span class="fab fa-x-twitter"></span>{{_('@suomifi')}}
 						</a>
 					</div>
 					<div class="footer-bottom-link-container">
-						<a href="https://www.facebook.com/Suomifiyritykselle">
-							<span class="fab fa-facebook-square"></span>{{_('@Suomifiyritykselle')}}
+						<a href="https://www.facebook.com/suomifi">
+							<span class="fab fa-facebook-square"></span>{{_('@Suomi.fi')}}
 						</a>
 					</div>
 					<div class="footer-bottom-link-container">

diff --git a/ckanext/ckanext-apicatalog/gulpfile.js b/ckanext/ckanext-apicatalog/gulpfile.js
@@ -38,15 +38,12 @@ function bootstrapLess() {
 
 exports.fontAwesomeCss = fontAwesomeCss;
 exports.fontAwesomeFonts = fontAwesomeFonts;
-exports.cookieConsentJs = cookieConsentJs;
-exports.cookieConsentCss = cookieConsentCss;
 exports.bootstrapDatepickerJs = bootstrapDatepickerJs;
 exports.bootstrapDatepickerCss = bootstrapDatepickerCss;
 exports.bootstrapLess = bootstrapLess;
 
 exports.default = parallel(
   fontAwesomeCss, fontAwesomeFonts,
-  cookieConsentJs, cookieConsentCss,
   bootstrapDatepickerJs, bootstrapDatepickerCss,
   bootstrapLess
 );
diff --git a/ckanext/ckanext-apicatalog/less/forms.less b/ckanext/ckanext-apicatalog/less/forms.less
@@ -122,7 +122,7 @@ input[type=checkbox] {
 
   &:after {
     pointer-events: none;
-    font-family: "Font Awesome 5 Pro";
+    font-family: "Font Awesome 6 Pro";
     content: "\f0d7";
     font-size: 18px;
     font-weight: 900;
@@ -340,7 +340,7 @@ textarea {
 
   &:after {
     pointer-events: none;
-    font-family: "Font Awesome 5 Pro";
+    font-family: "Font Awesome 6 Pro";
     content: "\f0d7";
     font-size: 18px;
     font-weight: 900;

diff --git a/ckanext/ckanext-apicatalog/package-lock.json b/ckanext/ckanext-apicatalog/package-lock.json
diff --git a/ckanext/ckanext-apicatalog/package.json b/ckanext/ckanext-apicatalog/package.json
@@ -9,7 +9,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@fortawesome/fontawesome-pro": "^5.12.1",
+    "@fortawesome/fontawesome-pro": "^6",
     "bootstrap": "^3.4.1",
     "eonasdan-bootstrap-datetimepicker": "^4.17.47"
   },