Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Logo updates #668

Merged
merged 5 commits into from
Dec 9, 2024
Merged

Logo updates #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
80c1b28
add higher res museum logo #484
poojagunturu96 Oct 30, 2024
a88f457
remove unnecessary commented code
poojagunturu96 Oct 30, 2024
9cd3353
add higher resolution uwc logo images and update it in uwc header and…
poojagunturu96 Nov 4, 2024
27df981
Merge branch 'master' into logo-updates
poojagunturu96 Nov 21, 2024
059c0e8
Merge branch 'master' into logo-updates
poojagunturu96 Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added src/images/davis-globe@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/davis-uwc-logo-309x35@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/museum-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions src/images/museum-logo.svg
View file
Open in desktop

This file was deleted.

Binary file added src/images/museum-logo@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/scss/components/_davis-header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,15 @@
position: absolute;
left: $spacing-3;
top: rem(70);
width: 288px;

@include breakpoint(sm) {
position: initial;
}

@include breakpoint(md) {
width: 309px;
}
}

padding-top: $spacing-3;
Expand Down
8 changes: 8 additions & 0 deletions src/scss/components/_midd-footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@
img:first-child {
margin-right: rem(12);
}

img:nth-child(2) {
width: 288px;

@include breakpoint(md) {
width: 309px;
}
}
}

.midd-footer__item {
Expand Down
25 changes: 25 additions & 0 deletions src/templates/museum-home.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{% extends "school-layout.twig" %}

{% block layout_header %}
{% embed 'partials/school-header.twig' %}
{% block school_logo %}
<img
src="images/museum-logo.png"
srcset="images/museum-logo.png 1x, images/museum-logo@2x.png 2x"
width="320px"
alt="Logo for Middlebury College Museum of Art"
/>
<span class="sr-only">Middlebury College Museum of Art</span>
{% endblock %}
{% endembed %}
{% endblock %}

{% block page %}
<div class="container">
<div class="row">
<div class="paragraphs paragraphs--wide">
{% block content %}{% endblock %}
</div>
</div>
</div>
{% endblock %}
12 changes: 6 additions & 6 deletions src/templates/partials/davis-footer.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<div class="mb-2 mb-xl-0">
<a class="davis-logo" href="https://www.middlebury.edu">
<img
src="images/davis-globe.png"
alt="Globe in logo for Davis United World College Scholars Program"
src="images/davis-globe.png"
srcset="images/davis-globe.png 1x, images/davis-globe@2x.png 2x"
alt="Globe in logo for Davis United World College Scholars Program"
/>
<img
src="images/davis-uwc-logo-309x35.png"
srcset="images/davis-uwc-logo-288x36.png 288w, images/davis-uwc-logo-309x35.png 309w"
sizes="(min-width: 768px) 309px, 288px"
alt="Davis United World College Scholars Program"
src="images/davis-uwc-logo-309x35.png"
srcset="images/davis-uwc-logo-309x35.png 1x, images/davis-uwc-logo-309x35@2x.png 2x"
alt="Davis United World College Scholars Program"
/>
<span class="sr-only">Davis United World College Scholars Program Logo</span>
</a>
Expand Down
4 changes: 2 additions & 2 deletions src/templates/partials/davis-header.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
{% block school_logo %}
<img
src="images/davis-globe.png"
srcset="images/davis-globe.png 1x, images/davis-globe@2x.png 2x"
alt="Globe in logo for Davis United World College Scholars Program"
/>
<img
src="images/davis-uwc-logo-309x35.png"
srcset="images/davis-uwc-logo-288x36.png 288w, images/davis-uwc-logo-309x35.png 309w"
sizes="(min-width: 768px) 309px, 288px"
srcset="images/davis-uwc-logo-309x35.png 1x, images/davis-uwc-logo-309x35@2x.png 2x"
alt="Davis United World College Scholars Program"
/>
<span class="sr-only">Davis United World College Scholars Program</span>
Expand Down
Loading