Skip to content

Commit b44f027

Browse files
authored
Merge pull request #368 from ComputerScienceHouse/develop
Merge dev into main
2 parents 4a2e55f + 63dae9b commit b44f027

File tree

4 files changed

+23
-46
lines changed

4 files changed

+23
-46
lines changed

_sass/_splash.scss

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,29 @@
11
$size: 350px;
22

33
.splash {
4-
height: $size;
5-
text-align: center;
6-
& h1 {
7-
width: 100%;
8-
height: 100%;
9-
background: url('#{$CSHPUBSITE_ASSETS_URL}/hallway_blurred.jpg') 30% 30% no-repeat;
10-
background-size: cover;
11-
line-height: calc(#{$size} + 50px);
12-
text-align: center;
13-
color: white;
14-
font-size: 3em;
15-
vertical-align: bottom;
16-
}
4+
height: $size;
5+
display: flex;
6+
align-items: center;
7+
justify-content: center;
8+
text-align: center;
9+
background: url('#{$CSHPUBSITE_ASSETS_URL}/hallway_blurred.jpg') 30% 30% no-repeat;
10+
background-size: cover;
11+
12+
h1 {
13+
color: white;
14+
font-size: 3em;
15+
margin: 0;
16+
padding: 0 1rem;
17+
max-width: 100%;
18+
word-wrap: break-word;
19+
}
20+
21+
@media (max-width: 992px) {
22+
height: 400px;
1723

18-
@media(max-width: 992px) {
19-
height: 400px;
20-
& h1 {
21-
font-size: 2em;
22-
line-height: 1.2;
23-
padding-top: 50%;
24-
}
24+
h1 {
25+
font-size: 2em;
26+
padding: 0 1rem;
2527
}
28+
}
2629
}

about/projects.html

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -72,26 +72,6 @@ <h2><a href="https://devcade.csh.rit.edu">Devcade</a></h2>
7272
</div>
7373
</div>
7474

75-
<div class="row spaced">
76-
<div class="col-12 col-lg-3">
77-
<picture>
78-
<source srcset="{{site.env.CSHPUBSITE_ASSETS_URL}}/projects/oppf.webp" type="image/webp" />
79-
<source srcset="{{site.env.CSHPUBSITE_ASSETS_URL}}/projects/oppf.jpg" type="image/jpeg" />
80-
<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" />
81-
</picture>
82-
</div>
83-
<div class="col-12 col-lg-9">
84-
<h2>One Project Per Freshman</h2>
85-
<p class="long-form">
86-
One Project Per Freshman looks to put the necessary tools in the hands
87-
of freshman to enable them to learn more about hardware electronics
88-
projects without a financial investment on their part. In its current
89-
form, incoming freshman members are given the choice between a
90-
Raspberry Pi or an Arduino with a starter kit to tinker with
91-
throughout the year.
92-
</p>
93-
</div>
94-
</div>
9575
<div class="row spaced">
9676
<div class="col-12 col-lg-3">
9777
<picture>

about/sponsors.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,6 @@
8989
<img class="rounded padded-gray" src="{{site.env.CSHPUBSITE_ASSETS_URL}}/sponsors/intergraph.png" alt="Intergraph">
9090
</a>
9191
</div>
92-
<div class="col-4 col-lg-2">
93-
<a href="https://www.nortel-us.com">
94-
<img class="rounded padded-gray" src="{{site.env.CSHPUBSITE_ASSETS_URL}}/sponsors/nortel.png" alt="Nortel">
95-
</a>
96-
</div>
9792
<div class="col-4 col-lg-2">
9893
<a href="https://www.janestreet.com">
9994
<img class="rounded" src="{{site.env.CSHPUBSITE_ASSETS_URL}}/sponsors/janestreet.png" alt="Jane Street">

assets/js/sponsors.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ $(document).ready(() => {
2828
new Sponsor('/sponsors/lourdesindustries.png', 'http://lourdesinc.com', 'Lourdres Industries'),
2929
new Sponsor('/sponsors/mooreresearchcenter.png', 'http://mrci.com', 'Moore Research Center'),
3030
new Sponsor('/sponsors/intergraph.png', 'http://intergraph.com', 'Intergraph'),
31-
new Sponsor('/sponsors/nortel.png', 'http://nortel-us.com', 'Nortel'),
3231
new Sponsor('/sponsors/janestreet.png', 'http://janestreet.com', 'Jane Street'),
3332
new Sponsor('/sponsors/northropgrumman.png', 'http://northropgrumman.com', 'Northrop Grumman'),
3433
new Sponsor('/sponsors/sonus.png', 'http://sonus.net', 'Sonus'),

0 commit comments

Comments
 (0)