Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/bundler/nokogiri-1.16.5
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredbain authored Oct 22, 2024
2 parents 9adba4c + ba32949 commit 26904ca
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions _includes/highlights.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div class="usa-graphic-list__row grid-row grid-gap">
<div class="usa-media-block">
<span class="graphic-icon__container">
<img src="{{ site.baseurl }}/assets/images/banners/highlight-fellows-meetup--cropped.jpg" class="usa-media-block__img img-circle" alt="PIF Fellow speaking"/>
<img src="{{ site.baseurl }}/assets/images/banners/home-building-bridges.webp" class="usa-media-block__img img-circle" alt="PIF Fellow speaking"/>
<div class="graphic-icon">
<img src="{{ site.baseurl }}/assets/images/icons/building.png" alt="building icon" />
</div>
Expand Down Expand Up @@ -52,7 +52,7 @@ <h2 class="usa-graphic-list__heading">Our people</h2>
<div class="usa-graphic-list__row grid-row grid-gap">
<div class="usa-media-block">
<span class="graphic-icon__container">
<img src="{{ site.baseurl }}/assets/images/icons/agencies-background.jpg" class="usa-media-block__img img-circle" alt="PIF Fellow speaking"/>
<img src="{{ site.baseurl }}/assets/images/icons/home-join-us-circle.webp" class="usa-media-block__img img-circle" alt="PIF Fellow speaking"/>
<div class="graphic-icon">
<img src="{{site.baseurl}}/assets/images/icons/connect.png" alt="connect icon"/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _sass/custom/_footer-tagline.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.footer-tagline {
@include u-bg('primary');
@include overlay-base(360px);
background-image: url($baseurl + "/assets/images/banners/banner-homecoming-eeob-bw.jpg");
background-image: url($baseurl + "/assets/images/banners/join-us-footer-banner.webp");
background-size: cover;
background-position: 0 25%;
}
Expand Down
10 changes: 5 additions & 5 deletions _sass/uswds-overrides/_hero.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.usa-hero {
background-image: url($baseurl + "/assets/images/banners/highlight-fellows-nasa-bw--cropped.jpg");
background-image: url($baseurl + "/assets/images/banners/homepage-banner.webp");
background-position: 50% 25%;
background-size: cover;
padding: 0;
Expand Down Expand Up @@ -66,12 +66,12 @@
}
.about .usa-hero {
@include hero-short;
background-image: url($baseurl + "/assets/images/banners/banner-design-users-bw.jpg");
background-image: url($baseurl + "/assets/images/banners/about-us-banner.webp");
background-position: center right 15%;
}
.fellows .usa-hero {
@include hero-short;
background-image: url($baseurl + "/assets/images/banners/banner-homecoming-eeob-bw.jpg");
background-image: url($baseurl + "/assets/images/banners/fellows-banner.webp");
}
.agencies .usa-hero {
@include hero-short;
Expand All @@ -80,11 +80,11 @@
}
.apply .usa-hero {
@include hero-short;
background-image: url($baseurl + "/assets/images/banners/banner-apply-bw.jpeg");
background-image: url($baseurl + "/assets/images/banners/become-a-fellow-page.webp");
}
.usa-hero.project {
@include hero-short;
background-image: url($baseurl + "/assets/images/banners/banner-orientation-eeob-bw.jpg");
background-image: url($baseurl + "/assets/images/banners/project-banner.webp");
background-position: top left 15%;
}
.usa-hero.faq {
Expand Down
2 changes: 1 addition & 1 deletion about/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h1>Our <em>mission</em></h1>
</p>
</div>
<div class="display-block tablet:grid-col-4">
<img src="{{site.baseurl}}/assets/images/banners/highlight-fellows-homecoming3--cropped.jpg" class="usa-media-block__img img-circle" alt="PIF Fellow speaking"/>
<img src="{{site.baseurl}}/assets/images/banners/about-our-mission.webp" class="usa-media-block__img img-circle" alt="PIF Fellow speaking"/>
</div>
</div>
</div>
Expand Down
Binary file added assets/images/banners/about-our-mission.webp
Binary file not shown.
Binary file added assets/images/banners/about-us-banner.webp
Binary file not shown.
Binary file added assets/images/banners/become-a-fellow-page.webp
Binary file not shown.
Binary file added assets/images/banners/fellows-banner.webp
Binary file not shown.
Binary file added assets/images/banners/home-building-bridges.webp
Binary file not shown.
Binary file added assets/images/banners/homepage-banner.webp
Binary file not shown.
Binary file added assets/images/banners/join-us-footer-banner.webp
Binary file not shown.
Binary file added assets/images/banners/project-banner.webp
Binary file not shown.
Binary file added assets/images/icons/home-join-us-circle.webp
Binary file not shown.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 26904ca

Please sign in to comment.