Skip to content

Commit

Permalink
Merge pull request #2661 from doug-salvati/dsABT1
Browse files Browse the repository at this point in the history
Update about us page for summer 2017
  • Loading branch information
doug-salvati authored Jun 27, 2017
2 parents 397e89f + bb279f3 commit 0ba5cd0
Showing 1 changed file with 66 additions and 65 deletions.
131 changes: 66 additions & 65 deletions app/views/home/contact.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -78,47 +78,7 @@
<!-- Developer section -->
<div class="row">

<!-- Patrick Son -->
<div class="col-md-4">
<div class=" panel panel-default">
<div class="panel-heading">
<h3>Patrick Son</h3>
<i>Lead Developer, Web, Release Manager</i>
</div>
<div class="panel-body">
<div class="col-md-12 center">
<%= image_tag("contact/patrick_son.png", height:"120") %>
</div>
<div class="col-md-12 center">
<b>Undergraduate</b><br/>
B.S. Computer Science, 2017<br/>
<a href="mailto:[email protected]">[email protected]</a><br/>
<br/>
</div>
</div>
</div>
</div>

<!-- Tyler -->
<div class="col-md-4">
<div class=" panel panel-default">
<div class="panel-heading">
<h3>Tyler Puleo</h3>
<i>API Apps, HTML, Javascript, Python</i>
</div>
<div class="panel-body">
<div class="col-md-12 center">
<%= image_tag("contact/tyler_puleo.jpg", height:"120") %>
</div>
<div class="col-md-12 center">
<b>Undergraduate</b> <br/>
B.S. Computer Science, 2017<br/>
B.S. Electrical Engineering, 2017<br/>
<br/>
</div>
</div>
</div>
</div>

<!-- Doug Salvati -->
<div class="col-md-4">
<div class=" panel panel-default">
Expand All @@ -133,8 +93,8 @@
<div class="col-md-12 center">
<b>Undergraduate</b><br/>
B.S. Computer Science, 2018<br/>
<a href="mailto:[email protected]">[email protected]</a><br/>
<a href="http://www.cs.uml.edu/~dsalvati/">http://www.cs.uml.edu/~dsalvati/</a><br/>
Minors in Mathematics and Physics
<a href="https://www.linkedin.com/in/douglassalvati/">linkedin.com/in/douglassalvati</a><br/>
</div>
</div>
</div>
Expand Down Expand Up @@ -166,7 +126,7 @@
<div class=" panel panel-default">
<div class="panel-heading">
<h3>Michael Kusmirek</h3>
<i>Web Developer</i>
<i>MIT App Inventor 2 iSENSE Integration</i>
</div>
<div class="panel-body">
<div class="col-md-12 center">
Expand Down Expand Up @@ -225,26 +185,6 @@
</div>
</div>

<!-- Ashley Hale -->
<div class="col-md-4">
<div class=" panel panel-default">
<div class="panel-heading">
<h3>Ashley Hale</h3>
<i>Web Developer</i>
</div>
<div class="panel-body">
<div class="col-md-12 center">
<%= image_tag("contact/ashley_hale.png", height:"120") %>
</div>
<div class="col-md-12 center">
<b>Undergraduate</b><br/>
B.S. Computer Science, 2017<br/>
<br/><br/>
</div>
</div>
</div>
</div>

<!-- Josh Everett -->
<div class="col-md-4">
<div class=" panel panel-default">
Expand Down Expand Up @@ -677,7 +617,7 @@
</div>
<div class="col-md-12 center">
<b>Graduate</b><br/>
Ph.D. Computer Science, 2019<br/>
M.S. Computer Science, 2017<br/>
<a href="https://www.linkedin.com/in/farzeenharunani">
https://www.linkedin.com/in/farzeenharunani
</a>
Expand All @@ -686,4 +626,65 @@
</div>
</div>

<!-- Ashley Hale -->
<div class="col-md-4">
<div class=" panel panel-default">
<div class="panel-heading">
<h3>Ashley Hale</h3>
<i>App Inventor</i>
</div>
<div class="panel-body">
<div class="col-md-12 center">
<%= image_tag("contact/ashley_hale.png", height:"120") %>
</div>
<div class="col-md-12 center">
<b>Undergraduate</b><br/>
B.S. Computer Science, 2017<br/>
<br/><br/>
</div>
</div>
</div>
</div>

<!-- Patrick Son -->
<div class="col-md-4">
<div class=" panel panel-default">
<div class="panel-heading">
<h3>Patrick Son</h3>
<i>Lead Developer, Web, Release Manager</i>
</div>
<div class="panel-body">
<div class="col-md-12 center">
<%= image_tag("contact/patrick_son.png", height:"120") %>
</div>
<div class="col-md-12 center">
<b>Undergraduate</b><br/>
B.S. Computer Science, 2017<br/>
<a href="mailto:[email protected]">[email protected]</a><br/>
<br/>
</div>
</div>
</div>
</div>

<!-- Tyler -->
<div class="col-md-4">
<div class=" panel panel-default">
<div class="panel-heading">
<h3>Tyler Puleo</h3>
<i>API Apps, HTML, Javascript, Python</i>
</div>
<div class="panel-body">
<div class="col-md-12 center">
<%= image_tag("contact/tyler_puleo.jpg", height:"120") %>
</div>
<div class="col-md-12 center">
<b>Undergraduate</b> <br/>
B.S. Computer Science, 2017<br/>
B.S. Electrical Engineering, 2017<br/>
<br/>
</div>
</div>
</div>
</div>
</div>

0 comments on commit 0ba5cd0

Please sign in to comment.