Skip to content

Commit

Permalink
Merge pull request #2336 from atmire/w2p-103005_variable-overwrite-fi…
Browse files Browse the repository at this point in the history
…x_contribution

Fix background-color overwrite issue
  • Loading branch information
tdonohue authored Jun 23, 2023
2 parents db526a0 + d4a59dd commit 990bde4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
9 changes: 9 additions & 0 deletions src/styles/_bootstrap_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ $yellow: #ec9433 !default;
$red: #CF4444 !default;
$dark: darken($blue, 17%) !default;



$theme-colors: (
primary: $blue,
secondary: $gray-700,
Expand All @@ -49,3 +51,10 @@ $navbar-light-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox
$enable-shadows: true !default;

$yiq-contrasted-threshold: 165 !default;

$primary-bg: #{lighten(map-get($theme-colors, primary), 30%)} !default;
$secondary-bg: #{lighten(map-get($theme-colors, secondary), 30%)} !default;
$success-bg: #{lighten(map-get($theme-colors, success), 30%)} !default;
$info-bg: #{lighten(map-get($theme-colors, info), 30%)} !default;
$warning-bg: #{lighten(map-get($theme-colors, warning), 30%)} !default;
$danger-bg: #{lighten(map-get($theme-colors, danger), 30%)} !default;
12 changes: 6 additions & 6 deletions src/styles/_bootstrap_variables_mapping.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
--bs-teal: #{$teal};
--bs-cyan: #{$cyan};
--bs-primary: #{$primary};
--bs-primary-bg: #{lighten($primary, 30%)};
--bs-primary-bg: #{$primary-bg};
--bs-secondary: #{$secondary};
--bs-secondary-bg: #{lighten($secondary, 30%)};
--bs-secondary-bg: #{$secondary-bg};
--bs-success: #{$success};
--bs-success-bg: #{lighten($success, 30%)};
--bs-success-bg: #{$success-bg};
--bs-info: #{$info};
--bs-info-bg: #{lighten($info, 30%)};
--bs-info-bg: #{$info-bg};
--bs-warning: #{$warning};
--bs-warning-bg: #{lighten($warning, 30%)};
--bs-warning-bg: #{$warning-bg};
--bs-danger: #{$danger};
--bs-danger-bg: #{lighten($danger, 30%)};
--bs-danger-bg: #{$danger-bg};
--bs-light: #{$light};
--bs-dark: #{$dark};

Expand Down

0 comments on commit 990bde4

Please sign in to comment.