From 2adaa64eeefd2d0f1a13513e569b677ffcbe9ea1 Mon Sep 17 00:00:00 2001
From: M Fahru <m.fahru@overleaf.com>
Date: Wed, 27 Nov 2024 09:49:45 -0700
Subject: [PATCH] Merge pull request #22136 from
 overleaf/mf-fix-spacing-checkout-page-redesign

[web] Fix spacing on checkout page redesign form

GitOrigin-RevId: eb85a37cf8ba9c2e32a78fa6585b5102b8c01bce
---
 .../bootstrap-5/pages/subscription.scss       | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/subscription.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/subscription.scss
index 1759fb4699..beb34569a3 100644
--- a/services/web/frontend/stylesheets/bootstrap-5/pages/subscription.scss
+++ b/services/web/frontend/stylesheets/bootstrap-5/pages/subscription.scss
@@ -245,11 +245,31 @@
 
     h1 {
       @include heading-md;
+
+      margin-bottom: var(--spacing-08);
     }
 
     .student-disclaimer {
       @include body-sm;
     }
+
+    .form-group {
+      &:not(.payment-method-toggle) {
+        margin-bottom: var(--spacing-05);
+      }
+
+      &.address-1 {
+        margin-bottom: var(--spacing-04);
+      }
+    }
+
+    .form-check {
+      margin-bottom: 0; // override bootstrap5 default margin-bottom of 0.125rem
+    }
+
+    .checkout-form-submit {
+      margin-top: var(--spacing-08);
+    }
   }
 }
 
@@ -312,7 +332,13 @@
 
 .payment-method-toggle {
   .form-check {
-    margin-bottom: var(--spacing-05);
+    &:first-of-type {
+      margin-bottom: var(--spacing-05);
+    }
+
+    label {
+      margin-bottom: 0; // override .website-redesign default
+    }
   }
 
   .payment-method-logos {
@@ -327,6 +353,7 @@
 
 .address2-button {
   text-decoration: none;
+  margin-bottom: var(--spacing-05);
   padding: 0;
 
   :hover {