Skip to content

Commit

Permalink
Merge pull request #5 from middlebury/additional-updates
Browse files Browse the repository at this point in the history
Additional updates
  • Loading branch information
imcbride authored Oct 12, 2023
2 parents 8848595 + e7c8a54 commit 5ca1b3f
Show file tree
Hide file tree
Showing 13 changed files with 203 additions and 74 deletions.
8 changes: 6 additions & 2 deletions src/data/image_styles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ image_styles:
- 808x455
sizes: "(max-width: 512px) 288px, (max-width: 768px) 432px, (max-width: 1200px) 666px, 808px"

featured_story:
featured_story: # featured image on story list page
title: Our Priorities
ratio: "16:9"
srcset:
Expand All @@ -73,11 +73,15 @@ image_styles:
- 808x455
sizes: "(max-width: 512px) 320px, (max-width: 768px) 432px, (max-width: 1200px) 666px, 808px"

featured: # basic content, event detail, story detail
featured: # featured image on story page
title: Featured image (basic content, story page, event page)
ratio: "16:9"
srcset:
- 400x225
- 640x360
- 896x504
- 1136x639
sizes: "(max-width: 1136px) 100vw, 1136px"

image_floated: # 3:4
title: Image component with left/right alignment
Expand Down
27 changes: 26 additions & 1 deletion src/scss/_paragraphs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@
}
}

.paragraph--text {
@extend %paragraph-space;
}

.paragraphs--wide__offset {
@include breakpoint(lg) {
@include make-col-offset(2);
Expand All @@ -86,9 +90,20 @@
}
}

.paragraph--image:not(.image--left):not(.image--right) {
margin-bottom: $spacing-5;

@include breakpoint(md) {
margin-bottom: $spacing-7;
}

@include breakpoint(lg) {
margin-top: $spacing-7;
}
}

.paragraph,
.paragraph--lead,
.paragraph--text,
.paragraph--image-text,
.paragraph--chart,
.paragraph--featured-story {
Expand All @@ -107,6 +122,16 @@
}
}

.paragraph--small-image-with-text {
margin-top: $spacing-7;
margin-bottom: $spacing-7;

@include breakpoint(md) {
margin-top: $spacing-8;
margin-bottom: $spacing-8;
}
}

.paragraph--video {
margin-bottom: $spacing-5;

Expand Down
5 changes: 5 additions & 0 deletions src/scss/components/_campaign-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ $campaign-header-breakpoint: lg;
.campaign-header__logo {
display: flex;
flex-direction: column;
margin-top: -$spacing-1;

@include breakpoint(md) {
margin-top: 0;
}

svg {
fill: $white;
Expand Down
37 changes: 28 additions & 9 deletions src/scss/components/_media-object.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,22 @@
h3 {
font-size: $spacing-5;
font-weight: $font-weight-normal;
margin-top: 0;
margin-top: $spacing-1;
margin-bottom: $spacing-1;
text-transform: none;
line-height: $line-height-heading;

@include breakpoint(md) {
font-size: rem(34);
font-weight: $font-weight-semibold;
margin-top: 0;
margin-bottom: $spacing-2;
}

@include breakpoint(lg) {
margin-bottom: $spacing-3;
}
}

p {
// margin-bottom: $spacing-3;

// @include breakpoint(lg) {
// margin-bottom: $spacing-4;
// }
}
}

.media-object__image {
Expand Down Expand Up @@ -227,3 +221,28 @@
}
}
}

.small-media-object {
display: flex;
flex-direction: column;

@include breakpoint(sm) {
flex-direction: row;
}

img {
width: fit-content;
margin-right: $spacing-4;
margin-bottom: $spacing-4;

@include breakpoint(sm) {
margin-bottom: 0;
}
}

.typography {
h3 {
margin-top: 0;
}
}
}
8 changes: 0 additions & 8 deletions src/scss/components/_page-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,6 @@
margin-left: 0;
margin-right: 0;
}

.page-header__content {
margin-bottom: $spacing-4;

@include breakpoint(lg) {
margin-bottom: $spacing-5;
}
}
}

.page-header--has-menu {
Expand Down
6 changes: 3 additions & 3 deletions src/scss/components/_page-image.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
margin-right: 0;
}

&.page-image--no-caption {
margin-bottom: 0;
}
// &.page-image--no-caption {
// margin-bottom: 0;
// }
}

4 changes: 2 additions & 2 deletions src/scss/mixins/_screen-reader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

@mixin sr-only {
position: absolute;
width: 1px;
height: 1px;
width: 0px;
height: 0px;
padding: 0;
overflow: hidden;
clip: rect(0, 0, 0, 0);
Expand Down
47 changes: 47 additions & 0 deletions src/twig/campaign-contacts.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{% extends "campaign-top-level.twig" %}

{% set has_page_image = false %}

{% block page_header %}
{% include 'partials/page-header.twig' with {
title: 'Campaign Contacts',
image_src: has_page_image
} %}
{% endblock %}

{% block layout_header %}
{% include 'partials/campaign-header.twig' with {
is_block: true,
dark: true
} %}
{% endblock %}

{% block page %}
{% embed 'partials/top-level-layout.twig' with {
show_menu: false
} %}
{% block paragraphs %}
{% include 'paragraphs/small-image-with-text.twig' with {
title: 'Dan Courcey',
text: 'Executive Assistant to the Vice President of Advancement
<br><a href="mailto:[email protected]">[email protected]</a><br>
(802) 443-5150'
} %}
{% include 'paragraphs/small-image-with-text.twig' with {
title: 'Stacie Marshall',
text: 'Executive Assistant to the Vice President of Advancement<br><a href="mailto:[email protected]">[email protected]</a><br>
(802) 443-5217'
} %}
{% include 'paragraphs/small-image-with-text.twig' with {
title: 'Jamie Black',
text: 'Associate Vice President for Advancement and Campaign Operations; Campaign Co-Executive Director<br><a href="mailto:[email protected]">[email protected]</a><br>
(802) 443-5614'
} %}
{% include 'paragraphs/small-image-with-text.twig' with {
title: "Alanna Shanler '99",
text: 'Associate Vice President for Advancement and Campaign Engagement; Campaign Co-Executive Director<br><a href="mailto:[email protected]">[email protected]</a><br>
(802) 443-5350'
} %}
{% endblock %}
{% endembed %}
{% endblock %}
43 changes: 0 additions & 43 deletions src/twig/campaign-laurie-letter.twig

This file was deleted.

57 changes: 57 additions & 0 deletions src/twig/campaign-leadership.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{% extends "campaign-top-level.twig" %}

{% set has_page_image = false %}

{% block page_header %}
{% include 'partials/page-header.twig' with {
title: 'Campaign Leadership',
image_src: has_page_image
} %}
{% endblock %}

{% block layout_header %}
{% include 'partials/campaign-header.twig' with {
is_block: true,
dark: true
} %}
{% endblock %}

{% block page %}
{% embed 'partials/top-level-layout.twig' with {
show_menu: false
} %}
{% block paragraphs %}
{% embed 'paragraphs/text.twig' %}
{% block text_body %}
<p>Intro paragraph Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
{% endblock %}
{% endembed %}
{% include 'paragraphs/small-image-with-text.twig' with {
title: 'Dan Courcey',
text: 'This as about the lifespan of our relationship with students of all backgrounds. Making sure, as they leave Middlebury, they’re prepared for the world and the workforce.'
} %}
{% include 'paragraphs/small-image-with-text.twig' with {
title: 'Dan Courcey',
text: 'This as about the lifespan of our relationship with students of all backgrounds. Making sure, as they leave Middlebury, they’re prepared for the world and the workforce.'
} %}
<hr>
{% embed 'paragraphs/text.twig' with {
title: 'BOARD OF TRUSTEES'
} %}
{% block text_body %}
<p>Laurie L. Patton,&nbsp;President</p>
<h3>CHARTER&nbsp;TRUSTEES</h3>
<p>Kirtley Horton Cameron ’95; Catherine Lee ’92; George C. Lee II ’88; Caroline Sneath McBride ’75; Dennis D. Parker ’77; Richard T. Scanlon ’93; Susan Scher ’86; Karen A. Stolley ’77, Vice Chair; William F. Truscott ’83,&nbsp;Chair</p>
<h3>TERM&nbsp;TRUSTEES</h3>
<p>Belinda L. Badcock; Joseph W. Brown ’90; Leilani McClellan Brown ’93; Barbara Griffin Cole; Janine Feng ’92; Graham Goldsmith ’89; Parker Harris III ’89; Lucienne M. Ide ’97; Carol L. Jones; Alice J. (A.J.) Murphy ’98; Suzanne Reider ’87; Henry J. Simonds ’97; Elizabeth Cromwell Speers ’86; Mark D. Spence ’98; John E. Waldron ’91; Larry Yarbrough; Kashif Zafar&nbsp;’92</p>
<h3>ALUMNI&nbsp;TRUSTEES</h3>
<p>Koby Altman ’04; Zachary Bourque ’01; Denver Edwards ’88; Anne Davis Peterson ’85; Shawn Ryan ’88; Danielle (Dani) Virtue ’82; recent grauduate&nbsp;trustee</p>
<h3>RECENT GRADUATE&nbsp;TRUSTEE</h3>
<p>Kenshin Cho&nbsp;’20</p>
<h3>TRUSTEES&nbsp;EMERITI</h3>
<p>Dort A. Cameron III ’67; James S. Davis ’66; Churchill G. Franklin ’71; Frederick M. Fritz ’68; Nancy Coffrin Furlong ’75; Claire Waterhouse Gargalli ’64; Robert C. Graham Jr. ’63; Willard T. Jackson ’51; William H. Kieffer III ’64; Roxanne McCormick Leighton ’67; John M. McCardell Jr.; C. Irving Meeker ’50; Garrett Moran ’76; Patricia Judah Palmer ’57; Kimberly Collins Parizeau ’79; Elisabeth Robert ’78; Frank W. Sesno ’77; Deborah G. Thomas ’75; John R. Tormondsen ’82; J. Edward (Ted) Virtue ’82; Marna C. Whittington; Linda Foster Whitton ’80; Kendrick R. Wilson&nbsp;III</p>
{% endblock %}
{% endembed %}
{% endblock %}
{% endembed %}
{% endblock %}
2 changes: 1 addition & 1 deletion src/twig/paragraphs/image-with-text.twig
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
{% endif %}
<p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Sed, nulla. Error ea corrupti repellat asperiores fuga magnam minus, dolore veritatis eos? Laudantium, reiciendis quos. Est provident sint dolorem temporibus quam!</p>
{% if featured_story %}
<div class="d-flex f2 font-semibold story-list-tags">
<div class="d-flex f2 mt-3 mt-lg-4 font-semibold story-list-tags">

<span class="mr-4 mt-3 mt-lg-2">Tags:</span>

Expand Down
9 changes: 9 additions & 0 deletions src/twig/paragraphs/small-image-with-text.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<div class="paragraph--small-image-with-text small-media-object">
{% include 'partials/img.twig' with {
name: 'small_image'
} %}
<div class="typography">
<h3>{{title}}</h3>
<p>{{text}}</p>
</div>
</div>
Loading

0 comments on commit 5ca1b3f

Please sign in to comment.