From 46845006f9bfe35a0e2f6adbedf87d27d97790ae Mon Sep 17 00:00:00 2001
From: Teemu Erkkola <teemu.erkkola@gofore.com>
Date: Tue, 6 Feb 2024 10:08:09 +0200
Subject: [PATCH] LIKA-586: Font Awesome 6, update footer, remove leftover
cookieconsent references
---
.../ckanext/apicatalog/templates/footer.html | 8 ++++----
ckanext/ckanext-apicatalog/gulpfile.js | 3 ---
ckanext/ckanext-apicatalog/less/forms.less | 4 ++--
ckanext/ckanext-apicatalog/package-lock.json | 15 ++++++++-------
ckanext/ckanext-apicatalog/package.json | 2 +-
5 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/ckanext/ckanext-apicatalog/ckanext/apicatalog/templates/footer.html b/ckanext/ckanext-apicatalog/ckanext/apicatalog/templates/footer.html
index d5f16ab5..9cff5665 100644
--- 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
index 280210fc..488d3990 100644
--- 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
index 9073b2e4..9c056713 100644
--- 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
index 86c59c65..ff0c9ee1 100644
--- a/ckanext/ckanext-apicatalog/package-lock.json
+++ b/ckanext/ckanext-apicatalog/package-lock.json
@@ -10,7 +10,7 @@
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
- "@fortawesome/fontawesome-pro": "^5.12.1",
+ "@fortawesome/fontawesome-pro": "^6",
"bootstrap": "^3.4.1",
"eonasdan-bootstrap-datetimepicker": "^4.17.47"
},
@@ -21,9 +21,10 @@
}
},
"node_modules/@fortawesome/fontawesome-pro": {
- "version": "5.12.1",
- "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/5.12.1/fontawesome-pro-5.12.1.tgz",
- "integrity": "sha512-rwVdMZQfTmN/6ExkA3sXN5fdiJWFYFuaDnBYCxhWEpgIzl14BYQMBLqRkQx/ITBnbITkoOLBpfJJHbZ0GKPjHw==",
+ "version": "6.5.1",
+ "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/6.5.1/fontawesome-pro-6.5.1.tgz",
+ "integrity": "sha512-XLi5HOQ3XLNtM9UhrCyT5jEj0RHkx5GfzKDmUPpVTea4C/Ekj5plOYVAp9dUWgH+NWo3IrVpwhsnhIFh/FZPgA==",
+ "hasInstallScript": true,
"engines": {
"node": ">=6"
}
@@ -4406,9 +4407,9 @@
},
"dependencies": {
"@fortawesome/fontawesome-pro": {
- "version": "5.12.1",
- "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/5.12.1/fontawesome-pro-5.12.1.tgz",
- "integrity": "sha512-rwVdMZQfTmN/6ExkA3sXN5fdiJWFYFuaDnBYCxhWEpgIzl14BYQMBLqRkQx/ITBnbITkoOLBpfJJHbZ0GKPjHw=="
+ "version": "6.5.1",
+ "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/6.5.1/fontawesome-pro-6.5.1.tgz",
+ "integrity": "sha512-XLi5HOQ3XLNtM9UhrCyT5jEj0RHkx5GfzKDmUPpVTea4C/Ekj5plOYVAp9dUWgH+NWo3IrVpwhsnhIFh/FZPgA=="
},
"ansi-colors": {
"version": "1.1.0",
diff --git a/ckanext/ckanext-apicatalog/package.json b/ckanext/ckanext-apicatalog/package.json
index 58b09d71..afc1245d 100644
--- 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"
},