From 942dabadcdcd5dcbde53348d7c42552aa4e54b4f Mon Sep 17 00:00:00 2001 From: Max Miller Date: Wed, 11 Apr 2018 17:39:41 +1000 Subject: [PATCH] Updates site to use Font Awesome version 5 --- bans.php | 2 +- config/config.template.php | 6 +++--- config/news/news1.md | 4 ++-- css/style.css | 6 +++--- include/header.php | 39 +++++++++++++++++++++----------------- index.php | 4 ++-- js/script.js | 4 ++-- js/status.js | 16 ++++++++-------- rules.php | 2 +- viewer.php | 2 +- 10 files changed, 45 insertions(+), 40 deletions(-) diff --git a/bans.php b/bans.php index c662096..a9e20c5 100644 --- a/bans.php +++ b/bans.php @@ -15,7 +15,7 @@ $banlist = $cacheutils->getValue();
-

+

diff --git a/config/config.template.php b/config/config.template.php index a0f359c..9c6b9e5 100644 --- a/config/config.template.php +++ b/config/config.template.php @@ -44,9 +44,9 @@ $config['teamspeak']['displayip'] = 'ts.server.net'; // IP shown to us // TEMPLATE: (ICON is an icon name from: http://fontawesome.io/icons/) // $config["navlinks"][] = ["icon", "displayed text", "link"]; -$config["navlinks"][] = ["fa-facebook-official", "Facebook", "https://facebook.com/Facebook"]; -$config["navlinks"][] = ["fa-twitter-square", "Twitter", "https://twitter.com/Twitter"]; -$config["navlinks"][] = ["fa-comments", "Forum", "forum"]; +$config["navlinks"][] = ["fab fa-facebook-square", "Facebook", "https://facebook.com/Facebook"]; +$config["navlinks"][] = ["fab fa-twitter-square", "Twitter", "https://twitter.com/Twitter"]; +$config["navlinks"][] = ["fas fa-comments", "Forum", "forum"]; diff --git a/config/news/news1.md b/config/news/news1.md index 96e3928..09495b7 100644 --- a/config/news/news1.md +++ b/config/news/news1.md @@ -3,11 +3,11 @@ Wruczek, 2016-10-26, 21:00 You can add, change and remove news as a separate Markdown files located in `config/news` folder with extension `.md`. -I recommend following John Gruber's excellent markdown guide, found right under this text . It's really worth reading. To view the code that makes up the guide, go to `config/news/news2.md`. +I recommend following John Gruber's excellent markdown guide, found right under this text . It's really worth reading. To view the code that makes up the guide, go to `config/news/news2.md`. I can also recommend GitHub's ["Mastering Markdown"](https://guides.github.com/features/mastering-markdown/) guide. -**PS**: You can mix Markdown with HTML to add cool stuff like icons , or even a full YouTube player with video! +**PS**: You can mix Markdown with HTML to add cool stuff like icons , or even a full YouTube player with video! diff --git a/css/style.css b/css/style.css index b1bf810..9204850 100644 --- a/css/style.css +++ b/css/style.css @@ -1,4 +1,4 @@ -.fa { +.svg-inline--fa { margin-right: 5px } @@ -20,7 +20,7 @@ a { text-align: right } -.pull-right .fa { +.pull-right .svg-inline--fa { margin-right: 0 } @@ -39,7 +39,7 @@ p, a { /* STATUS */ /* ****** */ -.serverstatus p, .serverstatus .label .fa { +.serverstatus p, .serverstatus .label .svg-inline--fa { margin: 0 } diff --git a/include/header.php b/include/header.php index 67ef01e..11c519f 100644 --- a/include/header.php +++ b/include/header.php @@ -28,7 +28,7 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php"; - + @@ -72,16 +72,16 @@ $htalink = $config["general"]["enablehta"] ? "" : ".php";