Skip to content

Commit

Permalink
style: update logo (#2881)
Browse files Browse the repository at this point in the history 
* style: Update logo
  • Loading branch information
@arslanashraf7
arslanashraf7 authored Feb 2, 2024
1 parent 6d8f374 commit a22e77a
Show file tree
Hide file tree
Showing 15 changed files with 79 additions and 63 deletions.
14 changes: 7 additions & 7 deletions cms/templates/certificate_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ <h2>Congratulations, {{ learner_name }}!</h2>
{% if page.partner_logo_placement == page.PartnerLogoPlacement.SECOND %}
<div class="certificate-dual-logo">
<div class="column">
<img src="{% static 'images/certificates/transparent-mit-xpro-logo.png' %}" alt="MIT xPro">
<img src="{% static 'images/mit-xpro-logo.svg' %}" alt="MIT xPro">
</div>
<div class="column">
<img src="{% image_version_url page.partner_logo 'max-600x200' %}" alt="MIT Partner" />
Expand All @@ -75,17 +75,17 @@ <h2>Congratulations, {{ learner_name }}!</h2>
<img src="{% image_version_url page.partner_logo 'max-600x200' %}" alt="MIT Partner" />
</div>
<div class="column">
<img src="{% static 'images/certificates/transparent-mit-xpro-logo.png' %}" alt="MIT xPro">
<img src="{% static 'images/mit-xpro-logo.svg' %}" alt="MIT xPro">
</div>
</div>
{% else %}
<div class="certificate-logo">
<img src="{% static 'images/certificates/transparent-mit-xpro-logo.png' %}" alt="MIT xPro">
<img src="{% static 'images/mit-xpro-logo.svg' %}" alt="MIT xPro">
</div>
{% endif %}
{% else %}
<div class="certificate-logo">
<img src="{% static 'images/certificates/transparent-mit-xpro-logo.png' %}" alt="MIT xPro">
<img src="{% static 'images/mit-xpro-logo.svg' %}" alt="MIT xPro">
</div>
{% endif %}
{% if page.institute_text %}
Expand Down Expand Up @@ -148,9 +148,9 @@ <h2>Congratulations, {{ learner_name }}!</h2>
<div class="row no-print">
<div class="col cer-footer">
<div class="certificate-logo">
<a href="https://web.mit.edu/" class="mit"></a>
<a href="/" class="xpro"></a>
<img src="{% static 'images/certificates/transparent-mit-xpro-logo.png' %}" alt="MIT xPro">
<a href="/" class="mit">
<img src="{% static 'images/mit-ol-logo.svg' %}" alt="MIT Open Learning">
</a>
</div>
<div class="cer-footer-info">
<ul class="links">
Expand Down
2 changes: 1 addition & 1 deletion mail/templates/email_base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
<td style="padding: 20px;">
{% block pre-logo-text %}{% endblock %}
{% block logo %}
<img src="{{ base_url }}/static/images/mitx-pro-logo.png" width="160" height="80" alt="{{ site_name }}" style="height: auto; background: #ffffff; font-family: sans-serif; font-size: 15px; line-height: 15px; color: #A31F34; margin-bottom: -10px; margin-right: 10px;"/>
<img src="{{ base_url }}/static/images/mit-xpro-logo.svg" width="125" height="35" alt="{{ site_name }}" style="height: auto; background: #ffffff; font-family: sans-serif; font-size: 15px; line-height: 15px; color: #A31F34; margin-bottom: -10px; margin-right: 10px;"/>
{% endblock %}
{% block post-logo-text %}{% endblock %}
</td>
Expand Down
2 changes: 1 addition & 1 deletion mitxpro/templates/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h2>Contact Us</h2>
<div class="container">
<div class="footer-bottom">
<div class="mit-info">
<img src="{% static 'images/mit.png' %}" width="78" height="41" alt="MIT" loading="lazy"/>
<img src="{% static 'images/mit-ol-logo.svg' %}" width="129" height="33" alt="MIT" loading="lazy"/>
<address>
Massachusetts Institute of Technology <br />77 Massachusetts Avenue
<br />Cambridge, MA 02139
Expand Down
Binary file removed static/images/certificates/transparent-mit-xpro-logo.png
View file
Binary file not shown.
26 changes: 26 additions & 0 deletions static/images/mit-ol-logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions static/images/mit-xpro-logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed static/images/mit.png
View file
Binary file not shown.
Binary file removed static/images/mitx-pro-logo.png
View file
Binary file not shown.
15 changes: 3 additions & 12 deletions static/js/components/TopAppBar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,13 @@ const TopAppBar = ({ currentUser, location, errorPageHeader, courseTopics }: Pro
<nav
className="sub-nav navbar navbar-expand-md link-section"
>
<div className="navbar-brand">
<a
href="https://web.mit.edu/"
rel="noopener noreferrer"
target="_blank"
className="mit-link"
/>
<a href={routes.root} className="xpro-link" />
<a href={routes.root} className="xpro-link">
<img
src="/static/images/mitx-pro-logo.png"
src="/static/images/mit-xpro-logo.svg"
className="site-logo"
alt={SETTINGS.site_name}
width={154}
height={47.5}
/>
</div>
</a>
{errorPageHeader ? null : (
<button
className="navbar-toggler nav-opener"
Expand Down
4 changes: 2 additions & 2 deletions static/js/components/TopAppBar_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ describe("TopAppBar component", () => {
assert.isNotOk(
shallow(<TopAppBar currentUser={user} location={null} errorPageHeader={null} courseTopics={courseTopics} />)
.find("a")
.at(2)
.at(1)
.exists()
)
} else {
Expand All @@ -99,7 +99,7 @@ describe("TopAppBar component", () => {
assert.equal(
shallow(<TopAppBar currentUser={user} location={null} errorPageHeader={null} courseTopics={courseTopics} />)
.find("a")
.at(2)
.at(1)
.prop("href"),
routes.catalog
)
Expand Down
2 changes: 1 addition & 1 deletion static/js/containers/pages/ReceiptPage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export class ReceiptPage extends React.Component<Props> {
<div className="receipt-row p-b-80">
<div className="receipt-col">
<div className="receipt-logo">
<img src="static/images/mitx-pro-logo.png" alt="" />
<img src="static/images/mit-xpro-logo.svg" alt="" />
</div>
<div className="receipt-mit-info">
<p>
Expand Down
18 changes: 7 additions & 11 deletions static/scss/certificates/certificate.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ $text-gray-light: #d2d0d1;

.certificate-logo {
display: block;
max-width: 250px;
width: 199px;
height: 56px;
margin: 0 auto 15px;
position: relative;

Expand Down Expand Up @@ -236,8 +237,8 @@ $text-gray-light: #d2d0d1;

.certificate-logo {
float: right;
width: 74px;
margin: 30px 0 0 20px;
width: 129px;
margin: 0 0 0 20px;
position: relative;

@include media-breakpoint-down(xs) {
Expand All @@ -249,15 +250,10 @@ $text-gray-light: #d2d0d1;
position: absolute;
left: 0;
top: 2px;
width: 31px;
height: 18px;
width: 129px;
height: 33px;

&.xpro {
left: 44px;
top: 6px;
width: 30px;
height: 11px;
}
filter: brightness(0) saturate(100%) invert(0%) sepia(5%) saturate(7500%) hue-rotate(261deg) brightness(98%) contrast(106%);
}
}

Expand Down
6 changes: 3 additions & 3 deletions static/scss/footer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
}

img {
width: 78px;
height: 41px;
width: 129px;
height: 33px;
margin: 0 auto 15px;

@include media-breakpoint-up(md) {
Expand All @@ -114,7 +114,7 @@
}

@include media-breakpoint-up(lg) {
margin: 5px 45px 0 0;
margin: 5px 26px 0 0;
}
}

Expand Down
5 changes: 3 additions & 2 deletions static/scss/receipt.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,9 @@ $label-color: #8a8b8c;
}

.receipt-logo {
width: 150px;
margin: 0 0 10px;
width: 125px;
height: 35px;
margin: 0 0 12px;

img {
display: block;
Expand Down
28 changes: 5 additions & 23 deletions static/scss/top-app-bar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,32 +81,14 @@
}

.site-logo {
width: 154px;
height: 47.5px;
width: 125px;
height: 35px;
}

.navbar-brand {
.xpro-link {
z-index: 2;
position: relative;

.mit-link, .xpro-link {
position: absolute;
z-index: 2;
opacity: .5;
}

.mit-link {
left: 0;
top: 11px;
width: 64px;
height: 35px;
}

.xpro-link {
left: 93px;
top: 19px;
width: 60px;
height: 21px;
}
padding: 10px 0 12px 0;
}

.navbar-toggler.nav-opener {
Expand Down

0 comments on commit a22e77a

Please sign in to comment.