Skip to content

Commit 990bde4

Browse files
authored
Merge pull request DSpace#2336 from atmire/w2p-103005_variable-overwrite-fix_contribution
Fix background-color overwrite issue
2 parents db526a0 + d4a59dd commit 990bde4

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

src/styles/_bootstrap_variables.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ $yellow: #ec9433 !default;
2828
$red: #CF4444 !default;
2929
$dark: darken($blue, 17%) !default;
3030

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

5153
$yiq-contrasted-threshold: 165 !default;
54+
55+
$primary-bg: #{lighten(map-get($theme-colors, primary), 30%)} !default;
56+
$secondary-bg: #{lighten(map-get($theme-colors, secondary), 30%)} !default;
57+
$success-bg: #{lighten(map-get($theme-colors, success), 30%)} !default;
58+
$info-bg: #{lighten(map-get($theme-colors, info), 30%)} !default;
59+
$warning-bg: #{lighten(map-get($theme-colors, warning), 30%)} !default;
60+
$danger-bg: #{lighten(map-get($theme-colors, danger), 30%)} !default;

src/styles/_bootstrap_variables_mapping.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@
2929
--bs-teal: #{$teal};
3030
--bs-cyan: #{$cyan};
3131
--bs-primary: #{$primary};
32-
--bs-primary-bg: #{lighten($primary, 30%)};
32+
--bs-primary-bg: #{$primary-bg};
3333
--bs-secondary: #{$secondary};
34-
--bs-secondary-bg: #{lighten($secondary, 30%)};
34+
--bs-secondary-bg: #{$secondary-bg};
3535
--bs-success: #{$success};
36-
--bs-success-bg: #{lighten($success, 30%)};
36+
--bs-success-bg: #{$success-bg};
3737
--bs-info: #{$info};
38-
--bs-info-bg: #{lighten($info, 30%)};
38+
--bs-info-bg: #{$info-bg};
3939
--bs-warning: #{$warning};
40-
--bs-warning-bg: #{lighten($warning, 30%)};
40+
--bs-warning-bg: #{$warning-bg};
4141
--bs-danger: #{$danger};
42-
--bs-danger-bg: #{lighten($danger, 30%)};
42+
--bs-danger-bg: #{$danger-bg};
4343
--bs-light: #{$light};
4444
--bs-dark: #{$dark};
4545

0 commit comments

Comments
 (0)