Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 3e1f77bc authored by Arnaud Bey's avatar Arnaud Bey
Browse files

fontawesome 5

parent da3f0d63
......@@ -19,7 +19,6 @@ module.exports = function(grunt) {
},
files: {
"web/css/main.css": [
"bower_components/font-awesome/css/font-awesome.css",
'src/MagicWordBundle/Resources/public/css/main.css',
"bower_components/FlipClock/compiled/flipclock.css",
'src/MagicWordBundle/Resources/public/css/play.css',
......@@ -39,6 +38,7 @@ module.exports = function(grunt) {
dist: {
files: {
'web/js/main.js': [
"bower_components/font-awesome/js/all.js",
"bower_components/jquery/dist/jquery.min.js",
"bower_components/bootstrap/dist/js/bootstrap.bundle.min.js",
'web/bundles/fosjsrouting/js/router.js',
......@@ -117,13 +117,7 @@ module.exports = function(grunt) {
},
copy: {
// customisation to add font files from CSS libraries:
fonts: {
expand: true,
flatten: true,
cwd: '',
dest: 'web/fonts/',
src: ['bower_components/font-awesome/fonts/*']
},
files: {
src: ['CONTRIBUTORS.md'],
dest: 'web/files/'
......@@ -137,5 +131,5 @@ module.exports = function(grunt) {
});
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.registerTask('default', ["less", "uglify", "copy:fonts", "copy:files","copy:bootstrap"]);
grunt.registerTask('default', ["less", "uglify", "copy:files","copy:bootstrap"]);
};
......@@ -9,7 +9,7 @@
],
"dependencies": {
"bootstrap": "~4",
"font-awesome": "~4",
"font-awesome": "~5",
"FlipClock": "*",
"jquery": "~3.4",
"jquery-ui": "*",
......
......@@ -12,7 +12,7 @@
<div class="card">
<div class="card-body">
<p class="card-text">
<i class="fa fa-gamepad fa-4x" aria-hidden="true"></i> With supporting text below as a natural lead-in to additional content. With supporting text below as a natural lead-in to additional content.
<i class="fas fa-gamepad fa-4x"></i> With supporting text below as a natural lead-in to additional content. With supporting text below as a natural lead-in to additional content.
</p>
<a href="{{ path('home_play') }}" class="btn btn-primary">{{ 'play' | trans }}</a>
</div>
......
......@@ -12,7 +12,7 @@
<h5 class="card-header">S'entrainer</h5>
<div class="card-body">
<p>
<i class="fa fa-motorcycle fa-4x" aria-hidden="true"></i> Blabla Blab laBlabla BlablaBlabla Blabla Blabla
<i class="fas fa-running fa-4x" aria-hidden="true"></i> Blabla Blab laBlabla BlablaBlabla Blabla Blabla
</p>
{% for language in languages %}
<a class="please-wait card-link" data-message="Génération de la grille" href="{{ path('train', {id: language.id}) }}">
......@@ -27,7 +27,7 @@
<div class="card">
<h5 class="card-header">Défi</h5>
<div class="card-body">
<p><i class="fa fa-star fa-4x" aria-hidden="true"></i>
<p><i class="fas fa-people-carry fa-4x" aria-hidden="true"></i>
Blabla labla Blab laBlabla BlablaBlabla Blabla Blabla
</p>
<a class="card-link" href="{{ path('challenge') }}">{{ 'challenge_someone' | trans }}</a>
......@@ -52,7 +52,7 @@
<div class="card">
<h5 class="card-header">Parties en cours</h5>
<div class="card-body">
<p><i class="fa fa-long-arrow-right fa-4x" aria-hidden="true"></i>
<p><i class="fas fa-spinner fa-4x" aria-hidden="true"></i>
Blabla labla Blab laBlabla BlablaBlabla Blabla Blabla
</p>
<a class="card-link" href="{{ path('games_started') }}">{{ 'games_started' | trans }}</a>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment