Skip to content
This repository has been archived by the owner on Jan 14, 2022. It is now read-only.

Fontawesome Update - Closes #839 #840

Merged
merged 8 commits into from
Dec 10, 2018
Merged

Fontawesome Update - Closes #839 #840

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
acdbae3
added shims and added items on content-security-policy
Dec 5, 2018
874ffd0
updated pseudo element css
Dec 5, 2018
e1e4e7e
moved fontawesome v5 css files to app.js
Dec 10, 2018
6992999
modified
Dec 10, 2018
a65b975
Merge branch '2.2.0' into 839-fontawesome-update
MichalTuleja Dec 10, 2018
4216a39
removed font-awesome from contet security policy
Dec 10, 2018
0eb0677
Merge branch '839-fontawesome-update' of github.com:LiskHQ/lisk-explo…
Dec 10, 2018
ac9b9bc
added data to content security policy
Dec 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ app.use((req, res, next) => {
`frame-ancestors 'none';`,
`connect-src 'self' ${connectSrc} https://www.google-analytics.com;`,
`img-src 'self' https:;`,
`style-src 'self' 'unsafe-inline' https://fonts.googleapis.com;`,
`script-src 'self' 'unsafe-eval' 'unsafe-inline' https://tagmanager.google.com/ https://www.googletagmanager.com/ https://www.google-analytics.com/ https://dnn506yrbagrg.cloudfront.net/ https://*.ipify.org/ https://*.crazyegg.com/ http://trk.cetrk.com/ https://s3.amazonaws.com/trk.cetrk.com/;`,
`font-src 'self' https://fonts.gstatic.com data:`,
`style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://use.fontawesome.com/;`,
`script-src 'self' 'unsafe-eval' 'unsafe-inline' https://tagmanager.google.com/ https://www.googletagmanager.com/ https://www.google-analytics.com/ https://dnn506yrbagrg.cloudfront.net/ https://*.ipify.org/ https://*.crazyegg.com/ http://trk.cetrk.com/ https://s3.amazonaws.com/trk.cetrk.com/ https://use.fontawesome.com/;`,
`font-src 'self' https://fonts.gstatic.com https://use.fontawesome.com/;`,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

font-awesome references can be removed from the security policy

].join(' ');
/* eslint-enable */

Expand Down
11 changes: 6 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import 'angular-cookies';
// styles
import 'amstock3/amcharts/style.css';
import 'bootstrap/dist/css/bootstrap.css';
import 'font-awesome/css/font-awesome.css';
import '@fortawesome/fontawesome-free';
import 'leaflet/dist/leaflet.css';
import 'leaflet.markercluster/dist/MarkerCluster.Default.css';
import 'angular-advanced-searchbox/dist/angular-advanced-searchbox.min.css';
Expand Down
3 changes: 2 additions & 1 deletion src/assets/styles/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,8 @@ qrcode + span {

.btn-copy:before {
font-size: 14px;
font-family: "FontAwesome";
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f0ea";
}

Expand Down
3 changes: 2 additions & 1 deletion src/components/footer/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@
</div>
</div>
<div class="col-right col-sm-4 hidden-xs social-networks">
<a href="https://www.reddit.com/r/Lisk/" target="_blank" title="Reddit" class="link reddit-link"><i class="fa fa-reddit-square fa-2x"></i></a>
<a href="https://www.reddit.com/r/Lisk/" target="_blank" title="Reddit" class="link reddit-link"><i class="fa fa-reddit fa-2x"></i></a>
<a href="https://twitter.com/LiskHQ" target="_blank" title="Twitter" class="link twitter-link"><i class="fa fa-twitter fa-2x"></i></a>
<a href="https://github.com/LiskHQ/lisk-explorer" target="_blank" title="Github" class="link github-link"><i class="fa fa-github fa-2x"></i></a>
<a href="https://github.com/LiskHQ/lisk-explorer" target="_blank" title="Github" class="link github-link"><i class="fab fa-medium fa-2x"></i></a>
</div>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion src/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@
<link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
<link rel="mask-icon" href="safari-pinned-tab.svg" color="#ffffff">

<% if (htmlWebpackPlugin.options.serviceName && htmlWebpackPlugin.options.clientId) { %>
<meta name="<%= htmlWebpackPlugin.options.serviceName %>" content="<%= htmlWebpackPlugin.options.clientId %>">
<% } %>

<!--<link rel="stylesheet" href="/css/main.min.css">-->
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of using the <link> tag, the main CSS and the shim file can be imported directly in the src/app/app.js, in the styles section.

<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/v4-shims.css">
<base href="/">
</head>
<body data-ng-cloak class="ng-cloak">
Expand Down Expand Up @@ -74,5 +75,6 @@
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-NKNKGHL');</script>
<!-- End Google Tag Manager -->

</body>
</html>