Commit e3793843 authored by Carsten  Rose's avatar Carsten Rose

Merge branch '10433UmstellungaufFontAwesome5.0' into 'develop'

Refs #10433 - switch to Font Awesome 5

See merge request !264
parents cfffed40 4457c84e
Pipeline #3457 passed with stages
in 4 minutes and 22 seconds
......@@ -52,9 +52,11 @@ composer.lock
/extension/Documentation/html
/extension/Resources/Public/Css
/extension/Resources/Public/fonts
/extension/Resources/Public/webfonts
/extension/Resources/Public/JavaScript
/extension/Tests/selenium/tmp
/fonts
/webfonts
/js
/node_modules
/packages
......
......@@ -5,6 +5,7 @@ module.exports = function (grunt) {
var typo3_css = 'extension/Resources/Public/Css/';
var typo3_js = 'extension/Resources/Public/JavaScript/';
var typo3_fonts = 'extension/Resources/Public/fonts/';
var typo3_webfonts = 'extension/Resources/Public/webfonts/';
var js_sources = [
'javascript/src/Helper/*.js',
'javascript/src/Element/*.js',
......@@ -463,17 +464,20 @@ module.exports = function (grunt) {
fontAwesome: {
files: [
{
cwd: 'node_modules/font-awesome/css/',
cwd: 'node_modules/@fortawesome/fontawesome-free/css/',
src: [
'font-awesome.min.css'
'all.min.css'
],
dest: typo3_css,
filter: 'isFile',
expand: true,
flatten: true
flatten: true,
rename: function(dest, src) {
return dest + src.replace('all','font-awesome');
}
},
{
cwd: 'node_modules/font-awesome/css/',
cwd: 'node_modules/@fortawesome/fontawesome-free/css/',
src: [
'font-awesome.min.css'
],
......@@ -483,21 +487,21 @@ module.exports = function (grunt) {
flatten: true
},
{
cwd: 'node_modules/font-awesome/fonts/',
cwd: 'node_modules/@fortawesome/fontawesome-free/webfonts',
expand: true,
src: [
'*'
],
dest: typo3_fonts,
dest: typo3_webfonts,
flatten: true
},
{
cwd: 'node_modules/font-awesome/fonts/',
cwd: 'node_modules/@fortawesome/fontawesome-free/webfonts',
expand: true,
src: [
'*'
],
dest: 'fonts/',
dest: 'webfonts/',
flatten: true
}
]
......
......@@ -2,13 +2,13 @@
"name": "qfq",
"version": "1.0.0",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.13.0",
"bootlint": "^0.14.2",
"bootstrap": "^3.3.6",
"bootstrap-validator": "^0.11.5",
"chart.js": "^2.1.2",
"codemirror": "^5.24.0",
"corejs-typeahead": "^1.1.1",
"font-awesome": "^4.7.0",
"fullcalendar": "^3.10.1",
"grunt": "^1.0.4",
"grunt-concat-in-order": "^0.2.6",
......
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