From f6fd9ae9f1a8dd228ea1e513d7ee0c716a9b05fb Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sat, 16 Mar 2024 11:50:46 -0400 Subject: [PATCH] refactor: use proper custom color import --- resources/sass/_variables.scss | 7 ------- resources/sass/app.scss | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 resources/sass/_variables.scss diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss deleted file mode 100644 index 7475d3d7..00000000 --- a/resources/sass/_variables.scss +++ /dev/null @@ -1,7 +0,0 @@ -@use 'sass:color'; - -$footer-padding: 3rem 1.5rem 2rem; - -$orange: #ff8606; -$purple: #9400ff; -$custom-colors: ("orange": ($orange), "purple": ($purple)); diff --git a/resources/sass/app.scss b/resources/sass/app.scss index f91df5c1..6ac1c295 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -1,7 +1,23 @@ -@import 'variables'; +@charset "utf-8"; + +$orange: #ff8606; +$purple: #9400ff; + +$my-colors: ( + "orange": $orange, + "purple": $purple +); + +@use '../../../../Node/bulma-v1-private-beta/sass/utilities/derived-variables' with ( + $custom-colors: $my-colors +); + +@use '../../../../Node/bulma-v1-private-beta/sass' with ( + $footer-padding: 3rem 1.5rem 2rem, +); + @import 'progressbar'; -@import '../../../../Node/bulma-v1-private-beta/sass'; // '@creativebulma/bulma-divider'; // @import '@creativebulma/bulma-tooltip'; // @import 'bulma-ribbon/src/sass/index';