From 13d09c8bbfc9cb38185711498e7097482c8b02a4 Mon Sep 17 00:00:00 2001
From: Anna <annagav@mit.edu>
Date: Tue, 17 Sep 2024 14:45:42 -0400
Subject: [PATCH] Product page

---
 frontend/public/scss/layout.scss              |  2 -
 frontend/public/scss/meta-product-page.scss   |  1 -
 frontend/public/scss/product-details.scss     | 42 -------------------
 .../scss/product-page/product-details.scss    | 27 +++++++++++-
 .../public/scss/product-page/user-menu.scss   |  7 ----
 5 files changed, 26 insertions(+), 53 deletions(-)
 delete mode 100644 frontend/public/scss/product-page/user-menu.scss

diff --git a/frontend/public/scss/layout.scss b/frontend/public/scss/layout.scss
index d5e21f90f7..f93431dfd9 100644
--- a/frontend/public/scss/layout.scss
+++ b/frontend/public/scss/layout.scss
@@ -31,7 +31,6 @@
 @import "home-page/featured-product-cards";
 @import "home-page/home-page-hero";
 @import "home-page/home-page-video-component";
-@import "product-page/user-menu";
 @import "product-page/product-details";
 @import "product-page/product-faculty-members";
 @import "home-page/home-page-contact-row";
@@ -40,7 +39,6 @@
 @import "banner";
 
 body {
-  font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
   margin: 0;
   color: #000000;
   background: $body-bg;
diff --git a/frontend/public/scss/meta-product-page.scss b/frontend/public/scss/meta-product-page.scss
index de7e0b17c1..62c0184fdd 100644
--- a/frontend/public/scss/meta-product-page.scss
+++ b/frontend/public/scss/meta-product-page.scss
@@ -1,7 +1,6 @@
 @import "variables";
 @import "~bootstrap/scss/bootstrap-utilities";
 
-@import "product-page/user-menu";
 @import "product-page/product-details";
 @import "product-page/product-faculty-members";
 
diff --git a/frontend/public/scss/product-details.scss b/frontend/public/scss/product-details.scss
index aa0e8f6e59..9e06f36d53 100644
--- a/frontend/public/scss/product-details.scss
+++ b/frontend/public/scss/product-details.scss
@@ -1,47 +1,5 @@
 // sass-lint:disable mixins-before-declarations
 
-.product-page {
-
-  @include media-breakpoint-down(sm) {
-    h2 {
-      font-size: 20px;
-      line-height: 20px;
-    }
-
-    h3 {
-      font-size: 20px;
-      line-height: 26px;
-    }
-  }
-}
-
-.upgrade-enrollment-modal { // This should be renamed as it's used across different modals
-  max-width: 550px;
-
-  a {
-    text-decoration: underline;
-  }
-
-  .cancel-link {
-    margin: 20px 0;
-  }
-
-  .enroll-now-free {
-    text-decoration: underline;
-    box-shadow: none;
-    font-weight: bold;
-    border: none;
-  }
-
-  form {
-    margin-bottom: 20px;
-  }
-
-  .cancel-link button {
-    text-align: left;
-  }
-}
-
 .financial-assistance-link {
   height: 22px;
   font-size: 18px;
diff --git a/frontend/public/scss/product-page/product-details.scss b/frontend/public/scss/product-page/product-details.scss
index 7467bfc129..dde689173e 100644
--- a/frontend/public/scss/product-page/product-details.scss
+++ b/frontend/public/scss/product-page/product-details.scss
@@ -2,6 +2,7 @@
 
 body.new-design {
   font-family: Inter;
+  background: white;
 
   h2 {
     font-family: Poppins;
@@ -18,6 +19,18 @@ body.new-design {
     margin-top: 1.5rem;
     background-color: white;
 
+     @include media-breakpoint-down(sm) {
+        h2 {
+          font-size: 20px;
+          line-height: 20px;
+        }
+
+        h3 {
+          font-size: 20px;
+          line-height: 26px;
+        }
+      }
+
     .row.align-center {
       @include media-breakpoint-down(md) {
           justify-content: center !important;
@@ -448,10 +461,18 @@ body.new-design {
 
   .upgrade-enrollment-modal {
     max-width: 750px;
-
+    .cancel-link {
+      margin: 20px 0;
+    }
+    .cancel-link button {
+      text-align: left;
+    }
     .enroll-now-free {
       font-size: 16px;
       font-weight: 400;
+      text-decoration: underline;
+      box-shadow: none;
+      border: none;
     }
     .enroll-now-free:focus-visible {
       border-radius: 0;
@@ -491,6 +512,10 @@ body.new-design {
       padding-left: 33px;
       line-height: 24px;
     }
+    a {
+    text-decoration: underline;
+  }
+
   }
 
   div.date-selector-button-bar {
diff --git a/frontend/public/scss/product-page/user-menu.scss b/frontend/public/scss/product-page/user-menu.scss
deleted file mode 100644
index fe8cd50faa..0000000000
--- a/frontend/public/scss/product-page/user-menu.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-// sass-lint:disable mixins-before-declarations
-
-body.new-design {
-  .user-menu .dropdown-menu .show {
-    z-index: 2000;
-  }
-}