Skip to content

Commit d54c6a0

Browse files
amosfolzlcharette
amosfolz
authored and
lcharette
committed
Update to Font Awesome 5 (#957)
* Replace FA4 with FA5. Replace aliased icons (aliasing is deprecated in FA5) Apply fix to AdminLTE to work with FA5 * Update FA5 icon prefix 'fa' to 'fas' to align with new conventions * Update package.json * Minor style change
1 parent 5de910e commit d54c6a0

49 files changed

Lines changed: 238 additions & 181 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/sprinkles/account/src/Database/Migrations/v400/GroupsTable.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function up()
3636
$table->string('slug');
3737
$table->string('name');
3838
$table->text('description')->nullable();
39-
$table->string('icon', 100)->nullable(false)->default('fa fa-user')->comment('The icon representing users in this group.');
39+
$table->string('icon', 100)->nullable(false)->default('fas fa-user')->comment('The icon representing users in this group.');
4040
$table->timestamps();
4141

4242
$table->engine = 'InnoDB';

‎app/sprinkles/account/src/Database/Migrations/v430/UpdateGroupsTable.php‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?php
2+
3+
/*
4+
* UserFrosting (http://www.userfrosting.com)
5+
*
6+
* @link https://github.com/userfrosting/UserFrosting
7+
* @copyright Copyright (c) 2019 Alexander Weissman
8+
* @license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
9+
*/
10+
11+
namespace UserFrosting\Sprinkle\Account\Database\Migrations\v430;
12+
13+
use Illuminate\Database\Schema\Blueprint;
14+
use UserFrosting\Sprinkle\Core\Database\Migration;
15+
16+
/**
17+
* Groups table migration
18+
* Changes the `icon` column property of `default` to NULL to align with new Font Awesome 5 tag convention.
19+
* Version 4.3.0.
20+
*
21+
* See https://laravel.com/docs/5.4/migrations#tables
22+
*
23+
* @author Alex Weissman (https://alexanderweissman.com)
24+
*/
25+
class UpdateGroupsTable extends Migration
26+
{
27+
/**
28+
* {@inheritdoc}
29+
*/
30+
public static $dependencies = [
31+
'\UserFrosting\Sprinkle\Account\Database\Migrations\v400\GroupsTable',
32+
];
33+
34+
/**
35+
* {@inheritdoc}
36+
*/
37+
public function up()
38+
{
39+
if ($this->schema->hasTable('groups')) {
40+
$this->schema->table('groups', function (Blueprint $table) {
41+
$table->string('icon', 100)->nullable()->change();
42+
});
43+
}
44+
}
45+
46+
/**
47+
* {@inheritdoc}
48+
*/
49+
public function down()
50+
{
51+
$this->schema->table('groups', function (Blueprint $table) {
52+
$table->string('icon', 100)->default('fa fa-user')->nullable(false)->change();
53+
});
54+
}
55+
}

‎app/sprinkles/account/templates/forms/settings-account.html.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<form id="account-settings" role="form" action="{{site.uri.public}}/account/settings" method="post">
22
<div class="box-header">
3-
<h3 class="box-title"><i class="fa fa-gear fa-fw"></i> {{translate("ACCOUNT.SETTINGS")}}</h3>
3+
<h3 class="box-title"><i class="fas fa-cog fa-fw"></i> {{translate("ACCOUNT.SETTINGS")}}</h3>
44
</div>
55
<div class="box-body">
66
{% include "forms/csrf.html.twig" %}
@@ -34,4 +34,4 @@
3434
<button type="reset" class="btn btn-default">{{translate('RESET')}}</button>
3535
<button type="submit" class="btn btn-primary js-submit">{{translate('SAVE')}}</button>
3636
</div>
37-
</form>
37+
</form>

‎app/sprinkles/account/templates/forms/settings-profile.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<form id="profile-settings" role="form" action="{{site.uri.public}}/account/settings/profile" method="post">
22
<div class="box-header">
3-
<h3 class="box-title"><i class="fa fa-user fa-fw"></i> {{translate("PROFILE.SETTINGS")}}</h3>
3+
<h3 class="box-title"><i class="fas fa-user fa-fw"></i> {{translate("PROFILE.SETTINGS")}}</h3>
44
</div>
55
<div class="box-body">
66
{% include "forms/csrf.html.twig" %}

‎app/sprinkles/account/templates/navigation/user-card.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
55
<img src="{{ current_user.avatar }}" class="user-image" alt="User Image">
66
<span class="hidden-xs">{{current_user.first_name}} {{current_user.last_name}}</span>
7-
<i class="fa fa-chevron-down"></i>
7+
<i class="fas fa-chevron-down"></i>
88
</a>
99
{% endblock %}
1010
<ul class="dropdown-menu">

‎app/sprinkles/account/templates/pages/error/compromised.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{% block page_description %}{{ translate('ACCOUNT.SESSION_COMPROMISED.TITLE') }}{% endblock %}
66

77
{% block heading %}
8-
<i class="fa fa-warning text-yellow"></i> {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', {
8+
<i class="fas fa-warning text-yellow"></i> {{ translate('ACCOUNT.SESSION_COMPROMISED.TEXT', {
99
'url' : site.uri.public ~ '/account/sign-in'
1010
}) | raw }}
1111
{% endblock %}

‎app/sprinkles/admin/src/Controller/GroupController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ public function getModalCreate(Request $request, Response $response, $args)
396396
// Create a dummy group to prepopulate fields
397397
$group = $classMapper->createInstance('group', []);
398398

399-
$group->icon = 'fa fa-user';
399+
$group->icon = 'fas fa-user';
400400

401401
$fieldNames = ['name', 'slug', 'icon', 'description'];
402402
$fields = [

‎app/sprinkles/admin/templates/forms/group.html.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<div class="form-group">
1010
<label>{{translate("GROUP.NAME")}}</label>
1111
<div class="input-group">
12-
<span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
12+
<span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
1313
<input type="text" class="form-control" name="name" autocomplete="off" value="{{group.name}}" placeholder="{{translate("GROUP.NAME_EXPLAIN")}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
1414
</div>
1515
</div>
@@ -20,7 +20,7 @@
2020
<div class="form-group">
2121
<label>{{translate("SLUG")}}</label>
2222
<div class="input-group">
23-
<span class="input-group-addon"><i class="fa fa-tag fa-fw"></i></span>
23+
<span class="input-group-addon"><i class="fas fa-tag fa-fw"></i></span>
2424
<input type="text" class="form-control" name="slug" autocomplete="off" value="{{group.slug}}" placeholder="{{translate("SLUG")}}" {% if 'slug' in form.fields.disabled %}disabled{% endif %} readonly>
2525
{% if 'slug' not in form.fields.disabled %}
2626
<span class="input-group-btn" data-toggle="buttons">

‎app/sprinkles/admin/templates/forms/role.html.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<div class="form-group">
99
<label>{{translate("ROLE.NAME")}}</label>
1010
<div class="input-group">
11-
<span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
11+
<span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
1212
<input type="text" class="form-control" name="name" autocomplete="off" value="{{role.name}}" placeholder="{{translate("ROLE.NAME_EXPLAIN")}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
1313
</div>
1414
</div>
@@ -19,7 +19,7 @@
1919
<div class="form-group">
2020
<label>{{translate("SLUG")}}</label>
2121
<div class="input-group">
22-
<span class="input-group-addon"><i class="fa fa-tag fa-fw"></i></span>
22+
<span class="input-group-addon"><i class="fas fa-tag fa-fw"></i></span>
2323
<input type="text" class="form-control" name="slug" autocomplete="off" value="{{role.slug}}" placeholder="{{translate("SLUG")}}" {% if 'slug' in form.fields.disabled %}disabled{% endif %} readonly>
2424
{% if 'slug' not in form.fields.disabled %}
2525
<span class="input-group-btn" data-toggle="buttons">

‎app/sprinkles/admin/templates/forms/user.html.twig‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<div class="form-group">
1010
<label>{{translate('USERNAME')}}</label>
1111
<div class="input-group">
12-
<span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
12+
<span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
1313
<input type="text" class="form-control" name="user_name" autocomplete="off" value="{{user.user_name}}" placeholder="{{translate('USERNAME')}}" {% if 'user_name' in form.fields.disabled %}disabled{% endif %}>
1414
</div>
1515
</div>
@@ -20,7 +20,7 @@
2020
<div class="form-group">
2121
<label for="input-group">{{translate('GROUP')}}</label>
2222
<div class="input-group">
23-
<span class="input-group-addon"><i class="fa fa-users fa-fw"></i></span>
23+
<span class="input-group-addon"><i class="fas fa-users fa-fw"></i></span>
2424
{% if 'group' in form.fields.disabled %}
2525
<input type="text" class="form-control" name="theme" value="{{user.group.name}}" disabled>
2626
{% else %}
@@ -41,7 +41,7 @@
4141
<div class="form-group">
4242
<label>{{translate('FIRST_NAME')}}</label>
4343
<div class="input-group">
44-
<span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
44+
<span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
4545
<input type="text" class="form-control" name="first_name" autocomplete="off" value="{{user.first_name}}" placeholder="{{translate('FIRST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
4646
</div>
4747
</div>
@@ -50,7 +50,7 @@
5050
<div class="form-group">
5151
<label>{{translate('LAST_NAME')}}</label>
5252
<div class="input-group">
53-
<span class="input-group-addon"><i class="fa fa-edit fa-fw"></i></span>
53+
<span class="input-group-addon"><i class="fas fa-edit fa-fw"></i></span>
5454
<input type="text" class="form-control" name="last_name" autocomplete="off" value="{{user.last_name}}" placeholder="{{translate('LAST_NAME')}}" {% if 'name' in form.fields.disabled %}disabled{% endif %}>
5555
</div>
5656
</div>
@@ -61,11 +61,11 @@
6161
<div class="form-group">
6262
<label>{{translate('EMAIL')}}</label>
6363
<div class="input-group js-copy-container">
64-
<span class="input-group-addon"><i class="fa fa-envelope fa-fw"></i></span>
64+
<span class="input-group-addon"><i class="fas fa-envelope fa-fw"></i></span>
6565
<input type="text" class="form-control js-copy-target" name="email" autocomplete="off" value="{{user.email}}" placeholder="{{translate('EMAIL')}}" {% if 'email' in form.fields.disabled %}disabled{% endif %}>
6666
{% if 'email' in form.fields.disabled %}
6767
<span class="input-group-btn">
68-
<button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fa fa-clipboard"></i></button>
68+
<button class="btn btn-default uf-copy-trigger js-copy-trigger" type="button"><i class="fas fa-clipboard"></i></button>
6969
</span>
7070
{% endif %}
7171
</div>
@@ -77,7 +77,7 @@
7777
<div class="form-group">
7878
<label for="input-theme">{{translate('THEME')}}</label>
7979
<div class="input-group">
80-
<span class="input-group-addon"><i class="fa fa-puzzle-piece fa-fw"></i></span>
80+
<span class="input-group-addon"><i class="fas fa-puzzle-piece fa-fw"></i></span>
8181
{% if 'theme' in form.fields.disabled %}
8282
<input type="text" class="form-control" name="theme" value="{{themes[user.theme]}}" disabled>
8383
{% else %}
@@ -96,7 +96,7 @@
9696
<div class="form-group">
9797
<label for="input-locale">{{translate('LOCALE')}}</label>
9898
<div class="input-group">
99-
<span class="input-group-addon"><i class="fa fa-language fa-fw"></i></span>
99+
<span class="input-group-addon"><i class="fas fa-language fa-fw"></i></span>
100100
{% if 'locale' in form.fields.disabled %}
101101
<input type="text" class="form-control" name="theme" value="{{locales[user.locale]}}" disabled>
102102
{% else %}

0 commit comments

Comments
 (0)