From 51e6b5ef102720e8af68011f987bfca6da388a2d Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Thu, 11 Jan 2018 23:36:17 -0500 Subject: [PATCH] Don't include _var.scss in dashboard.scss now that the bootstrap versions have diverged --- resources/assets/sass/_var.scss | 5 ----- resources/assets/sass/dashboard.scss | 9 ++++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/assets/sass/_var.scss b/resources/assets/sass/_var.scss index 86ea6eb..a103239 100644 --- a/resources/assets/sass/_var.scss +++ b/resources/assets/sass/_var.scss @@ -27,11 +27,6 @@ $c-base: #08c; // base $c-accent: #000; // accent $c-error: #f00; // error -$c-dashboard-dark: #3e6087; -$c-dashboard-light: #f1f1f1; -$c-dashboard-edit: #87823e; -$c-dashboard-delete: #87483e; - // Values $nav-link-count: 2; diff --git a/resources/assets/sass/dashboard.scss b/resources/assets/sass/dashboard.scss index 0eae7f1..5ab7a5b 100644 --- a/resources/assets/sass/dashboard.scss +++ b/resources/assets/sass/dashboard.scss @@ -7,12 +7,19 @@ @import "SpinKit/css/spinners/11-folding-cube"; // Core -@import "_var"; @import "_fonts"; // Fontawesome Path $fa-font-path: "/fonts"; +// Colours +$c-text: #111; // text +$c-text-light: #fff; // light text +$c-dashboard-dark: #3e6087; +$c-dashboard-light: #f1f1f1; +$c-dashboard-edit: #87823e; +$c-dashboard-delete: #87483e; + // // Main Dashboard Styles //