Skip to content

Merge dev into main #368

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Merge dev into main #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8eefa80
Deleted one project per freshman to align with current practice
mco9734 May 5, 2025
3cc84ce
improve title centering
mco9734 May 5, 2025
242bef0
Removed Nortel from sponsors page
charlottegeo Sep 7, 2025
d5fb0b1
Merge pull request #367 from charlottegeo/remove-defunct-sponsor
pikachu0542 Oct 14, 2025
4b406c4
Merge pull request #361 from mco9734/titleFix
goosenotduck Oct 15, 2025
63dae9b
Merge pull request #360 from mco9734/noMoreFreshmanProject
goosenotduck Oct 15, 2025
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
43 changes: 23 additions & 20 deletions _sass/_splash.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
$size: 350px;

.splash {
height: $size;
text-align: center;
& h1 {
width: 100%;
height: 100%;
background: url('#{$CSHPUBSITE_ASSETS_URL}/hallway_blurred.jpg') 30% 30% no-repeat;
background-size: cover;
line-height: calc(#{$size} + 50px);
text-align: center;
color: white;
font-size: 3em;
vertical-align: bottom;
}
height: $size;
display: flex;
align-items: center;
justify-content: center;
text-align: center;
background: url('#{$CSHPUBSITE_ASSETS_URL}/hallway_blurred.jpg') 30% 30% no-repeat;
background-size: cover;

h1 {
color: white;
font-size: 3em;
margin: 0;
padding: 0 1rem;
max-width: 100%;
word-wrap: break-word;
}

@media (max-width: 992px) {
height: 400px;

@media(max-width: 992px) {
height: 400px;
& h1 {
font-size: 2em;
line-height: 1.2;
padding-top: 50%;
}
h1 {
font-size: 2em;
padding: 0 1rem;
}
}
}
20 changes: 0 additions & 20 deletions about/projects.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,26 +72,6 @@ <h2><a href="https://devcade.csh.rit.edu">Devcade</a></h2>
</div>
</div>

<div class="row spaced">
<div class="col-12 col-lg-3">
<picture>
<source srcset="{{site.env.CSHPUBSITE_ASSETS_URL}}/projects/oppf.webp" type="image/webp" />
<source srcset="{{site.env.CSHPUBSITE_ASSETS_URL}}/projects/oppf.jpg" type="image/jpeg" />
<img class="rounded" src="{{site.env.CSHPUBSITE_ASSETS_URL}}/projects/oppf.jpg" alt="One Project Per Freshman, in which CSH freshmen are provided free hardware for projects" />
</picture>
</div>
<div class="col-12 col-lg-9">
<h2>One Project Per Freshman</h2>
<p class="long-form">
One Project Per Freshman looks to put the necessary tools in the hands
of freshman to enable them to learn more about hardware electronics
projects without a financial investment on their part. In its current
form, incoming freshman members are given the choice between a
Raspberry Pi or an Arduino with a starter kit to tinker with
throughout the year.
</p>
</div>
</div>
<div class="row spaced">
<div class="col-12 col-lg-3">
<picture>
Expand Down
5 changes: 0 additions & 5 deletions about/sponsors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,6 @@
<img class="rounded padded-gray" src="{{site.env.CSHPUBSITE_ASSETS_URL}}/sponsors/intergraph.png" alt="Intergraph">
</a>
</div>
<div class="col-4 col-lg-2">
<a href="https://www.nortel-us.com">
<img class="rounded padded-gray" src="{{site.env.CSHPUBSITE_ASSETS_URL}}/sponsors/nortel.png" alt="Nortel">
</a>
</div>
<div class="col-4 col-lg-2">
<a href="https://www.janestreet.com">
<img class="rounded" src="{{site.env.CSHPUBSITE_ASSETS_URL}}/sponsors/janestreet.png" alt="Jane Street">
Expand Down
1 change: 0 additions & 1 deletion assets/js/sponsors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ $(document).ready(() => {
new Sponsor('/sponsors/lourdesindustries.png', 'http://lourdesinc.com', 'Lourdres Industries'),
new Sponsor('/sponsors/mooreresearchcenter.png', 'http://mrci.com', 'Moore Research Center'),
new Sponsor('/sponsors/intergraph.png', 'http://intergraph.com', 'Intergraph'),
new Sponsor('/sponsors/nortel.png', 'http://nortel-us.com', 'Nortel'),
new Sponsor('/sponsors/janestreet.png', 'http://janestreet.com', 'Jane Street'),
new Sponsor('/sponsors/northropgrumman.png', 'http://northropgrumman.com', 'Northrop Grumman'),
new Sponsor('/sponsors/sonus.png', 'http://sonus.net', 'Sonus'),
Expand Down