Verified Commit a18e0033 authored by David Haynes's avatar David Haynes 🙆
Browse files

FA5 free support

- after much deliberation, no SVG framework at this time
- the "old boring way" works just fine
parent 70420aeb
Pipeline #1859 passed with stages
in 1 minute
...@@ -14,6 +14,20 @@ const connect = require('gulp-connect'); ...@@ -14,6 +14,20 @@ const connect = require('gulp-connect');
const src = './src' const src = './src'
const dest = './build' const dest = './build'
// Move fonts to build/fonts
gulp.task('fonts', () => {
let brands = gulp.src('./node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/fa-brands-400.woff2')
.pipe(gulp.dest(dest + '/fonts/'))
let regular = gulp.src('./node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/fa-regular-400.woff2')
.pipe(gulp.dest(dest + '/fonts/'))
let solid = gulp.src('./node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/fa-solid-900.woff2')
.pipe(gulp.dest(dest + '/fonts/'))
return merge(brands, regular, solid).pipe(connect.reload())
});
// Move html to build/html // Move html to build/html
gulp.task('html', () => gulp.src(src + '/html/*.html').pipe(connect.reload()) gulp.task('html', () => gulp.src(src + '/html/*.html').pipe(connect.reload())
.pipe(gulp.dest(dest)) .pipe(gulp.dest(dest))
...@@ -69,7 +83,7 @@ gulp.task('http', () => { ...@@ -69,7 +83,7 @@ gulp.task('http', () => {
}); });
// Run all tasks // Run all tasks
gulp.task('build', ['sass', 'html', 'img', 'js']); gulp.task('build', ['sass', 'html', 'img', 'js', 'fonts']);
// By default, run all tasks and then rebuild on changes // By default, run all tasks and then rebuild on changes
gulp.task('default', ['http', 'build', 'watch']); gulp.task('default', ['http', 'build', 'watch']);
\ No newline at end of file
...@@ -68,17 +68,16 @@ ...@@ -68,17 +68,16 @@
<body style=""> <body style="">
<div class="container" style="padding-top: 5rem;"> <div class="container" style="padding-top: 5rem;">
<h1> <h1>
<span class="fa-stack fa-md hidden-sm-down"> <span class="fa-stack">
<i class="fa fa-circle fa-stack-2x"></i> <i class="fas fa-circle fa-stack-2x"></i>
<i class="fa fa-paint-brush fa-stack-1x fa-inverse"></i> <i class="fas fa-paint-brush fa-stack-1x fa-inverse"></i>
</span> Masonstrap </span> Masonstrap
</h1> </h1>
<hr /> <hr />
</body> </body>
<!-- load in external js --> <!-- load in external js -->
<script src="./js/jquery.min.js"></script> <script src="./js/jquery.min.js"></script>
<script src="./js/popper.min.js"></script> <script src="./js/bootstrap.bundle.min.js"></script>
<script src="./js/bootstrap.min.js"></script>
</html> </html>
\ No newline at end of file
// Masonstrap 4.0 Variables // Masonstrap 4.0 Variables
$fa-font-path: "../fonts";
// Global Bootstrap Options Overrides ------------------------------------------ // Global Bootstrap Options Overrides ------------------------------------------
$enable-shadows: true; $enable-shadows: true;
$enable-gradients: true; $enable-gradients: true;
......
...@@ -9,6 +9,11 @@ ...@@ -9,6 +9,11 @@
@import "_functions"; @import "_functions";
// Load in variable overwrites // Load in variable overwrites
@import '_variables'; @import '_variables';
// Load in FA 5
@import '../../node_modules/@fortawesome/fontawesome-free-webfonts/scss/fontawesome.scss';
@import '../../node_modules/@fortawesome/fontawesome-free-webfonts/scss/fa-brands.scss';
@import '../../node_modules/@fortawesome/fontawesome-free-webfonts/scss/fa-regular.scss';
@import '../../node_modules/@fortawesome/fontawesome-free-webfonts/scss/fa-solid.scss';
// Load in bootstrap 4 // Load in bootstrap 4
@import '../../node_modules/bootstrap/scss/bootstrap'; @import '../../node_modules/bootstrap/scss/bootstrap';
// Masonstrap custom mixins // Masonstrap custom mixins
......
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