mirror of
https://github.com/prurigro/hypothetical.git
synced 2024-11-09 11:16:39 -05:00
Use npm for fontawesome, include jquery in npm for the public site, and fix popper -> popper.js
This commit is contained in:
parent
9b66ebb576
commit
60241d2ed7
5 changed files with 8 additions and 6 deletions
|
@ -8,7 +8,6 @@
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"jquery": "~3.2.1",
|
"jquery": "~3.2.1",
|
||||||
"fontawesome": "~4.7.0",
|
|
||||||
"awesome-bootstrap-checkbox": "~0.3.7",
|
"awesome-bootstrap-checkbox": "~0.3.7",
|
||||||
"Sortable": "~1.6.0",
|
"Sortable": "~1.6.0",
|
||||||
"simplemde": "~1.11.2",
|
"simplemde": "~1.11.2",
|
||||||
|
|
6
gulpfile.js
vendored
6
gulpfile.js
vendored
|
@ -44,7 +44,7 @@ const jsPublic = [
|
||||||
|
|
||||||
// Javascript libraries for the public site
|
// Javascript libraries for the public site
|
||||||
const jsPublicLibs = [
|
const jsPublicLibs = [
|
||||||
"bower_components/jquery/dist/jquery.js",
|
"node_modules/jquery/dist/jquery.js",
|
||||||
"node_modules/popper.js/dist/umd/popper.js",
|
"node_modules/popper.js/dist/umd/popper.js",
|
||||||
"node_modules/bootstrap/dist/js/bootstrap.js",
|
"node_modules/bootstrap/dist/js/bootstrap.js",
|
||||||
"node_modules/gsap/src/uncompressed/TweenMax.js",
|
"node_modules/gsap/src/uncompressed/TweenMax.js",
|
||||||
|
@ -69,8 +69,8 @@ const jsDashboardLibs = [
|
||||||
// Paths to folders containing fonts that should be copied to public/fonts/
|
// Paths to folders containing fonts that should be copied to public/fonts/
|
||||||
const fontPaths = [
|
const fontPaths = [
|
||||||
"resources/assets/fonts/**",
|
"resources/assets/fonts/**",
|
||||||
"bower_components/bootstrap-sass/assets/fonts/**/*",
|
"node_modules/font-awesome/fonts/**",
|
||||||
"bower_components/fontawesome/fonts/**"
|
"bower_components/bootstrap-sass/assets/fonts/**/*"
|
||||||
];
|
];
|
||||||
|
|
||||||
// Handle errors
|
// Handle errors
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
"bootstrap": "^4.0.0-beta.3",
|
"bootstrap": "^4.0.0-beta.3",
|
||||||
"browserify": "^15.0.0",
|
"browserify": "^15.0.0",
|
||||||
"es6-promise": "^4.2.2",
|
"es6-promise": "^4.2.2",
|
||||||
|
"font-awesome": "^4.7.0",
|
||||||
"gsap": "^1.20.3",
|
"gsap": "^1.20.3",
|
||||||
"gulp": "^3.9.1",
|
"gulp": "^3.9.1",
|
||||||
"gulp-babel": "^7.0.0",
|
"gulp-babel": "^7.0.0",
|
||||||
|
@ -27,7 +28,8 @@
|
||||||
"gulp-strip-debug": "^2.0.0",
|
"gulp-strip-debug": "^2.0.0",
|
||||||
"gulp-uglify": "^3.0.0",
|
"gulp-uglify": "^3.0.0",
|
||||||
"gulp-util": "^3.0.8",
|
"gulp-util": "^3.0.8",
|
||||||
"popper": "^1.0.1",
|
"jquery": "^3.2.1",
|
||||||
|
"popper.js": "^1.12.9",
|
||||||
"vinyl-buffer": "^1.0.1",
|
"vinyl-buffer": "^1.0.1",
|
||||||
"vinyl-source-stream": "^2.0.0",
|
"vinyl-source-stream": "^2.0.0",
|
||||||
"vue": "^2.5.13",
|
"vue": "^2.5.13",
|
||||||
|
|
1
resources/assets/sass/app.scss
vendored
1
resources/assets/sass/app.scss
vendored
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
// Libraries
|
// Libraries
|
||||||
@import "bootstrap/scss/bootstrap.scss";
|
@import "bootstrap/scss/bootstrap.scss";
|
||||||
|
@import "font-awesome/scss/font-awesome.scss";
|
||||||
|
|
||||||
// Supplementary
|
// Supplementary
|
||||||
@import "sections/**/*.scss";
|
@import "sections/**/*.scss";
|
||||||
|
|
2
resources/assets/sass/dashboard.scss
vendored
2
resources/assets/sass/dashboard.scss
vendored
|
@ -1,6 +1,6 @@
|
||||||
// Libraries
|
// Libraries
|
||||||
@import "bootstrap-sass/assets/stylesheets/_bootstrap.scss";
|
@import "bootstrap-sass/assets/stylesheets/_bootstrap.scss";
|
||||||
@import "fontawesome/scss/font-awesome.scss";
|
@import "font-awesome/scss/font-awesome.scss";
|
||||||
@import "awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.scss";
|
@import "awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.scss";
|
||||||
@import "datetimepicker/jquery.datetimepicker";
|
@import "datetimepicker/jquery.datetimepicker";
|
||||||
@import "simplemde/dist/simplemde.min";
|
@import "simplemde/dist/simplemde.min";
|
||||||
|
|
Loading…
Reference in a new issue