Skip to content

Commit 4d4d506

Browse files
committed
feature #969 Updated FontAwesome icons to 5.8 version (javiereguiluz)
This PR was squashed before being merged into the master branch (closes #969). Discussion ---------- Updated FontAwesome icons to 5.8 version There's not a big difference because we don't use lots of icons ... but they look better and a bit more modern. Note: this is entirely based on the work done by @ktrzos on https://github.com/EasyCorp/EasyAdminBundle/pull/2699/files Commits ------- ea03844 Updated FontAwesome icons to 5.8 version
2 parents 24f825e + ea03844 commit 4d4d506

31 files changed

+8847
-2714
lines changed

assets/scss/app.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ $lato-font-path: '~lato-font/fonts';
1010
@import "~bootswatch/flatly/variables";
1111
@import "~bootstrap-sass/assets/stylesheets/bootstrap";
1212
@import "~bootswatch/flatly/bootswatch";
13-
@import "~font-awesome/scss/font-awesome.scss";
13+
@import "~@fortawesome/fontawesome-free/css/all.css";
14+
@import "~@fortawesome/fontawesome-free/css/v4-shims.css";
1415
@import "~highlight.js/styles/solarized-light.css";
1516

1617
// pick the Lato fonts individually to avoid importing the entire font family

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"devDependencies": {
3+
"@fortawesome/fontawesome-free": "^5.8.1",
34
"@symfony/webpack-encore": "^0.26.0",
45
"bloodhound-js": "^1.2.3",
56
"bootstrap-sass": "^3.3.7",
67
"bootstrap-tagsinput": "^0.7.1",
78
"bootswatch": "^3.3.7",
89
"core-js": "^3.0.0",
910
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
10-
"font-awesome": "^4.7.0",
1111
"highlight.js": "^9.12.0",
1212
"imports-loader": "^0.8.0",
1313
"jquery": "^3.3.1",

public/build/2.1a0b5d31.js renamed to public/build/2.efa1b34f.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

public/build/admin.a52d124d.js renamed to public/build/admin.fcbdf98b.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/app.3ba31970.css

Lines changed: 0 additions & 14 deletions
This file was deleted.

public/build/app.956651a3.css

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

public/build/entrypoints.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"/build/runtime.1ba6bf05.js",
66
"/build/0.c90fd7d1.js",
77
"/build/1.a7e6a099.js",
8-
"/build/app.9d087b6d.js"
8+
"/build/app.d968f7b4.js"
99
],
1010
"css": [
11-
"/build/app.3ba31970.css"
11+
"/build/app.956651a3.css"
1212
]
1313
},
1414
"login": {
@@ -22,11 +22,11 @@
2222
"js": [
2323
"/build/runtime.1ba6bf05.js",
2424
"/build/0.c90fd7d1.js",
25-
"/build/2.1a0b5d31.js",
26-
"/build/admin.a52d124d.js"
25+
"/build/2.efa1b34f.js",
26+
"/build/admin.fcbdf98b.js"
2727
],
2828
"css": [
29-
"/build/admin.5ff4ed5a.css"
29+
"/build/admin.22af6b6d.css"
3030
]
3131
},
3232
"search": {
@@ -42,12 +42,12 @@
4242
"/build/runtime.1ba6bf05.js": "sha384-5WSgDNxkAY6j6/bzAcp3v//+PCXLgXCU3u5QgRXWiRfMnN4Ic/a/EF6HJnbRXik8",
4343
"/build/0.c90fd7d1.js": "sha384-FA3+8ecenjmV1Y751s0fKxGBNtyLBA8hDY4sqFoqvsCPOamLlA5ckhRBttBg1esp",
4444
"/build/1.a7e6a099.js": "sha384-Hzl+LtW/AmgisLfOcC+iJavxliy1Jo+6ZHQx6tpI+a7rAiHmtpwQXjNJ3S++W8fD",
45-
"/build/app.9d087b6d.js": "sha384-aBTepzTnPbLJJHay7+GXJjWy44Rr8TP/pDNaHnK+iV8OO9eMPRlWl6Xozx3AoIAD",
46-
"/build/app.3ba31970.css": "sha384-9DQxKZBNEM981CXqrUrUidI0YqFa5NdpLuDqG0nXWyd19go2LDEdB+vUDmR01KI6",
45+
"/build/app.d968f7b4.js": "sha384-aBTepzTnPbLJJHay7+GXJjWy44Rr8TP/pDNaHnK+iV8OO9eMPRlWl6Xozx3AoIAD",
46+
"/build/app.956651a3.css": "sha384-xl0uSYZbOM6LJel0KzxxR775djP/OfHetuMP3CQ4P2u9nR22DNTzQiZSn/KpBEVq",
4747
"/build/login.accd2411.js": "sha384-AnahE1JksyOZbxe/Gdg1twmMPucW4F1llK9OftiRo/Ud2L1ShQPtBLuN4MoCLb0f",
48-
"/build/2.1a0b5d31.js": "sha384-jRdE6zeuIS/Syq19jizvZZgeXTTZV+uMkLPJSB0dj6LfN5wcpTlA/cg7wvngvsU9",
49-
"/build/admin.a52d124d.js": "sha384-BkLDwzAqO1fdVgsYVHzQUvNMdxZQEuXp69877Xy2a47tUifkWtcmKJTyvkTrFDid",
50-
"/build/admin.5ff4ed5a.css": "sha384-tWgcs+J0ibheAChr5QgntS/7LMtyq4aG6UtLvVBHmxXnCglycTFayGns1vjk//6l",
48+
"/build/2.efa1b34f.js": "sha384-9dl5Ww46LD3oNY6DRlrBC55BAIxek/WM9UtDZkHqYYhEArp2bhE92WX47hO8hKL1",
49+
"/build/admin.fcbdf98b.js": "sha384-WUjuA0eQneXh3lch2au/1PamF7QluJ058id0ulV18pPtYqth8m+Rj7wnnUi7e0Sm",
50+
"/build/admin.22af6b6d.css": "sha384-tWgcs+J0ibheAChr5QgntS/7LMtyq4aG6UtLvVBHmxXnCglycTFayGns1vjk//6l",
5151
"/build/search.9f97b142.js": "sha384-5s1TWKIOKURbmNDZ7T8WvjCndmbonvVe69HxL2fY+mfXu5bEEN829itXQLf5eiLO"
5252
}
5353
}
85.6 KB
Binary file not shown.
Binary file not shown.
127 KB
Binary file not shown.
127 KB
Binary file not shown.
16.4 KB
Binary file not shown.
33.3 KB
Binary file not shown.
33.6 KB
Binary file not shown.
13.2 KB
Binary file not shown.
72.5 KB
Binary file not shown.
182 KB
Binary file not shown.
94 KB
Binary file not shown.
182 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)