github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-01 05:52:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix FontAwesome path

Browse Source
This commit is contained in:
Toby Zerner 2015-05-06 12:12:22 +09:30
parent e9d319e5ed
commit 0398ae923e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/less/admin/app.less
View File

@ -7,7 +7,7 @@
// We want to specify the @fa-font-path variable AFTER we import font awesome // We want to specify the @fa-font-path variable AFTER we import font awesome
// so that it overrides the default definition. // so that it overrides the default definition.
@import "@{lib-path}/font-awesome/font-awesome.less"; @import "@{lib-path}/font-awesome/font-awesome.less";
@fa-font-path: "/flarum/fonts"; @fa-font-path: "/assets/fonts";
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700,300); @import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700,300);

2
framework/core/less/forum/app.less
View File

@ -7,7 +7,7 @@
// We want to specify the @fa-font-path variable AFTER we import font awesome // We want to specify the @fa-font-path variable AFTER we import font awesome
// so that it overrides the default definition. // so that it overrides the default definition.
@import "@{lib-path}/font-awesome/font-awesome.less"; @import "@{lib-path}/font-awesome/font-awesome.less";
@fa-font-path: "/flarum/fonts"; @fa-font-path: "/assets/fonts";
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700,300); @import url(http://fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700,300);

2
framework/core/src/Admin/AdminServiceProvider.php
View File

@ -17,7 +17,7 @@ class AdminServiceProvider extends ServiceProvider
$this->loadViewsFrom($root.'/views', 'flarum.admin'); $this->loadViewsFrom($root.'/views', 'flarum.admin');
$this->publishes([ $this->publishes([
$root.'/public/fonts' => public_path('flarum/fonts') $root.'/public/fonts' => public_path('assets/fonts')
]); ]);
include __DIR__.'/routes.php'; include __DIR__.'/routes.php';

2
framework/core/src/Forum/ForumServiceProvider.php
View File

@ -17,7 +17,7 @@ class ForumServiceProvider extends ServiceProvider
$this->loadViewsFrom($root.'/views', 'flarum.forum'); $this->loadViewsFrom($root.'/views', 'flarum.forum');
$this->publishes([ $this->publishes([
$root.'/public/fonts' => public_path('flarum/fonts') $root.'/public/fonts' => public_path('assets/fonts')
]); ]);
include __DIR__.'/routes.php'; include __DIR__.'/routes.php';