Skip to content

Commit c34626e

Browse files
committed
update FontAwesome to v6
1 parent 4284cfa commit c34626e

20 files changed

+7901
-2834
lines changed

composer.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
}
3535
},
3636
"config": {
37-
"secure-http": false
37+
"secure-http": false,
38+
"allow-plugins": {
39+
"cakephp/plugin-installer": true
40+
}
3841
},
3942
"extra": {
4043
"installer-paths": {

src/Template/Element/Layout/default/footer/menu/column_four.ctp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ $menu = array_merge($this->Menu->helpAndSupportItems())
99
?>
1010

1111
<ul class="footer-menu">
12-
<li class="menu-title"><i class="fa fa-menu-title fa-comments-o"></i><?= __('Help & Support')?></li>
12+
<li class="menu-title"><i class="fa fa-menu-title fa-comments"></i><?= __('Help & Support')?></li>
1313
<?= $this->App->menuItems($menu); ?>
1414
</ul>

src/Template/Element/Layout/default/footer/social_links.ctp

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?= $this->Html->link(
2-
$this->Html->tag('i', '', ['class' => 'fa icon-social fa-twitter']),
2+
$this->Html->tag('i', '', ['class' => 'fa-brands icon-social fa-twitter']),
33
'https://www.twitter.com/cakephp',
44
[
55
'target' => '_blank',
@@ -10,7 +10,7 @@
1010
]
1111
); ?>
1212
<?= $this->Html->link(
13-
$this->Html->tag('i', '', ['class' => 'fa icon-social fa-facebook']),
13+
$this->Html->tag('i', '', ['class' => 'fa-brands icon-social fa-facebook']),
1414
'https://www.facebook.com/CakePHP',
1515
[
1616
'target' => '_blank',
@@ -21,7 +21,7 @@
2121
]
2222
); ?>
2323
<?= $this->Html->link(
24-
$this->Html->tag('i', '', ['class' => 'fa icon-social fa-youtube-play']),
24+
$this->Html->tag('i', '', ['class' => 'fa-brands icon-social fa-youtube']),
2525
'https://www.youtube.com/user/CakePHP',
2626
[
2727
'target' => '_blank',
@@ -32,7 +32,7 @@
3232
]
3333
); ?>
3434
<?= $this->Html->link(
35-
$this->Html->tag('i', '', ['class' => 'fa icon-social fa-linkedin']),
35+
$this->Html->tag('i', '', ['class' => 'fa-brands icon-social fa-linkedin']),
3636
'https://www.linkedin.com/groups/4623165/profile',
3737
[
3838
'target' => '_blank',
@@ -43,7 +43,7 @@
4343
]
4444
); ?>
4545
<?= $this->Html->link(
46-
$this->Html->tag('i', '', ['class' => 'fa icon-social fa-git']),
46+
$this->Html->tag('i', '', ['class' => 'fa-brands icon-social fa-git']),
4747
'https://www.github.com/cakephp',
4848
[
4949
'target' => '_blank',
@@ -54,7 +54,7 @@
5454
]
5555
); ?>
5656
<?= $this->Html->link(
57-
$this->Html->tag('i', '', ['class' => 'fa fa-slack icon-social']),
57+
$this->Html->tag('i', '', ['class' => 'fa-brands icon-social fa-slack']),
5858
'https://slack-invite.cakephp.org/',
5959
[
6060
'target' => '_blank',
@@ -65,7 +65,7 @@
6565
]
6666
); ?>
6767
<?= $this->Html->link(
68-
$this->Html->tag('i', '', ['class' => 'fa icon-social fa-stack-overflow']),
68+
$this->Html->tag('i', '', ['class' => 'fa-brands icon-social fa-stack-overflow']),
6969
'https://stackoverflow.com/tags/cakephp/info',
7070
[
7171
'target' => '_blank',
@@ -76,10 +76,10 @@
7676
]
7777
); ?>
7878
<?= $this->Html->link(
79-
$this->Html->tag('i', '', ['class' => 'fa icon-social fa-mastodon']),
79+
$this->Html->tag('i', '', ['class' => 'fa-brands icon-social fa-mastodon']),
8080
'https://phpc.social/@cakephp',
8181
[
82-
'rel' => 'me',
82+
'rel' => 'me',
8383
'title' => 'Mastodon',
8484
'data-toggle' => 'tooltip',
8585
'aria-label' => 'Mastodon',

src/Template/Element/get-involved/get-help.ctp

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use Cake\Core\Configure;
1313

1414
<div class="col-sm-12 p0 mt30">
1515
<div class="col-sm-1 p0">
16-
<i class="fa get-social-icon fa-slack"></i>
16+
<i class="fa-brands get-social-icon fa-slack"></i>
1717
</div>
1818
<div class="col-sm-11 p0">
1919
<p>
@@ -59,7 +59,7 @@ use Cake\Core\Configure;
5959
</div>
6060
<div class="col-sm-12 p0">
6161
<div class="col-sm-1 p0">
62-
<i class="fa get-social-icon fa-git"></i>
62+
<i class="fa-brands get-social-icon fa-git"></i>
6363
</div>
6464
<div class="col-sm-11 p0">
6565
<p>
@@ -71,7 +71,7 @@ use Cake\Core\Configure;
7171
</div>
7272
<div class="col-sm-12 p0">
7373
<div class="col-sm-1 p0">
74-
<i class="fa get-social-icon fa-pencil-square-o"></i>
74+
<i class="fa get-social-icon fa-pen-to-square"></i>
7575
</div>
7676
<div class="col-sm-11 p0">
7777
<p>
@@ -83,7 +83,7 @@ use Cake\Core\Configure;
8383
</div>
8484
<div class="col-sm-12 p0">
8585
<div class="col-sm-1 p0">
86-
<i class="fa get-social-icon fa-stack-overflow"></i>
86+
<i class="fa-brands get-social-icon fa-stack-overflow"></i>
8787
</div>
8888
<div class="col-sm-11 p0">
8989
<p>
@@ -95,7 +95,7 @@ use Cake\Core\Configure;
9595
</div>
9696
<div class="col-sm-12 p0">
9797
<div class="col-sm-1 p0">
98-
<i class="fa get-social-icon fa-facebook"></i>
98+
<i class="fa-brands get-social-icon fa-facebook"></i>
9999
</div>
100100
<div class="col-sm-11 p0">
101101
<p>
@@ -107,7 +107,7 @@ use Cake\Core\Configure;
107107
</div>
108108
<div class="col-sm-12 p0">
109109
<div class="col-sm-1 p0">
110-
<i class="fa get-social-icon fa-youtube-play"></i>
110+
<i class="fa-brands get-social-icon fa-youtube"></i>
111111
</div>
112112
<div class="col-sm-11 p0">
113113
<p>
@@ -119,7 +119,7 @@ use Cake\Core\Configure;
119119
</div>
120120
<div class="col-sm-12 p0">
121121
<div class="col-sm-1 p0">
122-
<i class="fa get-social-icon fa-twitter"></i>
122+
<i class="fa-brands get-social-icon fa-twitter"></i>
123123
</div>
124124
<div class="col-sm-11 p0">
125125
<p>
@@ -131,7 +131,7 @@ use Cake\Core\Configure;
131131
</div>
132132
<div class="col-sm-12 p0">
133133
<div class="col-sm-1 p0">
134-
<i class="fa get-social-icon fa-reddit-alien"></i>
134+
<i class="fa-brands get-social-icon fa-reddit-alien"></i>
135135
</div>
136136
<div class="col-sm-11 p0">
137137
<p>

0 commit comments

Comments
 (0)