github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-22 03:51:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: fontawesome v6 (#4020)

Browse Source
This commit is contained in:
Sami Mazouz 2024-09-20 08:27:08 +01:00 committed by GitHub
parent c28eee59b3
commit f13a1c8387
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -107,12 +107,13 @@
"require": {
"php": "^8.2",
"ext-json": "*",
"components/font-awesome": "^5.15.0",
"components/font-awesome": "^6.5.2",
"composer/composer": "^2.7",
"dflydev/fig-cookies": "^3.0",
"doctrine/dbal": "^3.6.2",
"dragonmantank/cron-expression": "^3.3",
"fakerphp/faker": "^1.9.1",
"flarum/json-api-server": "^0.1.0",
"franzl/whoops-middleware": "2.0",
"guzzlehttp/guzzle": "*",
"illuminate/bus": "^11.0",
@ -161,7 +162,6 @@
"symfony/postmark-mailer": "^7.0",
"symfony/translation": "^7.0",
"symfony/yaml": "^7.0",
"flarum/json-api-server": "^0.1.0",
"wikimedia/less.php": "^4.1"
},
"require-dev": {

2
framework/core/composer.json
View File

@ -37,7 +37,7 @@
},
"require": {
"php": "^8.2",
"components/font-awesome": "^5.15.0",
"components/font-awesome": "^6.5.2",
"dflydev/fig-cookies": "^3.0",
"doctrine/dbal": "^3.6",
"dragonmantank/cron-expression": "*",

9
framework/core/less/common/Iconography.less
View File

@ -1,5 +1,4 @@
@import "fontawesome";
@import "brands";
@import "regular";
@import "solid";
@fa-font-path: "./fonts";
@import (inline) "fontawesome.css";
@import (inline) "brands.css";
@import (inline) "regular.css";
@import (inline) "solid.css";

7
framework/core/src/Frontend/Compiler/LessCompiler.php
View File

@ -96,7 +96,12 @@ class LessCompiler extends RevisionCompiler
$parser->registerFunction($name, $callback);
}
return $parser->getCss();
return $this->finalize($parser->getCss());
}
protected function finalize(string $parsedCss): string
{
return str_replace('url("../webfonts/', 'url("./fonts/', $parsedCss);
}
protected function overrideSources(array $sources): array

2
framework/core/src/Frontend/FrontendServiceProvider.php
View File

@ -48,7 +48,7 @@ class FrontendServiceProvider extends AbstractServiceProvider
);
$assets->setLessImportDirs([
$paths->vendor.'/components/font-awesome/less' => ''
$paths->vendor.'/components/font-awesome/css' => ''
]);
$assets->css($this->addBaseCss(...));