From 60ad2bdb7daee0fe07f3df2884afdfcdc13e3af0 Mon Sep 17 00:00:00 2001
From: Elisabeth Dickinson <edi@odoo.com>
Date: Wed, 28 Dec 2022 08:51:12 +0100
Subject: [PATCH] [IMP][CSS] Place overrides in bootstrap_overridden file

---
 extensions/odoo_theme/static/scss/_variables.scss  | 14 --------------
 .../static/scss/bootstrap_overridden.scss          | 10 ++++++++++
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/extensions/odoo_theme/static/scss/_variables.scss b/extensions/odoo_theme/static/scss/_variables.scss
index 061f900e3..bb62f9a5b 100644
--- a/extensions/odoo_theme/static/scss/_variables.scss
+++ b/extensions/odoo_theme/static/scss/_variables.scss
@@ -110,20 +110,6 @@ $i-close: "\e942";
 //------------------------------------------------------------------------------
 // Colors
 //------------------------------------------------------------------------------
-//Replace bootstrap's gray values
-$white:                                     #FFFFFF;
-$gray-100:                                  #F8F8F8 !default;
-$gray-200:                                  #F2F2F2 !default;
-$gray-300:                                  #DEE2E6 !default;
-$gray-400:                                  #D5D5D5 !default;
-$gray-500:                                  #ADB5BD !default;
-$gray-600:                                  #888888 !default;
-$gray-700:                                  #707070 !default;
-$gray-800:                                  #343A40 !default;
-$gray-900:                                  #282F33 !default;
-
-$o-light:                                   $gray-100;
-$o-dark :                                   $gray-800;
 
 $o-gray-light :                             $gray-400;
 $o-gray :                                   $gray-600;
diff --git a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
index 64249def1..832a2e5f8 100644
--- a/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
+++ b/extensions/odoo_theme/static/scss/bootstrap_overridden.scss
@@ -16,6 +16,16 @@ $primary:                                   $o-teal;
 $secondary:                                 $o-violet;
 $light:                                     $o-light;
 $dark:                                      $o-dark;
+$white:                                     #FFFFFF;
+$gray-100:                                  #F8F8F8 !default;
+$gray-200:                                  #F2F2F2 !default;
+$gray-300:                                  #DEE2E6 !default;
+$gray-400:                                  #D5D5D5 !default;
+$gray-500:                                  #ADB5BD !default;
+$gray-600:                                  #888888 !default;
+$gray-700:                                  #707070 !default;
+$gray-800:                                  #343A40 !default;
+$gray-900:                                  #282F33 !default;
 $success:                                   $green;
 $info:                                      $blue;
 $warning:                                   $orange;