From 666f965b791d3683a61cff0c111ca6589a81a5e7 Mon Sep 17 00:00:00 2001 From: Felix Rindt Date: Thu, 22 Jun 2023 10:56:15 +0200 Subject: [PATCH] set more bootstrap background colors --- .../ephios/scss/ephios_bootstrap_variables.scss | 13 +++++-------- ephios/static/ephios/scss/main.scss | 17 +++++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/ephios/static/ephios/scss/ephios_bootstrap_variables.scss b/ephios/static/ephios/scss/ephios_bootstrap_variables.scss index ed8339ca5..8da5c701f 100644 --- a/ephios/static/ephios/scss/ephios_bootstrap_variables.scss +++ b/ephios/static/ephios/scss/ephios_bootstrap_variables.scss @@ -35,22 +35,19 @@ $light: $gray-250; $dark: $gray-900; $custom-theme-colors: ( - "primary": $primary, - "secondary": $secondary, - "success": $success, - "info": $info, - "warning": $warning, - "danger": $danger, - "light": $light, - "dark": $dark, "brand": $brand-color, ); // Looks //$link-decoration: none; + +// TOOD this needs to be adapted for dark-theme $body-bg: $gray-200; +$input-bg: $gray-100; +$dropdown-bg: $gray-100; $card-bg: $gray-100; $card-cap-bg: $gray-100; +$list-group-bg: $gray-100; $text-muted: $gray-550; diff --git a/ephios/static/ephios/scss/main.scss b/ephios/static/ephios/scss/main.scss index aae03ecbf..42790d32e 100644 --- a/ephios/static/ephios/scss/main.scss +++ b/ephios/static/ephios/scss/main.scss @@ -1,24 +1,25 @@ +// this file is based on the guide at https://getbootstrap.com/docs/5.3/customize/sass/#importing + // 1. Include functions first (so you can manipulate colors, SVGs, calc, etc) @import "../../bootstrap/scss/functions"; // 2. Include any default variable overrides here @import "ephios_bootstrap_variables"; -// bootstrap variables come next +// 3. Include remainder of required Bootstrap stylesheets (including any separate color mode stylesheets) @import "../../bootstrap/scss/variables"; @import "../../bootstrap/scss/variables-dark"; -// Sass map overrides here -// https://getbootstrap.com/docs/5.3/migration/#new-_mapsscss +// 4. Include any default map overrides here $theme-colors: map-merge($theme-colors, $custom-theme-colors); -// 3. Include bootstrap +// 5. Include remainder of required parts @import "../../bootstrap/scss/maps"; @import "../../bootstrap/scss/mixins"; @import "../../bootstrap/scss/utilities"; -// Layout & components +// 6. Optionally include any other parts as needed @import "../../bootstrap/scss/root"; @import "../../bootstrap/scss/reboot"; @import "../../bootstrap/scss/type"; @@ -50,11 +51,11 @@ $theme-colors: map-merge($theme-colors, $custom-theme-colors); @import "../../bootstrap/scss/spinners"; @import "../../bootstrap/scss/offcanvas"; @import "../../bootstrap/scss/placeholders"; - -// Helpers and utilities @import "../../bootstrap/scss/helpers"; + +// 7. Optionally include utilities API last to generate classes based on the Sass map in `_utilities.scss` @import "../../bootstrap/scss/utilities/api"; -// 4. Add additional custom code here +// 8. Add additional custom code here @import "ephios_utilities"; @import "ephios_custom"; \ No newline at end of file