Add font awesome free 5.2

pull/2635/head
Julio Montoya 7 years ago
parent 726bd31224
commit 6d689ec3e0
  1. 3
      assets/css/app.scss
  2. 3
      assets/js/vendor.js
  3. 3
      package.json
  4. 30
      yarn.lock

@ -1,5 +1,6 @@
@import "~bootstrap/scss/bootstrap";
@import "~@fortawesome/fontawesome-free/css/all.css";
@import '~chosen-js/chosen.css';
@import "~font-awesome/scss/font-awesome.scss";
@import '~flag-icon-css/sass/flag-icon.scss';
@import 'base.css';

@ -14,7 +14,8 @@ require("webpack-jquery-ui/css");
require("bootstrap");
require("chosen-js");
require("mediaelement");
// require("font-awesome-webpack"); already added manually in main.scss
require('@fortawesome/fontawesome-free');
require("qtip2");
require("image-map-resizer");

@ -14,14 +14,13 @@
"webpack": "^3.0"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.2.0",
"blueimp-file-upload": "^9.19.2",
"bootstrap-daterangepicker": "^2.1.30",
"bootstrap-select": "^1.12.4",
"chosen-js": "^1.8.3",
"cropper": "^4.0",
"flag-icon-css": "^3.0",
"font-awesome": "^4.7",
"font-awesome-webpack": "^0.0.5-beta.2",
"fs": "0.0.1-security",
"fullcalendar": "3.1.0",
"highlight.js": "^9.12.0",

@ -2,6 +2,10 @@
# yarn lockfile v1
"@fortawesome/fontawesome-free@^5.2.0":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.2.0.tgz#50cd9856774351c56c0b1b0db4efe122d7913e58"
"@symfony/webpack-encore@^0.19":
version "0.19.0"
resolved "https://registry.yarnpkg.com/@symfony/webpack-encore/-/webpack-encore-0.19.0.tgz#f0725dbbede5ff9d9fdbd7a07f84accafc83ca14"
@ -1660,7 +1664,7 @@ css-color-names@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
css-loader@^0.26.2, css-loader@~0.26.1:
css-loader@^0.26.2:
version "0.26.4"
resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.4.tgz#b61e9e30db94303e6ffc892f10ecd09ad025a1fd"
dependencies:
@ -2502,18 +2506,6 @@ follow-redirects@^1.0.0:
dependencies:
debug "^3.1.0"
font-awesome-webpack@^0.0.5-beta.2:
version "0.0.5-beta.2"
resolved "https://registry.yarnpkg.com/font-awesome-webpack/-/font-awesome-webpack-0.0.5-beta.2.tgz#9ea5f22f0615d08e76d8db341563649a726286d6"
dependencies:
css-loader "~0.26.1"
less-loader "~2.2.3"
style-loader "~0.13.1"
font-awesome@^4.7:
version "4.7.0"
resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
for-in@^0.1.3:
version "0.1.8"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
@ -3082,7 +3074,7 @@ ignore@^3.3.5:
version "3.3.8"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.8.tgz#3f8e9c35d38708a3a7e0e9abb6c73e7ee7707b2b"
image-map-resizer@^1.0.3:
image-map-resizer@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/image-map-resizer/-/image-map-resizer-1.0.7.tgz#157ff63a0fc35cf3dd4d879db7e920bc70f77c07"
@ -3592,12 +3584,6 @@ less-loader@^4.0.5:
loader-utils "^1.1.0"
pify "^3.0.0"
less-loader@~2.2.3:
version "2.2.3"
resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-2.2.3.tgz#b6d8f8139c8493df09d992a93a00734b08f84528"
dependencies:
loader-utils "^0.2.5"
less@^3.0.2:
version "3.0.4"
resolved "https://registry.yarnpkg.com/less/-/less-3.0.4.tgz#d27dcedbac96031c9e7b76f1da1e4b7d83760814"
@ -3634,7 +3620,7 @@ loader-runner@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
loader-utils@^0.2.16, loader-utils@^0.2.5:
loader-utils@^0.2.16:
version "0.2.17"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
dependencies:
@ -5893,7 +5879,7 @@ strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
style-loader@^0.13.2, style-loader@~0.13.1:
style-loader@^0.13.2:
version "0.13.2"
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.2.tgz#74533384cf698c7104c7951150b49717adc2f3bb"
dependencies:

Loading…
Cancel
Save