From de55da21709429e6ddc21934bc6f337c9c65c464 Mon Sep 17 00:00:00 2001
From: Fatima Sohail <68312464+sohailfatima@users.noreply.github.com>
Date: Thu, 31 Oct 2024 20:54:17 +0500
Subject: [PATCH 1/2] fix: added font styles for email digest browser
 compatibility (#35750)

---
 .../templates/notifications/digest_content.html             | 4 ++--
 .../templates/notifications/digest_footer.html              | 2 +-
 .../templates/notifications/digest_header.html              | 6 +++---
 .../notifications/edx_ace/email_digest/email/body.html      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html b/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html
index df1de6171ae3..d482cd0c4408 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/digest_content.html
@@ -1,5 +1,5 @@
 {% for notification_app in email_content %}
-    <h3 style="font-size: 1.375rem; font-weight:700; line-height:28px; margin: 0.75rem 0 0;">
+    <h3 style="font-size: 22px; font-weight:700; line-height:28px; margin: 0.75rem 0 0;">
         {{ notification_app.title }}
     </h3>
     {% if notification_app.help_text %}
@@ -29,7 +29,7 @@ <h3 style="font-size: 1.375rem; font-weight:700; line-height:28px; margin: 0.75r
                             />
                         </td>
                         <td class="notification-content" width="100%" align="left" valign="top" style="padding: 1rem 1rem 1rem 0.5rem;">
-                            <blockquote style="font-size: 0.875rem; font-weight:400; line-height:24px; color:#454545; margin: 0 0 0.5rem 0;">
+                            <blockquote style="font-size: 14px; font-weight:400; line-height:24px; color:#454545; margin: 0 0 0.5rem 0;">
                                 <style> strong {color: #00262B; font-weight:500} </style>
                                 {{ notification.email_content | truncatechars_html:600 | safe }}
                             </blockquote>
diff --git a/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html b/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html
index 4fa903d127ac..34f4bf09d808 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/digest_footer.html
@@ -1,4 +1,4 @@
-<table cellpadding="0" cellspacing="0" style="color:black; font-weight:400; font-size:0.75rem;line-height:20px" width="100%">
+<table cellpadding="0" cellspacing="0" style="color:black; font-weight:400; font-size:12px;line-height:20px" width="100%">
     <tbody>
         <tr>
             <td>
diff --git a/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html b/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html
index 1f22ced20049..84a702d4c29e 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/digest_header.html
@@ -19,7 +19,7 @@
         </tr>
         <tr style="height: 20px"></tr>
         <tr align="center">
-            <td style="font-family: Inter; font-size: 32px; font-style: normal; font-weight: 700; line-height: 36px">
+            <td style="font-family: Inter, Arial, Verdana, sans-serif; font-size: 32px; font-style: normal; font-weight: 700; line-height: 36px">
                 {{ digest_frequency }} email digest
             </td>
         </tr>
@@ -28,7 +28,7 @@
             <td
                 style="
                     color: #bfc9ca;
-                    font-family: Inter;
+                    font-family: Inter, Arial, Verdana, sans-serif;
                     font-size: 14px;
                     font-style: normal;
                     font-weight: 400;
@@ -54,7 +54,7 @@
                                                 </td>
                                             </tr>
                                             <tr align="center">
-                                                <td style="font-weight: 600; font-size: 0.875rem; line-height: 20px; padding: 0">
+                                                <td style="font-weight: 600; font-size: 14px; line-height: 20px; padding: 0">
                                                     {{update.title}}
                                                 </td>
                                             </tr>
diff --git a/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html b/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html
index a15f4f6ebfed..4d4daa7ca2a3 100644
--- a/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html
+++ b/openedx/core/djangoapps/notifications/templates/notifications/edx_ace/email_digest/email/body.html
@@ -3,7 +3,7 @@
 </head>
 
 <div style="margin:0; padding:0; min-width: 100%; background-color:#C9C9C9; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; font-smooth: never;">
-    <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="line-height:1.5; max-width:600px; font-family:Inter">
+    <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="line-height:1.5; max-width:600px; font-family:Inter, Arial, Verdana, sans-serif">
         <tbody style="background-color:#f5f5f5">
             <tr>
                 <td>

From a112cb31331f0e92d6e1092f1e01566e31b8ed6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Fri, 1 Nov 2024 12:09:36 +0100
Subject: [PATCH 2/2] chore: upgrade edx-search to 4.1.1 (#35755)

This is to benefit from the latest changes concerning meilisearch index
creation: https://github.com/openedx/edx-search/pull/166
---
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 requirements/edx/doc.txt         | 2 +-
 requirements/edx/testing.txt     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 88ab7b1c16a5..4836984112af 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -513,7 +513,7 @@ edx-rest-api-client==6.0.0
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
     #   edx-proctoring
-edx-search==4.1.0
+edx-search==4.1.1
     # via -r requirements/edx/kernel.in
 edx-sga==0.25.0
     # via -r requirements/edx/bundled.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 328dfe81381d..2bda2d2adf86 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -806,7 +806,7 @@ edx-rest-api-client==6.0.0
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   edx-proctoring
-edx-search==4.1.0
+edx-search==4.1.1
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index fc353debc489..aa8afeaff3fb 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -594,7 +594,7 @@ edx-rest-api-client==6.0.0
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
-edx-search==4.1.0
+edx-search==4.1.1
     # via -r requirements/edx/base.txt
 edx-sga==0.25.0
     # via -r requirements/edx/base.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 0c7d65b95c85..217b9e637350 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -620,7 +620,7 @@ edx-rest-api-client==6.0.0
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
-edx-search==4.1.0
+edx-search==4.1.1
     # via -r requirements/edx/base.txt
 edx-sga==0.25.0
     # via -r requirements/edx/base.txt