Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert: add brand_color variable for the email templates (#33421)"

Browse Source 
This reverts commit 4ec70eb98b.

This commit introduced a new setting (`brand_color`) that does not appear to be set and is causing issues with account deletion and other parts of the courseware.

Reverting until we can understand the change better.
This commit is contained in:
Justin Hynes
2024-01-24 18:47:02 +00:00
parent 75daee134d
commit 426ee163bc
16 changed files with 95 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/base_body.html
View File

@@ -29,7 +29,6 @@
{% google_analytics_tracking_pixel %}
{% with brand_color="#005686" logo_max_height="65px" %}
<div bgcolor="#f5f5f5" lang="{{ LANGUAGE_CODE|default:"en" }}" dir="{{ LANGUAGE_BIDI|yesno:"rtl,ltr" }}" style="
margin: 0;
padding: 0;
@@ -80,7 +79,7 @@
<tr>
<td align="left" valign="top">
<a href="{% with_link_tracking homepage_url %}">
<img src="{{ logo_url }}" style="max-height: {{ logo_max_height }};" height="auto" alt="{% filter force_escape %}{% blocktrans %}Go to {{ platform_name }} Home Page{% endblocktrans %}{% endfilter %}"/></a>
<img src="{{ logo_url }}" style="max-height: 65px;" height="auto" alt="{% filter force_escape %}{% blocktrans %}Go to {{ platform_name }} Home Page{% endblocktrans %}{% endfilter %}"/></a>
</td>
</tr>
</table>
@@ -219,8 +218,8 @@
{% get_action_links channel omit_unsubscribe_link=omit_unsubscribe_link as action_links %}
{% for action_link_url, action_link_text in action_links %}
<p>
<a href="{{ action_link_url }}" style="color: {{ brand_color }};">
<font color="{{ brand_color }}"><b>{{ action_link_text }}</b></font>
<a href="{{ action_link_url }}" style="color: #005686">
<font color="#005686"><b>{{ action_link_text }}</b></font>
</a>
</p>
{% endfor %}
@@ -254,7 +253,6 @@
<![endif]-->
</div>
{% endwith %}
{# Debug info that is not user-visible #}
<span id="ace-message-id" style="display:none;">{{ message.log_id }}</span>

10
openedx/core/djangoapps/ace_common/templates/ace_common/edx_ace/common/return_to_course_cta.html
View File

@@ -21,11 +21,11 @@
border-radius: 4px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
background-color: {{ brand_color }};
border-top: 12px solid {{ brand_color }};
border-bottom: 12px solid {{ brand_color }};
border-right: 50px solid {{ brand_color }};
border-left: 50px solid {{ brand_color }};
background-color: #005686;
border-top: 12px solid #005686;
border-bottom: 12px solid #005686;
border-right: 50px solid #005686;
border-left: 50px solid #005686;
display: inline-block;
">
{# old email clients require the use of the font tag :( #}