Drop support for webfonts -> SVG framework

- yay!

gulpfile.js

@@ -17,15 +17,9 @@ const src = './src'
 const dest = './build'
 const all_js = ['./node_modules/jquery/dist/jquery.min.js',
   './node_modules/bootstrap/dist/js/bootstrap.bundle.min.js',
-                src + '/js/*.js'];
-
-// Move fonts to build/fonts
-gulp.task('fonts', () => {
-  let fa = gulp.src('./node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/*')
-  .pipe(gulp.dest(dest + '/fonts/'))
-
-  return merge(fa).pipe(connect.reload())  
-});
+  './node_modules/@fortawesome/fontawesome-free/js/all.js',
+  src + '/js/*.js'
+];
 
 // Move html to build/html
 gulp.task('html', () => gulp.src(src + '/html/*.html')
@@ -43,7 +37,9 @@ gulp.task('img', () => gulp.src(src + '/img/*')
 // Build masonstrap.min.js
 gulp.task('js', () => gulp.src(all_js)
   .pipe(concat('masonstrap.js'))
-  .pipe(minify({ext: ".min.js"}))
+  .pipe(minify({
+    ext: ".min.js"
+  }))
   .pipe(gulp.dest(dest + '/js/'))
 );
 
@@ -56,7 +52,9 @@ gulp.task('sass', () => gulp.src(src + '/scss/*.scss')
   .pipe(sourcemaps.write())
   .pipe(gulp.dest(dest + '/css/'))
   .pipe(uglifycss())
-  .pipe(rename({extname: ".min.css"}))
+  .pipe(rename({
+    extname: ".min.css"
+  }))
   .pipe(gulp.dest(dest + '/css/'))
 );
 
@@ -78,7 +76,7 @@ gulp.task('http', () => {
 });
 
 // Run all tasks
-gulp.task('build', ['sass', 'html', 'img', 'js', 'fonts']);
+gulp.task('build', ['sass', 'html', 'img', 'js']);
 
 // By default, run all tasks and then rebuild on changes
 gulp.task('default', ['http', 'build', 'watch']);

package.json

@@ -6,23 +6,19 @@
   "author": "Mason SRCT",
   "license": "MIT",
   "dependencies": {
-    "@fortawesome/fontawesome": "^1.1.8",
-    "@fortawesome/fontawesome-free-brands": "^5.0.13",
-    "@fortawesome/fontawesome-free-regular": "^5.0.13",
-    "@fortawesome/fontawesome-free-solid": "^5.0.13",
-    "@fortawesome/fontawesome-free-webfonts": "^1.0.9",
-    "autoprefixer": "^8.6.2",
+    "@fortawesome/fontawesome-free": "^5.1.0",
+    "autoprefixer": "^8.6.3",
     "bootstrap": "^4.1.1",
     "gulp-concat": "^2.6.1",
     "gulp-connect": "^5.0.0",
     "gulp-imagemin": "^4.1.0",
-    "gulp-minify": "^2.1.0",
+    "gulp-minify": "^3.0.2",
     "gulp-postcss": "^7.0.0",
-    "gulp-rename": "^1.2.2",
+    "gulp-rename": "^1.3.0",
     "gulp-sass": "^4.0.1",
     "gulp-sourcemaps": "^2.6.1",
     "gulp-uglify": "^3.0.0",
-    "gulp-uglifycss": "^1.0.8",
+    "gulp-uglifycss": "^1.1.0",
     "jquery": "^3.2.1",
     "merge-stream": "^1.0.1"
   },

src/scss/_functions.scss

 // Custom functions
-
 // Get a key from the primary-palette map
 @function get-primary-palette($key) {
   @if map-has-key($primary-palette, $key) {
     @return map-get($primary-palette, $key);
   }
-  
   @warn "Unknown `#{$key}` in $primary-palette.";
   @return null;
 }
@@ -15,7 +13,6 @@
   @if map-has-key($universal-palette, $key) {
     @return map-get($universal-palette, $key);
   }
-  
   @warn "Unknown `#{$key}` in $universal-palette.";
   @return null;
 }
@@ -25,7 +22,6 @@
   @if map-has-key($neutral-palette, $key) {
     @return map-get($neutral-palette, $key);
   }
-  
   @warn "Unknown `#{$key}` in $neutral-palette.";
   @return null;
 }

src/scss/_overwrites.scss

 // Things that originate from Bootstrap that we overwrite
-
 // Legacy legend behavior
 legend {
   @extend legend;
@@ -10,11 +9,11 @@ legend {
 }
 
 // Ensure btn-outline colors remain the same even if there is no href 
-@each $color, $value in $theme-colors {
+@each $color,
+$value in $theme-colors {
   a.btn-outline-#{$color}:not([href]) {
     color: $value;
   }
-
   a.btn-outline-#{$color}:not([href]):hover {
     color: $white;
   }

src/scss/_styles.scss

 // Custom classes and styling
-
 .accent-btn-outline {
     @include button-outline-variant(theme-color('accent'), $gray-900);
 }

src/scss/_variables.scss

 // Masonstrap 4.0 Variables
-
-// Global External Packages Settings -------------------------------------------
-$fa-font-path:   "../fonts";
-
 // Global Bootstrap Options Overrides ------------------------------------------
 $enable-shadows: true;
 $enable-gradients: true;
-
 // Mason Branding Colors -------------------------------------------------------
-
-$primary-palette: ( 
-  mason-green: #006633,
-  mason-gold: #FFCC33  
-);
-
-$universal-palette: (
-  dark-turqiose: #00909E,
-  medium-slate-blue: #425195,
-  cardinal-red: #AC1D37,
-  bright-green: #81902B,
-  dark-goldenrod: #9D7F00,
-  tangerine: #F7941E
-);
-
-$neutral-palette: (
-  light-gray: #D1D3D5,
-  exploratory-gray: #A9A0AD,
-  observatory-gray: #87908F,
-  light-taupe-tile: #CCC288,
-  foundation-stone: #A39382,
-  statue-bronze: #A39382,
-  mason-tan: #E4E6D7,
-  southside-glass: #a0c9c1,
-  school-of-art-stone: #D8D8C1
-);
-
+$primary-palette: ( mason-green: #006633, mason-gold: #FFCC33);
+$universal-palette: ( dark-turqiose: #00909E, medium-slate-blue: #425195, cardinal-red: #AC1D37, bright-green: #81902B, dark-goldenrod: #9D7F00, tangerine: #F7941E);
+$neutral-palette: ( light-gray: #D1D3D5, exploratory-gray: #A9A0AD, observatory-gray: #87908F, light-taupe-tile: #CCC288, foundation-stone: #A39382, statue-bronze: #A39382, mason-tan: #E4E6D7, southside-glass: #a0c9c1, school-of-art-stone: #D8D8C1);
 // Bootstrap Color Overrides ---------------------------------------------------
-
-$theme-colors: (
-  primary: get-primary-palette('mason-green'),
-  accent: get-primary-palette('mason-gold'),
-);
+$theme-colors: ( primary: get-primary-palette('mason-green'), accent: get-primary-palette('mason-gold'), );

src/scss/masonstrap.scss

 /*!
- * Masonstrap 4.0
+ * Masonstrap 4.1.1
  *
  * author: Mason SRCT (https://srct.gmu.edu)
  * source code: (https://git.gmu.edu/srct/masonstrap)
  * license: MIT (https://git.gmu.edu/srct/masonstrap/raw/master/LICENSE)
  */
+
 // Masonstrap custom functions
 @import "_functions";
 // Load in variable overwrites
 @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
 @import '../../node_modules/bootstrap/scss/bootstrap';
 // Masonstrap custom mixins