Skip to content

Commit 21b430c

Browse files
authored
Merge pull request #235 from ComputerScienceHouse/develop
Update Eboard names for Fall 2020, add some project links
2 parents 30b916e + 6ad9207 commit 21b430c

File tree

3 files changed

+27
-21
lines changed

3 files changed

+27
-21
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ GEM
5252
pathutil (0.16.2)
5353
forwardable-extended (~> 2.6)
5454
public_suffix (3.1.1)
55-
rake (12.3.2)
55+
rake (12.3.3)
5656
rb-fsevent (0.10.3)
5757
rb-inotify (0.10.0)
5858
ffi (~> 1.0)

about/eboard.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</div>
2424
<div class="col-12 col-lg-9">
2525
<h2 class="header">Chairman</h2>
26-
<h3>Owen Miller</h3>
26+
<h3>Tori Rossini</h3>
2727
<p class="long-form">
2828
The Chairman of CSH serves as the head of E-Board, supervising the activities of the directors and presiding over our weekly house meetings.
2929
The Chairman is also the primary spokesperson for the House, representing the interests of our members in communications with RIT and the rest of the world.
@@ -39,7 +39,7 @@ <h3>Owen Miller</h3>
3939
</div>
4040
<div class="col-12 col-lg-9">
4141
<h2 class="header">Evaluations</h2>
42-
<h3>Skyler Clark</h3>
42+
<h3>Vivian Nowka-Keane</h3>
4343
<p class="long-form">
4444
The Evaluations director is responsible for connecting with the RIT student community, as well as organizing the process of screening, accepting, and welcoming new members.
4545
Members wouldn't be here without evals!
@@ -74,7 +74,7 @@ <h3>Connor Jackson</h3>
7474
</div>
7575
<div class="col-12 col-lg-9">
7676
<h2 class="header">House History</h2>
77-
<h3>Tori Rossini &amp; Chase Slattery</h3>
77+
<h3>Kobie Arndt</h3>
7878
<p class="long-form">
7979
The primary responsibility of the History director is keeping the line of communication between CSH and our alumni open.
8080
We believe members should have a well-developed understanding of House's origins and accomplishments.
@@ -126,7 +126,7 @@ <h3>Jack Sauriol</h3>
126126
</div>
127127
<div class="col-12 col-lg-9">
128128
<h2 class="header">Research and Development</h2>
129-
<h3>Nick Mosher &amp; Kaitlin Berryman</h3>
129+
<h3>Kaitlin Berryman</h3>
130130
<p class="long-form">
131131
R&D is responsible for organizing seminars and assisting with technical projects, with the goal of encouraging members to learn new skills and gain experience.
132132
</p>
@@ -141,7 +141,7 @@ <h3>Nick Mosher &amp; Kaitlin Berryman</h3>
141141
</div>
142142
<div class="col-12 col-lg-9">
143143
<h2 class="header">Social</h2>
144-
<h3>Vivian Nowka-Keane &amp; Kobie Arndt</h3>
144+
<h3>Corey Rigney &amp; Rhys Stever</h3>
145145
<p class="long-form">
146146
The Social directors are responsible for planning and running social events for our members, such as Welcome Back, movie nights, and other events on floor and around Rochester.
147147
</p>

index.html

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,13 @@ <h2 class="header">Things we've done</h2>
9494
<div class="col-12 col-lg-8 images">
9595
<div class="row">
9696
<div class="col-3">
97-
<picture>
98-
<source srcset="https://assets.csh.rit.edu/pubsite/projects/schedulemaker.webp" type="image/webp" />
99-
<source srcset="https://assets.csh.rit.edu/pubsite/projects/schedulemaker.jpg" type="image/jpeg" />
100-
<img class="rounded" src="https://assets.csh.rit.edu/pubsite/projects/schedulemaker.jpg" alt="The logo for CSH Schedule Maker" />
101-
</picture>
97+
<a href="https://schedule.csh.rit.edu/" target="_blank">
98+
<picture>
99+
<source srcset="https://assets.csh.rit.edu/pubsite/projects/schedulemaker.webp" type="image/webp" />
100+
<source srcset="https://assets.csh.rit.edu/pubsite/projects/schedulemaker.jpg" type="image/jpeg" />
101+
<img class="rounded" src="https://assets.csh.rit.edu/pubsite/projects/schedulemaker.jpg" alt="The logo for CSH Schedule Maker" />
102+
</picture>
103+
</a>
102104
</div>
103105
<div class="col-3">
104106
<picture>
@@ -108,18 +110,22 @@ <h2 class="header">Things we've done</h2>
108110
</picture>
109111
</div>
110112
<div class="col-3">
111-
<picture>
112-
<source srcset="https://assets.csh.rit.edu/pubsite/projects/drink.webp" type="image/webp" />
113-
<source srcset="https://assets.csh.rit.edu/pubsite/projects/drink.jpg" type="image/jpeg" />
114-
<img class="rounded" src="https://assets.csh.rit.edu/pubsite/projects/drink.jpg" alt="Two of CSH's networked vending machines, Drink and Snack.">
115-
</picture>
113+
<a href="https://github.com/ramzallan/tonic" target="_blank">
114+
<picture>
115+
<source srcset="https://assets.csh.rit.edu/pubsite/projects/drink.webp" type="image/webp" />
116+
<source srcset="https://assets.csh.rit.edu/pubsite/projects/drink.jpg" type="image/jpeg" />
117+
<img class="rounded" src="https://assets.csh.rit.edu/pubsite/projects/drink.jpg" alt="Two of CSH's networked vending machines, Drink and Snack.">
118+
</picture>
119+
</a>
116120
</div>
117121
<div class="col-3">
118-
<picture>
119-
<source srcset="https://assets.csh.rit.edu/pubsite/projects/harold.webp" type="image/webp" />
120-
<source srcset="https://assets.csh.rit.edu/pubsite/projects/harold.jpg" type="image/jpeg" />
121-
<img class="rounded" src="https://assets.csh.rit.edu/pubsite/projects/harold.jpg" alt="Harold, a box with a sensor on it, that plays members' music" />
122-
</picture>
122+
<a href="https://github.com/nfatkhiyev/Harold" target="_blank">
123+
<picture>
124+
<source srcset="https://assets.csh.rit.edu/pubsite/projects/harold.webp" type="image/webp" />
125+
<source srcset="https://assets.csh.rit.edu/pubsite/projects/harold.jpg" type="image/jpeg" />
126+
<img class="rounded" src="https://assets.csh.rit.edu/pubsite/projects/harold.jpg" alt="Harold, a box with a sensor on it, that plays members' music" />
127+
</picture>
128+
</a>
123129
</div>
124130
</div>
125131
</div>

0 commit comments

Comments
 (0)