From 3a8e658d54a8b7bdae4d73037e999a9aadfbec82 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 18 Jun 2021 15:24:16 +0200
Subject: [PATCH] 80154: Keep using Bootstrap variables

---
 src/styles/_bootstrap_variables.scss                  |  6 ++++--
 .../custom/styles/_theme_sass_variable_overrides.scss |  7 +++++--
 .../dspace/styles/_theme_sass_variable_overrides.scss | 11 +++++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index db4387dc30..41a304af39 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -12,6 +12,8 @@ $image-path: "../assets/images" !default;
 
 /** Bootstrap Variables **/
 /* Colors */
+$gray-700: #495057; !default  // Bootstrap $gray-700
+$gray-100: #f8f9fa; !default  //           $gray-100
 
 /* Reassign color vars to semantic color scheme */
 $blue:   #2B4E72 !default;
@@ -23,12 +25,12 @@ $dark:   darken($blue, 17%) !default;
 
 $theme-colors: (
         primary: $blue,
-        secondary: #495057,   // Bootstrap $gray-700
+        secondary: $gray-700,
         success: $green,
         info: $cyan,
         warning: $yellow,
         danger: $red,
-        light: #f8f9fa,       // Bootstrap $gray-100
+        light: $gray-100,
         dark: $dark
 ) !default;
 /* Fonts */
diff --git a/src/themes/custom/styles/_theme_sass_variable_overrides.scss b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
index 30d806ecda..0711268582 100644
--- a/src/themes/custom/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
@@ -5,6 +5,9 @@
 
 // $font-family-sans-serif:      -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
 //
+// $gray-700: #495057; !default  // Bootstrap $gray-700
+// $gray-100: #f8f9fa; !default  //           $gray-100
+//
 // $blue:   #2B4E72 !default;
 // $green:  #94BA65 !default;
 // $cyan:   #006666 !default;
@@ -14,12 +17,12 @@
 //
 // $theme-colors: (
 //   primary: $blue,
-//   secondary: #495057,   // Bootstrap $gray-700
+//   secondary: $gray-700,
 //   success: $green,
 //   info: $cyan,
 //   warning: $yellow,
 //   danger: $red,
-//   light: #f8f9fa,       // Bootstrap $gray-100
+//   light: $gray-100,
 //   dark: $dark
 // ) !default;
 //
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index 64daf347b4..b6fddce24a 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -17,10 +17,13 @@ $yellow: #ec9433 !default;
 $red: #CF4444 !default;
 $dark: #43515f !default;
 
-$body-color: #343a40 !default;                    // Bootstrap $gray-800
+$gray-800: #343a40; !default
+$gray-400: #ced4da; !default
+$gray-100: #f8f9fa; !default
 
-$table-accent-bg:             #f8f9fa !default;   // Bootstrap $gray-100
-$table-hover-bg:              #ced4da !default;   // Bootstrap $gray-400
+$body-color: $gray-800 !default;                    // Bootstrap $gray-800
+
+$table-accent-bg: $gray-100 !default;   // Bootstrap $gray-100
+$table-hover-bg: $gray-400 !default;   // Bootstrap $gray-400
 
 $yiq-contrasted-threshold:  170 !default;
-