Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: fontawesome v6 #4020

Merged
merged 2 commits into from
Sep 20, 2024
Merged

feat: fontawesome v6 #4020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e8ed19
feat: fontawesome v6
SychO9 Sep 19, 2024
3292810
Merge branch '2.x' into sm/FA-6
SychO9 Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion framework/core/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
9 changes: 4 additions & 5 deletions framework/core/less/common/Iconography.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 1 deletion framework/core/src/Frontend/Compiler/LessCompiler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,12 @@ protected function compile(array $sources): string
$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
Expand Down
2 changes: 1 addition & 1 deletion framework/core/src/Frontend/FrontendServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function register(): void
);

$assets->setLessImportDirs([
$paths->vendor.'/components/font-awesome/less' => ''
$paths->vendor.'/components/font-awesome/css' => ''
]);

$assets->css($this->addBaseCss(...));
Expand Down
Loading