Skip to content

Commit

Permalink
build: Bump font-awesome to 6.7.1
Browse files Browse the repository at this point in the history
and use the official npm package in favor of the unsupported EOL version.
Other than being maintained, this gets rid of a bbox warning in firefox.
  • Loading branch information
AiyionPrime committed Dec 13, 2024
1 parent 985b804 commit 1e5a727
Show file tree
Hide file tree
Showing 39 changed files with 22,508 additions and 5,036 deletions.
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<link href="css/grayscale.css" rel="stylesheet">

<!-- Custom Fonts -->
<link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="vendor/font-awesome/css/all.min.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">

Expand Down Expand Up @@ -151,13 +151,13 @@ <h2>Kontakt <span class="light">F</span>Norden e.V.</h2>
<a href="mailto:[email protected]" class="btn btn-default btn-lg"><i class="fa fa-envelope fa-fw"></i> <span class="network-name">Mail</span></a>
</li>
<li>
<a href="https://twitter.com/freifunkh" class="btn btn-default btn-lg"><i class="fa fa-twitter fa-fw"></i> <span class="network-name">Twitter</span></a>
<a href="https://twitter.com/freifunkh" class="btn btn-default btn-lg"><i class="fa-brands fa-twitter fa-fw"></i> <span class="network-name">Twitter</span></a>
</li>
<li>
<a href="https://github.com/freifunkh" class="btn btn-default btn-lg"><i class="fa fa-github fa-fw"></i> <span class="network-name">Github</span></a>
<a href="https://github.com/freifunkh" class="btn btn-default btn-lg"><i class="fa-brands fa-github fa-fw"></i> <span class="network-name">Github</span></a>
</li>
<li>
<a href="https://www.facebook.com/pages/FNorden-eV/1605175656419883" class="btn btn-default btn-lg"><i class="fa fa-facebook fa-fw"></i> <span class="network-name">Facebook</span></a>
<a href="https://www.facebook.com/pages/FNorden-eV/1605175656419883" class="btn btn-default btn-lg"><i class="fa-brands fa-facebook fa-fw"></i> <span class="network-name">Facebook</span></a>
</li>
</ul>
</div>
Expand Down
21 changes: 11 additions & 10 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"build:bootstrap": "rm -rf vendor/bootstrap; cp -r node_modules/bootstrap/dist/ vendor/bootstrap/",
"build:font-awesome": "rm -rf vendor/font-awesome; mkdir vendor/font-awesome; cp -r node_modules/font-awesome/css/ vendor/font-awesome/css/; cp -r node_modules/font-awesome/fonts/ vendor/font-awesome/fonts/;",
"build:font-awesome": "rm -rf vendor/font-awesome; mkdir vendor/font-awesome; cp -r node_modules/@fortawesome/fontawesome-free/css/ vendor/font-awesome/css/; cp -r node_modules/@fortawesome/fontawesome-free/webfonts/ vendor/font-awesome/webfonts/;",
"build:jquery": "cp node_modules/jquery/dist/jquery.min.js js/jquery.js",
"build:leaflet": "rm -rf vendor/leaflet; cp -r node_modules/leaflet/dist/ vendor/leaflet/",
"css:less": "lessc less/grayscale.less css/grayscale.css"
Expand All @@ -22,8 +22,8 @@
},
"homepage": "https://github.com/freifunkh/fnorden.net#readme",
"devDependencies": {
"@fortawesome/fontawesome-free": "^6.7.1",
"bootstrap": "^3.4.1",
"font-awesome": "^4.7.0",
"jquery": "^3.7.1",
"leaflet": "^1.9.4",
"less": "^4.2.1"
Expand Down
2 changes: 1 addition & 1 deletion satzung.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<link href="css/grayscale.css" rel="stylesheet">

<!-- Custom Fonts -->
<link href="vendor/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="vendor/font-awesome/css/all.min.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">

Expand Down
Loading

0 comments on commit 1e5a727

Please sign in to comment.