From b0bdc3e7b2744f18bb74bdd6bb14ebfeafec0851 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Wed, 8 Aug 2018 12:30:50 +0800 Subject: [PATCH] Upgrade to Font Awesome 5 --- app/helpers.php | 4 ++-- config/menu.php | 4 ++-- package.json | 2 +- .../assets/src/components/common/Previewer.vue | 8 ++++---- .../assets/src/components/user/ClosetItem.vue | 4 ++-- .../assets/src/components/user/Dashboard.vue | 4 ++-- resources/assets/src/stylus/common.styl | 5 +++++ .../tests/components/common/Previewer.test.js | 2 +- resources/lang/en/front-end.yml | 2 +- resources/lang/en/user.yml | 2 +- resources/lang/zh_CN/front-end.yml | 2 +- resources/lang/zh_CN/user.yml | 2 +- resources/views/admin/customize.tpl | 2 +- resources/views/admin/index.tpl | 16 +++++++++------- resources/views/admin/master.tpl | 7 ++++--- resources/views/common/language.tpl | 2 +- resources/views/common/option-form/hint.tpl | 2 +- resources/views/common/user-menu.tpl | 2 +- resources/views/index.tpl | 8 ++++---- resources/views/skinlib/index.tpl | 4 ++-- resources/views/skinlib/master.tpl | 10 +++++----- resources/views/skinlib/show.tpl | 4 ++-- resources/views/user/closet.tpl | 4 ++-- resources/views/user/master.tpl | 9 +++++---- resources/views/user/player.tpl | 6 +++--- webpack.config.js | 4 +++- yarn.lock | 4 ++++ 27 files changed, 70 insertions(+), 55 deletions(-) diff --git a/app/helpers.php b/app/helpers.php index 093c6f5f..aef2f619 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -213,14 +213,14 @@ if (! function_exists('bs_menu')) { $content .= ""; if (isset($value['children'])) { - $content .= sprintf(' %s', $value['icon'], trans($value['title'])); + $content .= sprintf('  %s', $value['icon'], trans($value['title'])); // recurse $content .= ''; } else { if ($value) { $content .= sprintf( - ' %s', + '  %s', url((string) $value['link']), (string) $value['icon'], trans((string) $value['title']) diff --git a/config/menu.php b/config/menu.php index 94646bd7..a101d263 100644 --- a/config/menu.php +++ b/config/menu.php @@ -9,14 +9,14 @@ */ $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.player-manage', 'link' => 'user/player', 'icon' => 'fa-users'], ['title' => 'general.profile', 'link' => 'user/profile', 'icon' => 'fa-user'], ]; $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.player-manage', 'link' => 'admin/players', 'icon' => 'fa-gamepad'], ['title' => 'general.customize', 'link' => 'admin/customize', 'icon' => 'fa-paint-brush'], diff --git a/package.json b/package.json index 8ff08132..f1f1103f 100644 --- a/package.json +++ b/package.json @@ -22,12 +22,12 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.55", + "@fortawesome/fontawesome-free": "^5.2.0", "admin-lte": "^2.4.2", "bootstrap": "^3.3.7", "bootstrap-fileinput": "^4.4.7", "chart.js": "^2.7.1", "es6-promise": "^4.2.4", - "font-awesome": "^4.7.0", "highlight.js": "^9.12.0", "icheck": "^1.0.2", "jquery": "^3.3.1", diff --git a/resources/assets/src/components/common/Previewer.vue b/resources/assets/src/components/common/Previewer.vue index 24c7454c..24aabe04 100644 --- a/resources/assets/src/components/common/Previewer.vue +++ b/resources/assets/src/components/common/Previewer.vue @@ -9,21 +9,21 @@ data-toggle="tooltip" data-placement="bottom" :title="$t('general.walk') + ' / ' + $t('general.run')" - class="fa fa-forward" + class="fas fa-forward" > diff --git a/resources/assets/src/components/user/ClosetItem.vue b/resources/assets/src/components/user/ClosetItem.vue index 2f7bf2cb..a4929a1b 100644 --- a/resources/assets/src/components/user/ClosetItem.vue +++ b/resources/assets/src/components/user/ClosetItem.vue @@ -14,14 +14,14 @@ class="more" data-toggle="tooltip" data-placement="bottom" - > + > + > diff --git a/resources/views/common/language.tpl b/resources/views/common/language.tpl index 594a67b7..96a93e34 100644 --- a/resources/views/common/language.tpl +++ b/resources/views/common/language.tpl @@ -1,7 +1,7 @@
  • - + {{ config('locales.'.App::getLocale(), config('locales.'.config('app.fallback_locale')))['short_name'] }} diff --git a/resources/views/common/option-form/hint.tpl b/resources/views/common/option-form/hint.tpl index 0ff95827..85ca54a7 100644 --- a/resources/views/common/option-form/hint.tpl +++ b/resources/views/common/option-form/hint.tpl @@ -1 +1 @@ - + diff --git a/resources/views/common/user-menu.tpl b/resources/views/common/user-menu.tpl index 89acc6d0..64fc60c3 100644 --- a/resources/views/common/user-menu.tpl +++ b/resources/views/common/user-menu.tpl @@ -6,7 +6,7 @@ User Image @else - + @endif diff --git a/resources/views/index.tpl b/resources/views/index.tpl index 00ec9b78..f3b1de2e 100644 --- a/resources/views/index.tpl +++ b/resources/views/index.tpl @@ -21,7 +21,7 @@
    {{ option_localized('site_name') }}
    @@ -80,17 +80,17 @@

    - +

    @lang('index.features.multi-player.name')

    @lang('index.features.multi-player.desc')

    - +

    @lang('index.features.sharing.name')

    @lang('index.features.sharing.desc')

    - +

    @lang('index.features.free.name')

    @lang('index.features.free.desc')

    diff --git a/resources/views/skinlib/index.tpl b/resources/views/skinlib/index.tpl index 1d69a71b..d83073cd 100644 --- a/resources/views/skinlib/index.tpl +++ b/resources/views/skinlib/index.tpl @@ -12,7 +12,7 @@
      -
    1. @lang('skinlib.filter.now-showing')
      2. +
    2. @lang('skinlib.filter.now-showing')
    5. @@ -33,7 +33,7 @@
      - + @lang('general.loading')
      diff --git a/resources/views/skinlib/master.tpl b/resources/views/skinlib/master.tpl index d0b72321..635173f9 100644 --- a/resources/views/skinlib/master.tpl +++ b/resources/views/skinlib/master.tpl @@ -24,7 +24,7 @@ {{ option_localized('site_name') }} @@ -42,7 +42,7 @@
    6. - @lang('skinlib.general.filter') + @lang('skinlib.general.filter')