Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

font awesome bump to 6.7.2 #13740

Merged
merged 2 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions code/modules/asset_cache/asset_list_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,11 @@

/datum/asset/simple/fontawesome
assets = list(
"fa-regular-400.eot" = 'html/font-awesome/webfonts/fa-regular-400.eot',
"fa-regular-400.woff" = 'html/font-awesome/webfonts/fa-regular-400.woff',
"fa-solid-900.eot" = 'html/font-awesome/webfonts/fa-solid-900.eot',
"fa-solid-900.woff" = 'html/font-awesome/webfonts/fa-solid-900.woff',
"v4shim.css" = 'html/font-awesome/css/v4-shims.min.css',
"font-awesome.css" = 'html/font-awesome/css/all.min.css'
"fa-regular-400.ttf" = 'html/font-awesome/webfonts/fa-regular-400.ttf',
"fa-solid-900.ttf" = 'html/font-awesome/webfonts/fa-solid-900.ttf',
"fa-v4compatibility.ttf" = 'html/font-awesome/webfonts/fa-v4compatibility.ttf',
"v4shim.css" = 'html/font-awesome/css/v4-shims.min.css',
"font-awesome.css" = 'html/font-awesome/css/all.min.css'
)

/datum/asset/simple/spider_os
Expand Down
8 changes: 3 additions & 5 deletions html/font-awesome/README.MD
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
Due to the fact browse_rsc can't create subdirectories, every time you update font-awesome you'll need to change relative webfont references in all.min.css
eg ../webfonts/fa-regular-400.ttf => fa-regular-400.ttf (or whatever you call it in asset datum)
Due to the fact browse_rsc can't create subdirectories, every time you update font-awesome you'll need to ensure the relative webfont references in all.min.css
are correct eg ../webfonts/fa-regular-400.ttf => fa-regular-400.ttf (or whatever you call it in asset datum)

Second change is ripping out file types other than woff and eot(ie8) from the css

Finally, removing brand related css.
Finally, removing brand related css. You can do this by formatting the css, removing them manually (or some regex?) and then minifying it.
5 changes: 3 additions & 2 deletions html/font-awesome/css/all.min.css

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions html/font-awesome/css/v4-shims.min.css

Large diffs are not rendered by default.

Binary file removed html/font-awesome/webfonts/fa-regular-400.eot
Binary file not shown.
Binary file added html/font-awesome/webfonts/fa-regular-400.ttf
Binary file not shown.
Binary file removed html/font-awesome/webfonts/fa-regular-400.woff
Binary file not shown.
Binary file removed html/font-awesome/webfonts/fa-solid-900.eot
Binary file not shown.
Binary file added html/font-awesome/webfonts/fa-solid-900.ttf
Binary file not shown.
Binary file removed html/font-awesome/webfonts/fa-solid-900.woff
Binary file not shown.
Binary file added html/font-awesome/webfonts/fa-v4compatibility.ttf
Binary file not shown.
Loading