Skip to content

Commit bf3bb4b

Browse files
committed
Merge remote-tracking branch 'origin/dev' into dev
2 parents 4e24384 + 79c9d1e commit bf3bb4b

File tree

2 files changed

+28
-48
lines changed

2 files changed

+28
-48
lines changed

src/component/utils/fontawesome-v5.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ export default [
7373
{ name: 'fas fa-atom' },
7474
{ name: 'fab fa-audible' },
7575
{ name: 'fas fa-audio-description' },
76-
{ name: 'fas fa-autoprefixer' },
76+
{ name: 'fab fa-autoprefixer' },
7777
{ name: 'fab fa-avianex' },
78-
{ name: 'fas fa-aviato' },
78+
{ name: 'fab fa-aviato' },
7979
{ name: 'fas fa-award' },
8080
{ name: 'fab fa-aws' },
8181
{ name: 'fas fa-baby' },
@@ -201,7 +201,7 @@ export default [
201201
{ name: 'fas fa-cart-plus' },
202202
{ name: 'fas fa-cash-register' },
203203
{ name: 'fas fa-cat' },
204-
{ name: 'fas fa-cc-amazon-pay' },
204+
{ name: 'fab fa-cc-amazon-pay' },
205205
{ name: 'fab fa-cc-amex' },
206206
{ name: 'fab fa-cc-apple-pay' },
207207
{ name: 'fab fa-cc-diners-club' },
@@ -414,7 +414,7 @@ export default [
414414
{ name: 'fas fa-equals' },
415415
{ name: 'fas fa-eraser' },
416416
{ name: 'fab fa-erlang' },
417-
{ name: 'fas fa-ethereum' },
417+
{ name: 'fab fa-ethereum' },
418418
{ name: 'fas fa-ethernet' },
419419
{ name: 'fab fa-etsy' },
420420
{ name: 'fas fa-euro-sign' },
@@ -492,7 +492,7 @@ export default [
492492
{ name: 'fab fa-flickr' },
493493
{ name: 'fab fa-flipboard' },
494494
{ name: 'fas fa-flushed' },
495-
{ name: 'fas fa-fly' },
495+
{ name: 'fab fa-fly' },
496496
{ name: 'fas fa-folder' },
497497
{ name: 'fas fa-folder-minus' },
498498
{ name: 'fas fa-folder-open' },
@@ -711,7 +711,7 @@ export default [
711711
{ name: 'fas fa-kiss-beam' },
712712
{ name: 'fas fa-kiss-wink-heart' },
713713
{ name: 'fas fa-kiwi-bird' },
714-
{ name: 'fas fa-korvue' },
714+
{ name: 'fab fa-korvue' },
715715
{ name: 'fas fa-landmark' },
716716
{ name: 'fas fa-language' },
717717
{ name: 'fas fa-laptop' },
@@ -728,7 +728,7 @@ export default [
728728
{ name: 'fas fa-leaf' },
729729
{ name: 'fab fa-leanpub' },
730730
{ name: 'fas fa-lemon' },
731-
{ name: 'fas fa-less' },
731+
{ name: 'fab fa-less' },
732732
{ name: 'fas fa-less-than' },
733733
{ name: 'fas fa-less-than-equal' },
734734
{ name: 'fas fa-level-down-alt' },
@@ -837,7 +837,7 @@ export default [
837837
{ name: 'fas fa-neuter' },
838838
{ name: 'fas fa-newspaper' },
839839
{ name: 'fab fa-nimblr' },
840-
{ name: 'fas fa-node' },
840+
{ name: 'fab fa-node' },
841841
{ name: 'fab fa-node-js' },
842842
{ name: 'fas fa-not-equal' },
843843
{ name: 'fas fa-notes-medical' },
@@ -965,7 +965,7 @@ export default [
965965
{ name: 'fas fa-random' },
966966
{ name: 'fab fa-raspberry-pi' },
967967
{ name: 'fab fa-ravelry' },
968-
{ name: 'fas fa-react' },
968+
{ name: 'fab fa-react' },
969969
{ name: 'fab fa-reacteurope' },
970970
{ name: 'fab fa-readme' },
971971
{ name: 'fab fa-rebel' },
@@ -1012,7 +1012,7 @@ export default [
10121012
{ name: 'fas fa-sad-tear' },
10131013
{ name: 'fab fa-safari' },
10141014
{ name: 'fab fa-salesforce' },
1015-
{ name: 'fas fa-sass' },
1015+
{ name: 'fab fa-sass' },
10161016
{ name: 'fas fa-satellite' },
10171017
{ name: 'fas fa-satellite-dish' },
10181018
{ name: 'fas fa-save' },
@@ -1146,12 +1146,12 @@ export default [
11461146
{ name: 'fas fa-stopwatch' },
11471147
{ name: 'fas fa-store' },
11481148
{ name: 'fas fa-store-alt' },
1149-
{ name: 'fas fa-strava' },
1149+
{ name: 'fab fa-strava' },
11501150
{ name: 'fas fa-stream' },
11511151
{ name: 'fas fa-street-view' },
11521152
{ name: 'fas fa-strikethrough' },
1153-
{ name: 'fas fa-stripe' },
1154-
{ name: 'fas fa-stripe-s' },
1153+
{ name: 'fab fa-stripe' },
1154+
{ name: 'fab fa-stripe-s' },
11551155
{ name: 'fas fa-stroopwafel' },
11561156
{ name: 'fab fa-studiovinari' },
11571157
{ name: 'fab fa-stumbleupon' },
@@ -1269,13 +1269,13 @@ export default [
12691269
{ name: 'fas fa-underline' },
12701270
{ name: 'fas fa-undo' },
12711271
{ name: 'fas fa-undo-alt' },
1272-
{ name: 'fas fa-uniregistry' },
1272+
{ name: 'fab fa-uniregistry' },
12731273
{ name: 'fas fa-universal-access' },
12741274
{ name: 'fas fa-university' },
12751275
{ name: 'fas fa-unlink' },
12761276
{ name: 'fas fa-unlock' },
12771277
{ name: 'fas fa-unlock-alt' },
1278-
{ name: 'fas fa-untappd' },
1278+
{ name: 'fab fa-untappd' },
12791279
{ name: 'fas fa-upload' },
12801280
{ name: 'fab fa-ups' },
12811281
{ name: 'fab fa-usb' },
@@ -1306,10 +1306,10 @@ export default [
13061306
{ name: 'fas fa-users' },
13071307
{ name: 'fas fa-users-cog' },
13081308
{ name: 'fab fa-usps' },
1309-
{ name: 'fas fa-ussunnah' },
1309+
{ name: 'fab fa-ussunnah' },
13101310
{ name: 'fas fa-utensil-spoon' },
13111311
{ name: 'fas fa-utensils' },
1312-
{ name: 'fas fa-vaadin' },
1312+
{ name: 'fab fa-vaadin' },
13131313
{ name: 'fas fa-vector-square' },
13141314
{ name: 'fas fa-venus' },
13151315
{ name: 'fas fa-venus-double' },
@@ -1319,7 +1319,7 @@ export default [
13191319
{ name: 'fab fa-viadeo-square' },
13201320
{ name: 'fas fa-vial' },
13211321
{ name: 'fas fa-vials' },
1322-
{ name: 'fas fa-viber' },
1322+
{ name: 'fab fa-viber' },
13231323
{ name: 'fas fa-video' },
13241324
{ name: 'fas fa-video-slash' },
13251325
{ name: 'fas fa-vihara' },
@@ -1337,7 +1337,7 @@ export default [
13371337
{ name: 'fas fa-volume-up' },
13381338
{ name: 'fas fa-vote-yea' },
13391339
{ name: 'fas fa-vr-cardboard' },
1340-
{ name: 'fas fa-vuejs' },
1340+
{ name: 'fab fa-vuejs' },
13411341
{ name: 'fas fa-walking' },
13421342
{ name: 'fas fa-wallet' },
13431343
{ name: 'fas fa-warehouse' },
@@ -1350,9 +1350,9 @@ export default [
13501350
{ name: 'fas fa-weight-hanging' },
13511351
{ name: 'fab fa-weixin' },
13521352
{ name: 'fab fa-whatsapp' },
1353-
{ name: 'fas fa-whatsapp-square' },
1353+
{ name: 'fab fa-whatsapp-square' },
13541354
{ name: 'fas fa-wheelchair' },
1355-
{ name: 'fas fa-whmcs' },
1355+
{ name: 'fab fa-whmcs' },
13561356
{ name: 'fas fa-wifi' },
13571357
{ name: 'fab fa-wikipedia-w' },
13581358
{ name: 'fas fa-wind' },

yarn.lock

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ ajv-keywords@^3.1.0:
131131
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
132132
integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
133133

134-
ajv@^6.1.0:
134+
ajv@^6.1.0, ajv@^6.10.0, ajv@^6.9.1:
135135
version "6.10.2"
136136
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
137137
integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
@@ -141,16 +141,6 @@ ajv@^6.1.0:
141141
json-schema-traverse "^0.4.1"
142142
uri-js "^4.2.2"
143143

144-
ajv@^6.10.0, ajv@^6.9.1:
145-
version "6.10.1"
146-
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.1.tgz#ebf8d3af22552df9dd049bfbe50cc2390e823593"
147-
integrity sha512-w1YQaVGNC6t2UCPjEawK/vo/dG8OOrVtUmhBT1uJJYxbl5kU2Tj3v6LGqBcsysN1yhuCStJCCA3GqdvKY8sqXQ==
148-
dependencies:
149-
fast-deep-equal "^2.0.1"
150-
fast-json-stable-stringify "^2.0.0"
151-
json-schema-traverse "^0.4.1"
152-
uri-js "^4.2.2"
153-
154144
ansi-escapes@^3.2.0:
155145
version "3.2.0"
156146
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
@@ -477,24 +467,14 @@ eslint-scope@^5.0.0:
477467
esrecurse "^4.1.0"
478468
estraverse "^4.1.1"
479469

480-
eslint-utils@^1.3.0, eslint-utils@^1.3.1:
481-
version "1.3.1"
482-
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
483-
integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
484-
485-
eslint-utils@^1.4.2:
470+
eslint-utils@^1.3.0, eslint-utils@^1.3.1, eslint-utils@^1.4.2:
486471
version "1.4.2"
487472
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
488473
integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
489474
dependencies:
490475
eslint-visitor-keys "^1.0.0"
491476

492-
eslint-visitor-keys@^1.0.0:
493-
version "1.0.0"
494-
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
495-
integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
496-
497-
eslint-visitor-keys@^1.1.0:
477+
eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
498478
version "1.1.0"
499479
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
500480
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
@@ -1187,10 +1167,10 @@ resolve-from@^4.0.0:
11871167
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
11881168
integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
11891169

1190-
resolve@^1.10.0, resolve@^1.11.0, resolve@^1.5.0, resolve@^1.8.1:
1191-
version "1.11.1"
1192-
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
1193-
integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
1170+
resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.5.0, resolve@^1.8.1:
1171+
version "1.12.0"
1172+
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
1173+
integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
11941174
dependencies:
11951175
path-parse "^1.0.6"
11961176

0 commit comments

Comments
 (0)