From 89acd3a5899c3c06f73fb2d4813451afd87f5430 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Bellet <jb.bellet@gmail.com>
Date: Mon, 5 Dec 2022 09:50:07 +0100
Subject: [PATCH] Body is now with bg-color `$v2-body-bg`, ie. #f7f9fa

---
 app/webpacker/css/admin/v2/components/sidebar.scss | 10 ++++++++--
 app/webpacker/css/admin/v2/components/tables.scss  | 14 +++++++++++---
 .../css/admin/v2/components/tom_select.scss        |  2 +-
 app/webpacker/css/admin/v2/main.scss               |  4 ++++
 app/webpacker/css/admin/v2/plugins/select2.scss    |  2 +-
 app/webpacker/css/admin/v2/shared/forms.scss       |  1 +
 app/webpacker/css/admin/v2/variables.scss          |  2 ++
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/webpacker/css/admin/v2/components/sidebar.scss b/app/webpacker/css/admin/v2/components/sidebar.scss
index 185f1ce839..9275c66e46 100644
--- a/app/webpacker/css/admin/v2/components/sidebar.scss
+++ b/app/webpacker/css/admin/v2/components/sidebar.scss
@@ -1,5 +1,11 @@
 /* Override file app/webpacker/css/admin/components/sidebar.scss */
 
-#sidebar .sidebar-title {
-  color: $v2-blue;
+#sidebar {
+  border-color: #e7e7e7;
+  .sidebar-title {
+    color: $v2-blue;
+    & > span {
+      background-color: $v2-body-bg;
+    }
+  }
 }
diff --git a/app/webpacker/css/admin/v2/components/tables.scss b/app/webpacker/css/admin/v2/components/tables.scss
index dc1d9893ab..a9f7b20ba0 100644
--- a/app/webpacker/css/admin/v2/components/tables.scss
+++ b/app/webpacker/css/admin/v2/components/tables.scss
@@ -1,5 +1,9 @@
 /* Overide tables.scss app/webpacker/css/admin/components/tables.scss */
 
+table {
+  background-color: white;
+}
+
 table thead th {
   background-color: $v2-medium-light-grey;
   border: none;
@@ -43,8 +47,9 @@ table tbody tr {
   }
 }
 
-table th.actions,
-table td.actions {
+table thead tr th.actions,
+table tbody tr td.actions {
+  background-color: $v2-body-bg !important;
   // Special for icons in the actions column
   [class*="icon-"],
   button[class*="icon-"]:not(.disabled):not([disabled]):not(.secondary):not(.cancel) {
@@ -83,7 +88,10 @@ table td.actions {
 table#listing_orders {
   thead th.actions,
   thead td.actions {
-    background-color: $v2-medium-light-grey;
+    background-color: $v2-medium-light-grey !important;
+  }
+  tbody tr td.actions {
+    background-color: white !important;
   }
   td {
     // When the table is the listing of orders, we need to increase the height of the cells
diff --git a/app/webpacker/css/admin/v2/components/tom_select.scss b/app/webpacker/css/admin/v2/components/tom_select.scss
index e77cce7fc9..0f20a3ec58 100644
--- a/app/webpacker/css/admin/v2/components/tom_select.scss
+++ b/app/webpacker/css/admin/v2/components/tom_select.scss
@@ -2,7 +2,7 @@
 
 .ts-wrapper.primary.focus .ts-control,
 .ts-wrapper.primary .ts-control {
-  background-color: transparent;
+  background-color: white;
   border: 1px solid $v2-light-grey;
   color: $v2-medium-grey;
 
diff --git a/app/webpacker/css/admin/v2/main.scss b/app/webpacker/css/admin/v2/main.scss
index 3800b88b9b..0782caaba4 100644
--- a/app/webpacker/css/admin/v2/main.scss
+++ b/app/webpacker/css/admin/v2/main.scss
@@ -11,3 +11,7 @@
 @import "components/progress.scss";
 @import "components/sidebar.scss";
 @import "components/tom_select.scss";
+
+body {
+  background-color: $v2-body-bg;
+}
diff --git a/app/webpacker/css/admin/v2/plugins/select2.scss b/app/webpacker/css/admin/v2/plugins/select2.scss
index e0096e701e..487ef12ad5 100644
--- a/app/webpacker/css/admin/v2/plugins/select2.scss
+++ b/app/webpacker/css/admin/v2/plugins/select2.scss
@@ -2,7 +2,7 @@
 
 .select2-container {
   .select2-choice {
-    background-color: transparent;
+    background-color: white;
     border: 1px solid $v2-light-grey !important;
     color: $v2-medium-grey !important;
     padding-left: 5px;
diff --git a/app/webpacker/css/admin/v2/shared/forms.scss b/app/webpacker/css/admin/v2/shared/forms.scss
index 86ebddd051..adbcf7a4e3 100644
--- a/app/webpacker/css/admin/v2/shared/forms.scss
+++ b/app/webpacker/css/admin/v2/shared/forms.scss
@@ -30,6 +30,7 @@ fieldset label {
 
 fieldset legend {
   color: $v2-blue;
+  background-color: $v2-body-bg;
 }
 
 input[type="checkbox"],
diff --git a/app/webpacker/css/admin/v2/variables.scss b/app/webpacker/css/admin/v2/variables.scss
index c8ace9e880..b6548511de 100644
--- a/app/webpacker/css/admin/v2/variables.scss
+++ b/app/webpacker/css/admin/v2/variables.scss
@@ -21,3 +21,5 @@ $v2-green: #019854;
 $v2-green-light: #01cb70;
 
 $v2-box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); // Default box shadow for actions stuff
+
+$v2-body-bg: #f7f9fa;