From b562b7c09b6b8a62f3dbb107553696d46c3bf78e Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Wed, 1 Feb 2023 09:03:32 -0500 Subject: [PATCH] [BSv5] Fix SCSS import issue and replace darken() --- assets/scss/_variables.scss | 8 ++++---- assets/scss/main.scss | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss index 1d6a325e8b..9ab022532b 100644 --- a/assets/scss/_variables.scss +++ b/assets/scss/_variables.scss @@ -38,7 +38,7 @@ $gray-800: #333 !default; $gray-900: #222 !default; $black: #000 !default; -$code-color: darken($secondary, 20%) !default; +$code-color: shade-color($secondary, 40%) !default; // UI element colors @@ -52,9 +52,9 @@ $td-sidebar-border-color: $border-color !default; // These colors are all part of the theme palette, but the mix is fairly random to create variation. This can be overridden by the project if needed. $td-box-colors: $dark, $primary, $secondary, $info, $gray-600, $success, $warning, $dark, $danger, $primary, $secondary, $info !default; -$link-color: darken($blue, 15%) !default; +$link-color: adjust-color($blue, $lightness: -15%) !default; $link-decoration: none !default; -$link-hover-color: darken($link-color, 15%) !default; +$link-hover-color: shade-color($link-color, 30%) !default; $link-hover-decoration: none !default; // Fonts @@ -116,7 +116,7 @@ $td-block-space-bottom-base: 4 * $spacer !default; $pagination-color: $gray-600 !default; $pagination-border-color: rgba($black, 0.1) !default; -$pagination-active-border-color: darken($primary, 5%) !default; +$pagination-active-border-color: adjust-color($primary, $lightness: -5%) !default; $pagination-disabled-color: $gray-300 !default; // Navbar diff --git a/assets/scss/main.scss b/assets/scss/main.scss index 6c90d4654b..a50e5ec340 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -1,3 +1,5 @@ +@import "../vendor/bootstrap/scss/functions"; + @import "support/functions"; @import "variables_project"; @import "variables";