diff --git a/package-lock.json b/package-lock.json index 4382044cc..7eeee6b1d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,12 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@fortawesome/fontawesome-free": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.5.0.tgz", + "integrity": "sha512-p4lu0jfj5QN013ddArh99r3OXZ/fp9rbovs62LfaO70OMBsAXxtNd0lAq/97fitrscR0fqfd+/a5KNcp6Sh/0A==", + "dev": true + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -5535,11 +5541,6 @@ } } }, - "font-awesome": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", - "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=" - }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", diff --git a/package.json b/package.json index d8f5bd610..d263ac22d 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "express": "^4.16.3", "fast-safe-stringify": "^1.2.0", "flatstr": "^1.0.5", - "font-awesome": "^4.7.0", "hiredis": "^0.5.0", "http-status-codes": "^1.3.0", "jquery": "^3.2.1", @@ -88,6 +87,7 @@ "underscore": "^1.8.3" }, "devDependencies": { + "@fortawesome/fontawesome-free": "^5.5.0", "babel-core": "^6.24.0", "babel-loader": "^7.1.4", "babel-plugin-istanbul": "^4.1.4", diff --git a/src/app/app.js b/src/app/app.js index 14fc9cb02..337dab390 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -29,6 +29,8 @@ import 'bootstrap/dist/css/bootstrap.css'; import 'leaflet/dist/leaflet.css'; import 'leaflet.markercluster/dist/MarkerCluster.Default.css'; import 'angular-advanced-searchbox/dist/angular-advanced-searchbox.min.css'; +import '@fortawesome/fontawesome-free/css/all.css'; +import '@fortawesome/fontawesome-free/css/v4-shims.css'; import '../assets/styles/common.css'; import '../assets/styles/flags.css'; import '../assets/styles/tableMobile.css'; diff --git a/src/assets/styles/common.css b/src/assets/styles/common.css index 070a702a7..8a13aa4f4 100644 --- a/src/assets/styles/common.css +++ b/src/assets/styles/common.css @@ -1052,7 +1052,8 @@ qrcode + span { .btn-copy:before { font-size: 14px; - font-family: "FontAwesome"; + font-family: "Font Awesome 5 Free"; + font-weight: 900; content: "\f0ea"; } diff --git a/src/components/footer/footer.html b/src/components/footer/footer.html index 643e227f4..775115414 100644 --- a/src/components/footer/footer.html +++ b/src/components/footer/footer.html @@ -33,7 +33,7 @@ - Blog/Medium + diff --git a/src/index.ejs b/src/index.ejs index f86a6fe62..28b909cf8 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -32,11 +32,9 @@ - <% if (htmlWebpackPlugin.options.serviceName && htmlWebpackPlugin.options.clientId) { %> <% } %> - @@ -74,5 +72,6 @@ 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','GTM-NKNKGHL'); +