Commit ed37ed27 authored by David Haynes's avatar David Haynes 🙆

font awesome

parent ae75f07c
Pipeline #1495 passed with stage
in 30 seconds
......@@ -32,4 +32,10 @@ public/assets/js/bootstrap.min.js
public/assets/js/jquery.min.js
public/assets/js/jquery.min.map
public/assets/js/popper.min.js
public/assets/js/popper.min.js.map
\ No newline at end of file
public/assets/js/popper.min.js.map
public/assets/fonts/*.eot
public/assets/fonts/*.svg
public/assets/fonts/*.ttf
public/assets/fonts/*.woff
public/assets/fonts/*.woff2
public/assets/fonts/*.otf
\ No newline at end of file
/* Masonstrap 4.0 Beta 1 */
// Load in FA 4
@import '../node_modules/font-awesome/scss/font-awesome.scss';
// Load in bootstrap 4
@import '../node_modules/bootstrap/scss/bootstrap.scss';
// Load in variable overwrites
......
......@@ -9,6 +9,7 @@
"autoprefixer": "^7.1.2",
"bootstrap": "4.0.0-beta",
"clean-css-cli": "^4.1.6",
"font-awesome": "^4.7.0",
"http-server": "^0.10.0",
"jquery": "^3.2.1",
"node-sass": "^4.5.3",
......@@ -24,10 +25,11 @@
"sass-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 ./masonstrap/masonstrap.scss ./public/assets/css/masonstrap.css",
"sass-prefix": "npx postcss ./public/assets/css/masonstrap.css --use autoprefixer -d ./public/assets/css/",
"sass-minify": "cleancss --source-map --source-map-inline-sources -o ./public/assets/css/masonstrap.min.css ./public/assets/css/masonstrap.css",
"copy-fonts": "cp -r ./node_modules/font-awesome/fonts/ ./public/assets/",
"copy-js": "cp ./node_modules/jquery/dist/jquery.min.js ./public/assets/js/jquery.min.js && cp ./node_modules/jquery/dist/jquery.min.map ./public/assets/js/jquery.min.map && cp ./node_modules/bootstrap/dist/js/bootstrap.min.js ./public/assets/js/bootstrap.min.js && cp ./node_modules/popper.js/dist/umd/popper.min.js ./public/assets/js/popper.min.js && cp ./node_modules/popper.js/dist/umd/popper.min.js.map ./public/assets/js/popper.min.js.map",
"build-masonstrap": "npm-run-all copy-js sass-lint sass-compile sass-prefix sass-minify",
"build-masonstrap": "npm-run-all copy-js copy-fonts sass-lint sass-compile sass-prefix sass-minify",
"sass-watch": "onchange './masonstrap/*.scss' -- npm run build-masonstrap",
"http": "http-server -p 8000",
"start": "npm-run-all copy-js sass-watch"
"start": "npm-run-all copy-js copy-fonts sass-watch"
}
}
......@@ -635,6 +635,10 @@ flatten@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
font-awesome@^4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
for-in@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment