WOAH I UNDERSTAND WHAT I WAS DOING

74ef14f4 · David Haynes · b16729bc · 74ef14f4 · 74ef14f4
Commit 74ef14f4 authored Aug 12, 2017 by David Haynes 🙆
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

_masonstrap-custom.scss masonstrap/_masonstrap-custom.scss +0 -4

masonstrap.scss masonstrap/masonstrap.scss +6 -0

No files found.
--- a/masonstrap/_masonstrap.scss
+++ b/masonstrap/_masonstrap.scss
 // Masonstrap 4.0
-// Bootswatch
 // -----------------------------------------------------

-$web-font-path: "https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700" !default;
-@import url($web-font-path);
-
 // Navbar ======================================================================

 .navbar {

--- a/masonstrap/masonstrap.scss
+++ b/masonstrap/masonstrap.scss
+// Load in bootstrap 4
+@import '../node_modules/bootstrap/scss/bootstrap.scss';
+// Load in variable overwrites
+@import '_variables.scss';
+// Load in additional component changes
+@import '_masonstrap-custom.scss';