Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-25 18:47:50 +01:00
Code Issues Projects Releases Wiki Activity

Font Awesome is now loaded through an HTML <link> instead of JS. Furthermore both FA4 and FA5 are now supported.

Browse Source
This commit is contained in:
Julian van Doorn 2018-06-19 16:28:41 +02:00
parent 1a6bebe064
commit 3e270dc41c
6 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plan/src/main/resources/web/error.html
View File

@ -31,6 +31,10 @@
<!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
<link href="css/themes/all-themes.css" rel="stylesheet"/>
<!-- Font Awesome -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
</head>
<body class="theme-red">
@ -250,9 +254,6 @@
<!-- Waves Effect Plugin Js -->
<script src="plugins/node-waves/waves.js"></script>
<!-- Font Awesome -->
<script src="plugins/font-awesome/fa-script.js"></script>
<!-- Header, Sidenav & Skin changer -->
<script src="js/admin.js"></script>
@ -260,4 +261,4 @@
<script src="js/demo.js"></script>
</body>
</html>
</html>

9
Plan/src/main/resources/web/network.html
View File

@ -34,6 +34,10 @@
<!-- Jquery Core Js -->
<script src="plugins/jquery/jquery.min.js"></script>
<!-- Font Awesome -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
</head>
<body class="theme-red">
@ -378,9 +382,6 @@
<script src="https://code.highcharts.com/mapdata/custom/world.js"></script>
<script src="https://code.highcharts.com/modules/no-data-to-display.js"></script>
<!-- Font Awesome -->
<script src="plugins/font-awesome/fa-script.js"></script>
<!-- Header, Sidenav & Skin changer -->
<script src="js/admin.js"></script>
@ -474,4 +475,4 @@
<script src="js/demo.js"></script>
</body>
</html>
</html>

9
Plan/src/main/resources/web/player.html
View File

@ -31,6 +31,10 @@
<!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
<link href="../css/themes/all-themes.css" rel="stylesheet"/>
<!-- Font Awesome -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
</head>
<body class="theme-red">
@ -681,9 +685,6 @@
<script src='../plugins/momentjs/moment.js'></script>
<script src='../plugins/fullcalendar/fullcalendar.min.js'></script>
<!-- Font Awesome -->
<script src="../plugins/font-awesome/fa-script.js"></script>
<!-- Header, Sidenav & Skin changer -->
<script src="../js/admin.js"></script>
@ -786,4 +787,4 @@
<script src="../js/demo.js"></script>
</body>
</html>
</html>

9
Plan/src/main/resources/web/players.html
View File

@ -31,6 +31,10 @@
<!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
<link href="css/themes/all-themes.css" rel="stylesheet"/>
<!-- Font Awesome -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
</head>
<body class="theme-red">
@ -278,9 +282,6 @@
<script src="plugins/jquery-datatable/jquery.dataTables.js"></script>
<script src="plugins/jquery-datatable/skin/bootstrap/js/dataTables.bootstrap.js"></script>
<!-- Font Awesome -->
<script src="plugins/font-awesome/fa-script.js"></script>
<!-- Header, Sidenav & Skin changer -->
<script src="js/admin.js"></script>
@ -341,4 +342,4 @@
<script src="js/demo.js"></script>
</body>
</html>
</html>

18
Plan/src/main/resources/web/plugins/font-awesome/fa-script.js
View File

File diff suppressed because one or more lines are too long

9
Plan/src/main/resources/web/server.html
View File

@ -34,6 +34,10 @@
<!-- Jquery Core Js -->
<script src="plugins/jquery/jquery.min.js"></script>
<!-- Font Awesome -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
</head>
<body class="theme-red">
@ -1111,9 +1115,6 @@
<script src="https://code.highcharts.com/modules/solid-gauge.js"></script>
<script src="https://code.highcharts.com/modules/no-data-to-display.js"></script>
<!-- Font Awesome -->
<script src="plugins/font-awesome/fa-script.js"></script>
<!-- Header, Sidenav & Skin changer -->
<script src="js/admin.js"></script>
@ -1402,4 +1403,4 @@
<script src="js/demo.js"></script>
</body>
</html>
</html>