mirror of
https://github.com/prurigro/hypothetical.git
synced 2024-11-21 15:42:31 -05:00
Move the base-font-size to app.scss and move the functions below that so _var.scss can use functions if necessary
This commit is contained in:
parent
2a959b471a
commit
9c2d884c27
2 changed files with 7 additions and 5 deletions
1
resources/assets/sass/_var.scss
vendored
1
resources/assets/sass/_var.scss
vendored
|
@ -31,7 +31,6 @@ $c-error: #fa2036; // error
|
||||||
$nav-link-count: 3;
|
$nav-link-count: 3;
|
||||||
|
|
||||||
// Sizes
|
// Sizes
|
||||||
$base-font-size: 16px;
|
|
||||||
$nav-height-desktop: 60px;
|
$nav-height-desktop: 60px;
|
||||||
$nav-height-mobile: 50px;
|
$nav-height-mobile: 50px;
|
||||||
$nav-link-height-mobile: 50px;
|
$nav-link-height-mobile: 50px;
|
||||||
|
|
11
resources/assets/sass/app.scss
vendored
11
resources/assets/sass/app.scss
vendored
|
@ -1,3 +1,9 @@
|
||||||
|
// Base font size
|
||||||
|
$base-font-size: 16px;
|
||||||
|
|
||||||
|
// Functions
|
||||||
|
@import "functions/**/*.scss";
|
||||||
|
|
||||||
// Core
|
// Core
|
||||||
@import "_var";
|
@import "_var";
|
||||||
@import "_fonts";
|
@import "_fonts";
|
||||||
|
@ -5,11 +11,8 @@
|
||||||
// Libraries
|
// Libraries
|
||||||
@import "bootstrap/scss/bootstrap.scss";
|
@import "bootstrap/scss/bootstrap.scss";
|
||||||
|
|
||||||
// Functionality
|
|
||||||
@import "functions/**/*.scss";
|
|
||||||
@import "mixins/**/*.scss";
|
|
||||||
|
|
||||||
// Supplementary
|
// Supplementary
|
||||||
|
@import "mixins/**/*.scss";
|
||||||
@import "classes/**/*.scss";
|
@import "classes/**/*.scss";
|
||||||
@import "partials/**/*.scss";
|
@import "partials/**/*.scss";
|
||||||
@import "sections/**/*.scss";
|
@import "sections/**/*.scss";
|
||||||
|
|
Loading…
Reference in a new issue