From 9c2d884c273f40968ef7932ff38c2e47226f0762 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Fri, 3 May 2019 01:05:01 -0400 Subject: [PATCH] Move the base-font-size to app.scss and move the functions below that so _var.scss can use functions if necessary --- resources/assets/sass/_var.scss | 1 - resources/assets/sass/app.scss | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/resources/assets/sass/_var.scss b/resources/assets/sass/_var.scss index 72c9656..2dd51fa 100644 --- a/resources/assets/sass/_var.scss +++ b/resources/assets/sass/_var.scss @@ -31,7 +31,6 @@ $c-error: #fa2036; // error $nav-link-count: 3; // Sizes -$base-font-size: 16px; $nav-height-desktop: 60px; $nav-height-mobile: 50px; $nav-link-height-mobile: 50px; diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss index 7f9ab1c..6d8568f 100644 --- a/resources/assets/sass/app.scss +++ b/resources/assets/sass/app.scss @@ -1,3 +1,9 @@ +// Base font size +$base-font-size: 16px; + +// Functions +@import "functions/**/*.scss"; + // Core @import "_var"; @import "_fonts"; @@ -5,11 +11,8 @@ // Libraries @import "bootstrap/scss/bootstrap.scss"; -// Functionality -@import "functions/**/*.scss"; -@import "mixins/**/*.scss"; - // Supplementary +@import "mixins/**/*.scss"; @import "classes/**/*.scss"; @import "partials/**/*.scss"; @import "sections/**/*.scss";