Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to Font Awesome 5

Browse Source
This commit is contained in:
Pig Fang 2018-08-08 12:30:50 +08:00
parent f0e177d62d
commit b0bdc3e7b2
27 changed files with 70 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers.php
View File

@ -213,14 +213,14 @@ if (! function_exists('bs_menu')) {
$content .= "<li{$attr}>"; $content .= "<li{$attr}>";
if (isset($value['children'])) { if (isset($value['children'])) {
$content .= sprintf('<a href="#"><i class="fa %s"></i> <span>%s</span><span class="pull-right-container"><i class="fa fa-angle-left pull-right"></i></span></a>', $value['icon'], trans($value['title'])); $content .= sprintf('<a href="#"><i class="fas %s"></i> &nbsp;<span>%s</span><span class="pull-right-container"><i class="fas fa-angle-left pull-right"></i></span></a>', $value['icon'], trans($value['title']));
// recurse // recurse
$content .= '<ul class="treeview-menu">'.bs_menu_render($value['children']).'</ul>'; $content .= '<ul class="treeview-menu">'.bs_menu_render($value['children']).'</ul>';
} else { } else {
if ($value) { if ($value) {
$content .= sprintf( $content .= sprintf(
'<a href="%s"><i class="fa %s"></i> <span>%s</span></a>', '<a href="%s"><i class="fas %s"></i> &nbsp;<span>%s</span></a>',
url((string) $value['link']), url((string) $value['link']),
(string) $value['icon'], (string) $value['icon'],
trans((string) $value['title']) trans((string) $value['title'])

4
config/menu.php
View File

@ -9,14 +9,14 @@
*/ */
$menu['user'] = [ $menu['user'] = [
['title' => 'general.dashboard', 'link' => 'user', 'icon' => 'fa-dashboard'], ['title' => 'general.dashboard', 'link' => 'user', 'icon' => 'fa-tachometer-alt'],
['title' => 'general.my-closet', 'link' => 'user/closet', 'icon' => 'fa-star'], ['title' => 'general.my-closet', 'link' => 'user/closet', 'icon' => 'fa-star'],
['title' => 'general.player-manage', 'link' => 'user/player', 'icon' => 'fa-users'], ['title' => 'general.player-manage', 'link' => 'user/player', 'icon' => 'fa-users'],
['title' => 'general.profile', 'link' => 'user/profile', 'icon' => 'fa-user'], ['title' => 'general.profile', 'link' => 'user/profile', 'icon' => 'fa-user'],
]; ];
$menu['admin'] = [ $menu['admin'] = [
['title' => 'general.dashboard', 'link' => 'admin', 'icon' => 'fa-dashboard'], ['title' => 'general.dashboard', 'link' => 'admin', 'icon' => 'fa-tachometer-alt'],
['title' => 'general.user-manage', 'link' => 'admin/users', 'icon' => 'fa-users'], ['title' => 'general.user-manage', 'link' => 'admin/users', 'icon' => 'fa-users'],
['title' => 'general.player-manage', 'link' => 'admin/players', 'icon' => 'fa-gamepad'], ['title' => 'general.player-manage', 'link' => 'admin/players', 'icon' => 'fa-gamepad'],
['title' => 'general.customize', 'link' => 'admin/customize', 'icon' => 'fa-paint-brush'], ['title' => 'general.customize', 'link' => 'admin/customize', 'icon' => 'fa-paint-brush'],

2
package.json
View File

@ -22,12 +22,12 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.0.0-beta.55", "@babel/runtime": "^7.0.0-beta.55",
"@fortawesome/fontawesome-free": "^5.2.0",
"admin-lte": "^2.4.2", "admin-lte": "^2.4.2",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"bootstrap-fileinput": "^4.4.7", "bootstrap-fileinput": "^4.4.7",
"chart.js": "^2.7.1", "chart.js": "^2.7.1",
"es6-promise": "^4.2.4", "es6-promise": "^4.2.4",
"font-awesome": "^4.7.0",
"highlight.js": "^9.12.0", "highlight.js": "^9.12.0",
"icheck": "^1.0.2", "icheck": "^1.0.2",
"jquery": "^3.3.1", "jquery": "^3.3.1",

8
resources/assets/src/components/common/Previewer.vue
View File

@ -9,21 +9,21 @@
data-toggle="tooltip" data-toggle="tooltip"
data-placement="bottom" data-placement="bottom"
:title="$t('general.walk') + ' / ' + $t('general.run')" :title="$t('general.walk') + ' / ' + $t('general.run')"
class="fa fa-forward" class="fas fa-forward"
></i> ></i>
<i <i
@click="toggleRotate" @click="toggleRotate"
data-toggle="tooltip" data-toggle="tooltip"
data-placement="bottom" data-placement="bottom"
:title="$t('general.rotation')" :title="$t('general.rotation')"
class="fa fa-repeat" class="fas fa-redo-alt"
></i> ></i>
<i <i
@click="togglePause" @click="togglePause"
data-toggle="tooltip" data-toggle="tooltip"
data-placement="bottom" data-placement="bottom"
:title="$t('general.pause')" :title="$t('general.pause')"
class="fa" class="fas"
:class="{ 'fa-pause': !paused, 'fa-play': paused }" :class="{ 'fa-pause': !paused, 'fa-play': paused }"
></i> ></i>
<i <i
@ -31,7 +31,7 @@
data-toggle="tooltip" data-toggle="tooltip"
data-placement="bottom" data-placement="bottom"
:title="$t('general.reset')" :title="$t('general.reset')"
class="fa fa-stop" class="fas fa-stop"
></i> ></i>
</div> </div>
</h3> </h3>

4
resources/assets/src/components/user/ClosetItem.vue
View File

@ -14,14 +14,14 @@
class="more" class="more"
data-toggle="tooltip" data-toggle="tooltip"
data-placement="bottom" data-placement="bottom"
><i class="fa fa-share"></i></a> ><i class="fas fa-share-alt"></i></a>
<span <span
:title="$t('general.more')" :title="$t('general.more')"
class="more" class="more"
data-toggle="dropdown" data-toggle="dropdown"
aria-haspopup="true" aria-haspopup="true"
id="more-button" id="more-button"
><i class="fa fa-cog"></i></span> ><i class="fas fa-cog"></i></span>
<ul class="dropup dropdown-menu" aria-labelledby="more-button"> <ul class="dropup dropdown-menu" aria-labelledby="more-button">
<li><a @click="rename" v-t="'user.renameItem'"></a></li> <li><a @click="rename" v-t="'user.renameItem'"></a></li>

4
resources/assets/src/components/user/Dashboard.vue
View File

@ -42,7 +42,7 @@
</div><!-- ./box-body --> </div><!-- ./box-body -->
<div class="box-footer"> <div class="box-footer">
<button v-if="canSign" class="btn btn-primary pull-left" @click="sign"> <button v-if="canSign" class="btn btn-primary pull-left" @click="sign">
<i class="fa fa-calendar-check-o" aria-hidden="true"></i> &nbsp;{{ $t('user.sign') }} <i class="far fa-calendar-check" aria-hidden="true"></i> &nbsp;{{ $t('user.sign') }}
</button> </button>
<button <button
v-else v-else
@ -50,7 +50,7 @@
:title="$t('user.last-sign', { time: lastSignAt.toLocaleString() })" :title="$t('user.last-sign', { time: lastSignAt.toLocaleString() })"
disabled disabled
> >
<i class="fa fa-calendar-check-o" aria-hidden="true"></i> &nbsp; <i class="far fa-calendar-check" aria-hidden="true"></i> &nbsp;
{{ remainingTimeText }} {{ remainingTimeText }}
</button> </button>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->

5
resources/assets/src/stylus/common.styl
View File

@ -20,6 +20,11 @@ body, h1, h2, h3, h4, h5, h6 {
font-family: Minecraft; font-family: Minecraft;
} }
// AdminLTE 2 is not compatible with Font Awesome 5
.main-header .sidebar-toggle::before {
content: '';
}
#toast-container > div { #toast-container > div {
opacity: 1; opacity: 1;
filter: "alpha(opacity=100)"; filter: "alpha(opacity=100)";

2
resources/assets/tests/components/common/Previewer.test.js
View File

@ -76,7 +76,7 @@ test('toggle run', () => {
test('toggle rotate', () => { test('toggle rotate', () => {
const wrapper = mount(Previewer); const wrapper = mount(Previewer);
wrapper.find('.fa-repeat').trigger('click'); wrapper.find('.fa-redo-alt').trigger('click');
expect(wrapper.vm.handles.rotate.paused).toBeTrue(); expect(wrapper.vm.handles.rotate.paused).toBeTrue();
}); });

2
resources/lang/en/front-end.yml
View File

@ -96,7 +96,7 @@ user:
profile: profile:
avatar: avatar:
title: Change Avatar? title: Change Avatar?
notice: Click the gear icon「<i class="fa fa-cog"></i>」of any skin in your skinlib, then click 「Set as avatar」. We will cut the head segment of that skin for you. If there is no icon like this, please unable the extensions like ADBlock. notice: Click the gear icon「<i class="fas fa-cog"></i>」of any skin in your skinlib, then click 「Set as avatar」. We will cut the head segment of that skin for you. If there is no icon like this, please unable the extensions like ADBlock.
password: password:
title: Change Password title: Change Password

2
resources/lang/en/user.yml
View File

@ -115,7 +115,7 @@ player:
profile: profile:
avatar: avatar:
title: Change Avatar? title: Change Avatar?
notice: Click the gear icon「<i class="fa fa-cog"></i>」of any skin in your skinlib, then click 「Set as avatar」. We will cut the head segment of that skin for you. If there is no icon like this, please unable the extensions like ADBlock. notice: Click the gear icon「<i class="fas fa-cog"></i>」of any skin in your skinlib, then click 「Set as avatar」. We will cut the head segment of that skin for you. If there is no icon like this, please unable the extensions like ADBlock.
wrong-type: You can't set a cape as avatar wrong-type: You can't set a cape as avatar
success: Avatar setted successfully success: Avatar setted successfully

2
resources/lang/zh_CN/front-end.yml
View File

@ -96,7 +96,7 @@ user:
profile: profile:
avatar: avatar:
title: 更改头像？ title: 更改头像？
notice: 请在衣柜中任意皮肤的右下角「<i class="fa fa-cog"></i>」处选择「设为头像」，将会自动截取该皮肤的头部作为头像哦~ 如果看不到这个图标，请关闭 ADBlock，ABP 之类的广告过滤扩展。 notice: 请在衣柜中任意皮肤的右下角「<i class="fas fa-cog"></i>」处选择「设为头像」，将会自动截取该皮肤的头部作为头像哦~ 如果看不到这个图标，请关闭 ADBlock，ABP 之类的广告过滤扩展。
password: password:
title: 更改密码 title: 更改密码

2
resources/lang/zh_CN/user.yml
View File

@ -112,7 +112,7 @@ player:
profile: profile:
avatar: avatar:
title: 更改头像？ title: 更改头像？
notice: 请在衣柜中任意皮肤的右下角「<i class="fa fa-cog"></i>」处选择「设为头像」，将会自动截取该皮肤的头部作为头像哦~ 如果看不到这个图标，请关闭 ADBlock，ABP 之类的广告过滤扩展。 notice: 请在衣柜中任意皮肤的右下角「<i class="fas fa-cog"></i>」处选择「设为头像」，将会自动截取该皮肤的头部作为头像哦~ 如果看不到这个图标，请关闭 ADBlock，ABP 之类的广告过滤扩展。
wrong-type: 披风可不能设置为头像哦~ wrong-type: 披风可不能设置为头像哦~
success: 设置成功！ success: 设置成功！

2
resources/views/admin/customize.tpl
View File

@ -33,7 +33,7 @@
@foreach([$color, "$color-light"] as $innerColor) @foreach([$color, "$color-light"] as $innerColor)
<tr> <tr>
<td>@lang("admin.customize.colors.$innerColor")</td> <td>@lang("admin.customize.colors.$innerColor")</td>
<td><a href="#" data-skin="skin-{{ $innerColor }}" class="btn bg-{{ $color }} btn-xs"><i class="fa fa-eye"></i></a></td> <td><a href="#" data-skin="skin-{{ $innerColor }}" class="btn bg-{{ $color }} btn-xs"><i class="far fa-eye"></i></a></td>
</tr> </tr>
@endforeach @endforeach
@endforeach @endforeach

16
resources/views/admin/index.tpl
View File

@ -22,7 +22,7 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="info-box"> <div class="info-box">
<a href="{{ url('admin/users') }}"> <a href="{{ url('admin/users') }}">
<span class="info-box-icon bg-aqua"><i class="fa fa-users"></i></span> <span class="info-box-icon bg-aqua"><i class="fas fa-users"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text">@lang('admin.index.total-users')</span> <span class="info-box-text">@lang('admin.index.total-users')</span>
<span class="info-box-number">{{ App\Models\User::count() }}</span> <span class="info-box-number">{{ App\Models\User::count() }}</span>
@ -34,7 +34,7 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="info-box"> <div class="info-box">
<a href="{{ url('admin/players') }}"> <a href="{{ url('admin/players') }}">
<span class="info-box-icon bg-green"><i class="fa fa-gamepad"></i></span> <span class="info-box-icon bg-green"><i class="fas fa-gamepad"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text">@lang('admin.index.total-players')</span> <span class="info-box-text">@lang('admin.index.total-players')</span>
<span class="info-box-number">{{ App\Models\Player::count() }}</span> <span class="info-box-number">{{ App\Models\Player::count() }}</span>
@ -45,7 +45,7 @@
</div> </div>
<div class="info-box"> <div class="info-box">
<span class="info-box-icon bg-aqua" style="background-color: #605ca8 !important;"><i class="fa fa-files-o"></i></span> <span class="info-box-icon bg-aqua" style="background-color: #605ca8 !important;"><i class="far fa-file"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text">@lang('admin.index.total-textures')</span> <span class="info-box-text">@lang('admin.index.total-textures')</span>
<span class="info-box-number">{{ App\Models\Texture::count() }}</span> <span class="info-box-number">{{ App\Models\Texture::count() }}</span>
@ -53,10 +53,12 @@
</div><!-- /.info-box --> </div><!-- /.info-box -->
<div class="info-box"> <div class="info-box">
<span class="info-box-icon bg-yellow"><i class="fa fa-hdd-o"></i></span> <span class="info-box-icon bg-yellow"><i class="far fa-hdd"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text">@lang('admin.index.disk-usage')</span> <span class="info-box-text">@lang('admin.index.disk-usage')</span>
<?php $size = DB::table('textures')->sum('size') ?: 0; ?> @php
$size = DB::table('textures')->sum('size') ?: 0;
@endphp
<span class="info-box-number">{{ $size > 1024 ? round($size / 1024, 1)."MB" : $size."KB" }}</span> <span class="info-box-number">{{ $size > 1024 ? round($size / 1024, 1)."MB" : $size."KB" }}</span>
</div><!-- /.info-box-content --> </div><!-- /.info-box-content -->
</div><!-- /.info-box --> </div><!-- /.info-box -->
@ -66,8 +68,8 @@
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">@lang('admin.index.overview')</h3> <h3 class="box-title">@lang('admin.index.overview')</h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button> <button class="btn btn-box-tool" data-widget="collapse"><i class="fas fa-minus"></i></button>
<button class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button> <button class="btn btn-box-tool" data-widget="remove"><i class="fas fa-times"></i></button>
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">

7
resources/views/admin/master.tpl
View File

@ -26,7 +26,7 @@
<!-- Logo --> <!-- Logo -->
<a href="{{ option('site_url') }}" class="logo"> <a href="{{ option('site_url') }}" class="logo">
<!-- mini logo for sidebar mini 50x50 pixels --> <!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"> <i class="fa fa-bookmark"></i> </span> <span class="logo-mini"> <i class="fas fa-bookmark"></i> </span>
<!-- logo for regular state and mobile devices --> <!-- logo for regular state and mobile devices -->
<span class="logo-lg">{{ option_localized('site_name') }}</span> <span class="logo-lg">{{ option_localized('site_name') }}</span>
</a> </a>
@ -35,6 +35,7 @@
<nav class="navbar navbar-static-top" role="navigation"> <nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button--> <!-- Sidebar toggle button-->
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button"> <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
<i class="fas fa-bars"></i>
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
</a> </a>
<!-- Navbar Right Menu --> <!-- Navbar Right Menu -->
@ -60,7 +61,7 @@
</div> </div>
<div class="pull-left info"> <div class="pull-left info">
<p class="nickname">{{ bs_nickname($user) }}</p> <p class="nickname">{{ bs_nickname($user) }}</p>
<i class="fa fa-circle text-success"></i> {{ bs_role($user) }} <i class="fas fa-circle text-success"></i> {{ bs_role($user) }}
</div> </div>
</div> </div>
@ -70,7 +71,7 @@
{!! bs_menu('admin') !!} {!! bs_menu('admin') !!}
<li class="header">@lang('general.back')</li> <li class="header">@lang('general.back')</li>
<li><a href="{{ url('user') }}"><i class="fa fa-user"></i> <span>@lang('general.user-center')</span></a></li> <li><a href="{{ url('user') }}"><i class="fas fa-user"></i> &nbsp;<span>@lang('general.user-center')</span></a></li>
</ul><!-- /.sidebar-menu --> </ul><!-- /.sidebar-menu -->
</section> </section>
<!-- /.sidebar --> <!-- /.sidebar -->

2
resources/views/common/language.tpl
View File

@ -1,7 +1,7 @@
<!-- Language Menu --> <!-- Language Menu -->
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-language" aria-hidden="true"></i> <i class="fas fa-language" aria-hidden="true"></i>
<span class="description-text">{{ config('locales.'.App::getLocale(), config('locales.'.config('app.fallback_locale')))['short_name'] }}</span> <span class="description-text">{{ config('locales.'.App::getLocale(), config('locales.'.config('app.fallback_locale')))['short_name'] }}</span>
<span class="caret"></span> <span class="caret"></span>
</a> </a>

2
resources/views/common/option-form/hint.tpl
View File

@ -1 +1 @@
<i class="fa fa-question-circle" title="{!! $hint !!}" data-toggle="tooltip" data-placement="top"></i> <i class="fas fa-question-circle" title="{!! $hint !!}" data-toggle="tooltip" data-placement="top"></i>

2
resources/views/common/user-menu.tpl
View File

@ -6,7 +6,7 @@
<!-- The user image in the navbar--> <!-- The user image in the navbar-->
<img src="{{ avatar($user, 25) }}" class="user-image" alt="User Image"> <img src="{{ avatar($user, 25) }}" class="user-image" alt="User Image">
@else @else
<i class="fa fa-user"></i> <i class="fas fa-user"></i>
@endif @endif
<!-- hidden-xs hides the username on small devices so only the image appears. --> <!-- hidden-xs hides the username on small devices so only the image appears. -->

8
resources/views/index.tpl
View File

@ -21,7 +21,7 @@
<div class="navbar-header"> <div class="navbar-header">
<a href="{{ option('site_url') }}" class="navbar-brand">{{ option_localized('site_name') }}</a> <a href="{{ option('site_url') }}" class="navbar-brand">{{ option_localized('site_name') }}</a>
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
<i class="fa fa-bars"></i> <i class="fas fa-bars"></i>
</button> </button>
</div> </div>
@ -80,17 +80,17 @@
<br> <br>
<br> <br>
<div class="col-lg-4"> <div class="col-lg-4">
<i class="fa fa-users" aria-hidden="true"></i> <i class="fas fa-users"></i>
<h3>@lang('index.features.multi-player.name')</h3> <h3>@lang('index.features.multi-player.name')</h3>
<p>@lang('index.features.multi-player.desc')</p> <p>@lang('index.features.multi-player.desc')</p>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<i class="fa fa-share-alt" aria-hidden="true"></i> <i class="fas fa-share-alt"></i>
<h3>@lang('index.features.sharing.name')</h3> <h3>@lang('index.features.sharing.name')</h3>
<p>@lang('index.features.sharing.desc')</p> <p>@lang('index.features.sharing.desc')</p>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<i class="fa fa-cloud" aria-hidden="true"></i> <i class="fas fa-cloud"></i>
<h3>@lang('index.features.free.name')</h3> <h3>@lang('index.features.free.name')</h3>
<p>@lang('index.features.free.desc')</p> <p>@lang('index.features.free.desc')</p>
</div> </div>

4
resources/views/skinlib/index.tpl
View File

@ -12,7 +12,7 @@
<small id="search-indicator"></small> <small id="search-indicator"></small>
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><i class="fa fa-tags"></i> @lang('skinlib.filter.now-showing')</li> <li><i class="fas fa-tags"></i> @lang('skinlib.filter.now-showing')</li>
<li id="filter-indicator"></li> <li id="filter-indicator"></li>
<li id="uploader-indicator"></li> <li id="uploader-indicator"></li>
<li class="active" id="sort-indicator"></li> <li class="active" id="sort-indicator"></li>
@ -33,7 +33,7 @@
</div> </div>
<div class="overlay"> <div class="overlay">
<i class="fa fa-refresh fa-spin"></i> <i class="fas fa-sync-alt fa-spin"></i>
<span>@lang('general.loading')</span> <span>@lang('general.loading')</span>
</div> </div>
</div><!-- /.box --> </div><!-- /.box -->

10
resources/views/skinlib/master.tpl
View File

@ -24,7 +24,7 @@
{{ option_localized('site_name') }} {{ option_localized('site_name') }}
</a> </a>
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse"> <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
<i class="fa fa-bars"></i> <i class="fas fa-bars"></i>
</button> </button>
</div> </div>
@ -42,7 +42,7 @@
<!-- Filters --> <!-- Filters -->
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-filter" aria-hidden="true"></i> @lang('skinlib.general.filter') <span class="caret"></span> <i class="fas fa-filter" aria-hidden="true"></i> @lang('skinlib.general.filter') <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a class="filter" data-filter="skin" href="#">@lang('general.skin') <small>@lang('skinlib.filter.any-model')</small></a></li> <li><a class="filter" data-filter="skin" href="#">@lang('general.skin') <small>@lang('skinlib.filter.any-model')</small></a></li>
@ -68,7 +68,7 @@
<!-- Sort --> <!-- Sort -->
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-sort-amount-desc" aria-hidden="true"></i> @lang('skinlib.general.sort') <span class="caret"></span> <i class="fas fa-sort-amount-down" aria-hidden="true"></i> @lang('skinlib.general.sort') <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li><a class="sort" data-sort="likes" href="#">@lang('skinlib.sort.most-likes')</a></li> <li><a class="sort" data-sort="likes" href="#">@lang('skinlib.sort.most-likes')</a></li>
@ -90,7 +90,7 @@
<!-- Navbar Right Menu --> <!-- Navbar Right Menu -->
<div class="navbar-custom-menu"> <div class="navbar-custom-menu">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="{{ url('skinlib/upload') }}"><i class="fa fa-upload" aria-hidden="true"></i> <span class="description-text">@lang('skinlib.general.upload-new-skin')</span></a></li> <li><a href="{{ url('skinlib/upload') }}"><i class="fas fa--fileupload" aria-hidden="true"></i> <span class="description-text">@lang('skinlib.general.upload-new-skin')</span></a></li>
@include('common.language') @include('common.language')
@ -101,7 +101,7 @@
<li class="dropdown user user-menu"> <li class="dropdown user user-menu">
<!-- Menu Toggle Button --> <!-- Menu Toggle Button -->
<a href="{{ url('auth/login') }}"> <a href="{{ url('auth/login') }}">
<i class="fa fa-user"></i> <i class="fas fa-user"></i>
<!-- hidden-xs hides the username on small devices so only the image appears. --> <!-- hidden-xs hides the username on small devices so only the image appears. -->
<span class="hidden-xs nickname">@lang('general.anonymous')</span> <span class="hidden-xs nickname">@lang('general.anonymous')</span>
</a> </a>

4
resources/views/skinlib/show.tpl
View File

@ -32,7 +32,7 @@
@endif @endif
@endif @endif
<div class="btn likes" title="@lang('skinlib.show.likes')" data-toggle="tooltip" data-placement="top"><i class="fa fa-heart"></i> <div class="btn likes" title="@lang('skinlib.show.likes')" data-toggle="tooltip" data-placement="top"><i class="fas fa-heart"></i>
<span id="likes">{{ $texture->likes }}</span> <span id="likes">{{ $texture->likes }}</span>
</div> </div>
</div><!-- /.box-footer --> </div><!-- /.box-footer -->
@ -69,7 +69,7 @@
<tr> <tr>
<td>Hash <td>Hash
@if (option('allow_downloading_texture')) @if (option('allow_downloading_texture'))
<i class="fa fa-question-circle" title="@lang('skinlib.show.download-raw')" data-toggle="tooltip" data-placement="top"></i> <i class="fas fa-question-circle" title="@lang('skinlib.show.download-raw')" data-toggle="tooltip" data-placement="top"></i>
@endif @endif
</td> </td>
<td> <td>

4
resources/views/user/closet.tpl
View File

@ -12,8 +12,8 @@
@lang('general.my-closet') @lang('general.my-closet')
</h1> </h1>
<div class="breadcrumb"> <div class="breadcrumb">
<a href="{{ url('skinlib/upload') }}"><i class="fa fa-upload"></i> @lang('user.closet.upload')</a> <a href="{{ url('skinlib/upload') }}"><i class="fas fa-file-upload"></i> @lang('user.closet.upload')</a>
<a href="{{ url('skinlib') }}"><i class="fa fa-search"></i> @lang('user.closet.search')</a> <a href="{{ url('skinlib') }}"><i class="fas fa-search"></i> @lang('user.closet.search')</a>
</div> </div>
</section> </section>

9
resources/views/user/master.tpl
View File

@ -22,7 +22,7 @@
<!-- Logo --> <!-- Logo -->
<a href="{{ option('site_url') }}" class="logo"> <a href="{{ option('site_url') }}" class="logo">
<!-- mini logo for sidebar mini 50x50 pixels --> <!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"> <i class="fa fa-bookmark"></i> </span> <span class="logo-mini"> <i class="fas fa-bookmark"></i> </span>
<!-- logo for regular state and mobile devices --> <!-- logo for regular state and mobile devices -->
<span class="logo-lg">{{ option_localized('site_name') }}</span> <span class="logo-lg">{{ option_localized('site_name') }}</span>
</a> </a>
@ -31,6 +31,7 @@
<nav class="navbar navbar-static-top" role="navigation"> <nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button--> <!-- Sidebar toggle button-->
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button"> <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
<i class="fas fa-bars"></i>
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
</a> </a>
<!-- Navbar Right Menu --> <!-- Navbar Right Menu -->
@ -56,7 +57,7 @@
</div> </div>
<div class="pull-left info"> <div class="pull-left info">
<p class="nickname">{{ bs_nickname($user) }}</p> <p class="nickname">{{ bs_nickname($user) }}</p>
<i class="fa fa-circle text-success"></i> {{ bs_role($user) }} <i class="fas fa-circle text-success"></i> {{ bs_role($user) }}
</div> </div>
</div> </div>
@ -66,11 +67,11 @@
{!! bs_menu('user') !!} {!! bs_menu('user') !!}
<li class="header">@lang('general.explore')</li> <li class="header">@lang('general.explore')</li>
<li><a href="{{ url('skinlib') }}"><i class="fa fa-archive"></i> <span>@lang('general.skinlib')</span></a></li> <li><a href="{{ url('skinlib') }}"><i class="fas fa-archive"></i> &nbsp;<span>@lang('general.skinlib')</span></a></li>
@admin($user) @admin($user)
<li class="header">@lang('general.manage')</li> <li class="header">@lang('general.manage')</li>
<li><a href="{{ url('admin') }}"><i class="fa fa-cog"></i> <span>@lang('general.admin-panel')</span></a></li> <li><a href="{{ url('admin') }}"><i class="fas fa-cog"></i> &nbsp;<span>@lang('general.admin-panel')</span></a></li>
@endadmin @endadmin
</ul><!-- /.sidebar-menu --> </ul><!-- /.sidebar-menu -->
</section> </section>

6
resources/views/user/player.tpl
View File

@ -26,7 +26,7 @@
<th>@lang('user.player.player-name')</th> <th>@lang('user.player.player-name')</th>
<th> <th>
@lang('user.player.preference.title') @lang('user.player.preference.title')
<i class="fa fa-question-circle" title="@lang('user.player.preference.description')" data-toggle="tooltip" data-placement="right"></i> <i class="fas fa-question-circle" title="@lang('user.player.preference.description')" data-toggle="tooltip" data-placement="right"></i>
</th> </th>
<th>@lang('user.player.edit')</th> <th>@lang('user.player.edit')</th>
<th>@lang('user.player.operation')</th> <th>@lang('user.player.operation')</th>
@ -58,7 +58,7 @@
</div> </div>
<div class="box-footer clearfix"> <div class="box-footer clearfix">
<button class="btn btn-primary pull-left" data-toggle="modal" data-target="#modal-add-player"> <button class="btn btn-primary pull-left" data-toggle="modal" data-target="#modal-add-player">
<i class="fa fa-plus" aria-hidden="true"></i> &nbsp;@lang('user.player.add-player') <i class="fas fa-plus" aria-hidden="true"></i> &nbsp;@lang('user.player.add-player')
</button> </button>
</div> </div>
</div> </div>
@ -67,7 +67,7 @@
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">@lang('general.notice')</h3> <h3 class="box-title">@lang('general.notice')</h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-plus"></i></button> <button class="btn btn-box-tool" data-widget="collapse"><i class="fas fa-plus"></i></button>
</div><!-- /.box-tools --> </div><!-- /.box-tools -->
</div><!-- /.box-header --> </div><!-- /.box-header -->
<div class="box-body"> <div class="box-body">

4
webpack.config.js
View File

@ -15,7 +15,9 @@ module.exports = [{
'bootstrap/dist/css/bootstrap.min.css', 'bootstrap/dist/css/bootstrap.min.css',
'admin-lte/dist/css/AdminLTE.min.css', 'admin-lte/dist/css/AdminLTE.min.css',
'bootstrap-fileinput/css/fileinput.min.css', 'bootstrap-fileinput/css/fileinput.min.css',
'font-awesome/css/font-awesome.min.css', '@fortawesome/fontawesome-free/css/fontawesome.min.css',
'@fortawesome/fontawesome-free/css/regular.min.css',
'@fortawesome/fontawesome-free/css/solid.min.css',
'icheck/skins/square/blue.css', 'icheck/skins/square/blue.css',
'toastr/build/toastr.min.css', 'toastr/build/toastr.min.css',
'sweetalert2/dist/sweetalert2.min.css', 'sweetalert2/dist/sweetalert2.min.css',

4
yarn.lock
View File

@ -628,6 +628,10 @@
dependencies: dependencies:
acorn "^5.2.1" acorn "^5.2.1"
"@fortawesome/fontawesome-free@^5.2.0":
version "5.2.0"
resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.2.0.tgz#50cd9856774351c56c0b1b0db4efe122d7913e58"
"@types/jest@^23.3.1": "@types/jest@^23.3.1":
version "23.3.1" version "23.3.1"
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.1.tgz#a4319aedb071d478e6f407d1c4578ec8156829cf" resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.1.tgz#a4319aedb071d478e6f407d1c4578ec8156829cf"