From c5e0ac56095047d47c6aa416bd353a43c154fc70 Mon Sep 17 00:00:00 2001
From: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>
Date: Sat, 7 Nov 2020 19:58:12 +1100
Subject: [PATCH 1/4] Make switch component background stand out in modals

- Disabled checkbox switch now has body (white by default)
background within modals

- Still turns green when on

- Still has control background outside of modals

Fixes #2119
---
 less/common/Checkbox.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/less/common/Checkbox.less b/less/common/Checkbox.less
index 1b1b296137..601cf69505 100644
--- a/less/common/Checkbox.less
+++ b/less/common/Checkbox.less
@@ -31,6 +31,10 @@
   background: @control-bg;
   .transition(background-color 0.2s);
 
+  .Modal-content & {
+    background: @body-bg;
+  }
+
   .on& {
     background: #58a400;
   }

From 7acecf05365dd93223602d9abf7b99bfe535f4dc Mon Sep 17 00:00:00 2001
From: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>
Date: Sun, 8 Nov 2020 20:58:22 +1100
Subject: [PATCH 2/4] Moved styles to Modal.less and changed target to
 .Modal-body

---
 less/common/Checkbox.less | 4 ----
 less/common/Modal.less    | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/less/common/Checkbox.less b/less/common/Checkbox.less
index 601cf69505..1b1b296137 100644
--- a/less/common/Checkbox.less
+++ b/less/common/Checkbox.less
@@ -31,10 +31,6 @@
   background: @control-bg;
   .transition(background-color 0.2s);
 
-  .Modal-content & {
-    background: @body-bg;
-  }
-
   .on& {
     background: #58a400;
   }
diff --git a/less/common/Modal.less b/less/common/Modal.less
index 70dfcf9762..32c1df5b7f 100644
--- a/less/common/Modal.less
+++ b/less/common/Modal.less
@@ -105,6 +105,14 @@
       text-align: left;
     }
   }
+
+  .Checkbox--switch .Checkbox-display {
+    background: @body-bg;
+  }
+
+  .on.Checkbox--switch .Checkbox-display {
+    background: #58a400;
+  }
 }
 .Modal-footer {
   border: 0;

From 62af67b22ddd25c1661ce25ad9127541c4cdb482 Mon Sep 17 00:00:00 2001
From: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>
Date: Sun, 8 Nov 2020 21:27:19 +1100
Subject: [PATCH 3/4] Simplified styles as suggested

---
 less/common/Modal.less | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/less/common/Modal.less b/less/common/Modal.less
index 32c1df5b7f..a3804299fb 100644
--- a/less/common/Modal.less
+++ b/less/common/Modal.less
@@ -106,13 +106,9 @@
     }
   }
 
-  .Checkbox--switch .Checkbox-display {
+  .off.Checkbox--switch .Checkbox-display {
     background: @body-bg;
   }
-
-  .on.Checkbox--switch .Checkbox-display {
-    background: #58a400;
-  }
 }
 .Modal-footer {
   border: 0;

From c4b0cae969c6e9fa30111187e941b382370493e2 Mon Sep 17 00:00:00 2001
From: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>
Date: Mon, 9 Nov 2020 18:41:38 +1100
Subject: [PATCH 4/4] Changed background from  to

---
 less/common/Modal.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/less/common/Modal.less b/less/common/Modal.less
index a3804299fb..b2062e2a20 100644
--- a/less/common/Modal.less
+++ b/less/common/Modal.less
@@ -107,7 +107,7 @@
   }
 
   .off.Checkbox--switch .Checkbox-display {
-    background: @body-bg;
+    background: @muted-more-color;
   }
 }
 .Modal-footer {