Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 21 additions & 3 deletions 40th.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="container csh-body">
<!-- Insert Page Content In this Area -->
<p>Below you will find an overview of the events planned for CSH's 40th Anniversary. This is a general overview and subject to change. More specifics will be announced as plans are finalized and the date of 40th approaches.</p>
<div class="panel panel-default">
<div class="panel panel-csh">
<div class="panel-heading">
<h3 class="panel-title">Event Calendar</h3>
</div>
Expand Down Expand Up @@ -54,7 +54,24 @@ <h3>Goodbye Brunch</h3>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel panel-csh">
<div class="panel-heading">
<h3 class="panel-title">Hotel Reservations</h3>
</div>
<div class="panel-body">
<div class="row">
<div class="col-md-2" style="margin-bottom:10px;text-align:center;">
<img src="resources/images/40th/hampton.png" alt="Hampton by Hilton" width="150px">
</div>
<div class="col-md-10">
<p>CSH has reserved a block of rooms at the Hampton Inn &amp; Suites Rochester/Henrietta for the event. The hotel has created a reservation portal for members to reserve rooms in our hotel block at a special rate. Rooms start at $99/night until March 15th or until the block is sold-out, whichever comes first.</p>
<a href="https://www.google.com/maps/d/u/0/viewer?mid=zXAxVDtxnzvs.kA5WwPsTXacI" class="btn csh-btn" target="_blank"><i class="fa fa-map"></i> View Map</i></a>
<a href="http://hamptoninn.hilton.com/en/hp/groups/personalized/R/ROCHEHX-CSR-20160415/index.jhtml?WT.mc_id=POG" class="btn csh-btn" target="_blank">Reserve a room <i class="fa fa-arrow-right"></i></a>
</div>
</div>
</div>
</div>
<div class="panel panel-csh">
<div class="panel-heading">
<h3 class="panel-title">News & Updates</h3>
</div>
Expand All @@ -70,7 +87,7 @@ <h2>Hotel Reservations Begin</h2>
<span class="timeline-date">January 10, 2016</span>
Hampton Inn &amp; Suites Rochester/Henrietta has created a reservation portal for members to reserve rooms in our hotel block at a special rate. Rooms start at $99/night until March 15th or until the block is sold-out, whichever comes first.
</p>
<a href="http://hamptoninn.hilton.com/en/hp/groups/personalized/R/ROCHEHX-CSR-20160415/index.jhtml?WT.mc_id=POG" class="btn csh-btn">Reserve a room <i class="fa fa-arrow-right"></i></a>
<a href="http://hamptoninn.hilton.com/en/hp/groups/personalized/R/ROCHEHX-CSR-20160415/index.jhtml?WT.mc_id=POG" class="btn csh-btn" target="_blank">Reserve a room <i class="fa fa-arrow-right"></i></a>
</div>
</div>

Expand Down Expand Up @@ -104,6 +121,7 @@ <h2>Save the Date Postcards Mailed</h2>
</div>
</div>
</div>

<!-- End Page Content Here -->
</div>
<include file="resources/templates/_footer.html"></include>
Expand Down
2 changes: 1 addition & 1 deletion 40th_chairman_letter.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<div class="container csh-body">
<!-- Insert Page Content In this Area -->
<img src="resources/images/40th_chairman_letterhead.png" style="width:100%; margin-bottom:20px;">
<img src="resources/images/40th/40th_chairman_letterhead.png" style="width:100%; margin-bottom:20px;">
<p>Dear Computer Science House Member,</p>

<p> I’m excited to invite you to Computer Science House’s 40th Anniversary weekend! There’s a lot to look forward to and a whole lot of planning that has gone into it so far and will continue to go into it until April 16th. We look forward to greeting you all back on floor and having a fun weekend re-connecting. We’ve arranged for a Hotel block at the Hampton Inn a short ten minute drive from RIT via a TBD link. (This is an expanding block so please book ASAP)</p>
Expand Down
59 changes: 0 additions & 59 deletions 40th_landing.html

This file was deleted.

2 changes: 1 addition & 1 deletion 40th_save_the_date.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="container csh-body">
<!-- Insert Page Content In this Area -->

<img src="resources/images/40th.jpg" style="width:90%; max-width:700px; margin-top:30px; margin-bottom:30px;" class="hcenter-div">
<img src="resources/images/40th/40th.jpg" style="width:90%; max-width:700px; margin-top:30px; margin-bottom:30px;" class="hcenter-div">

<!-- End Page Content Here -->
</div>
Expand Down
15 changes: 15 additions & 0 deletions resources/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -809,4 +809,19 @@ td,th{
}
}

/*
* Panels
*/

.panel.panel-csh {
border: none;
-moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
}

.panel.panel-csh .panel-heading {
font-size:25px;
color:#FFF;
background-color:#E11C52;
}
File renamed without changes
Binary file added resources/images/40th/hampton.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed resources/images/background.png
Binary file not shown.
1 change: 0 additions & 1 deletion resources/templates/_navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<li class="dropdown">
<a href="40th.html" class="dropdown-toggle disabled" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><div class="csh-navbar-nav-shift navbarActive" page="40th_chairman_letter.html,40th_save_the_date.html">40th Anniversary<span class="caret"></span></div></a>
<ul class="dropdown-menu">
<li><a href="http://hamptoninn.hilton.com/en/hp/groups/personalized/R/ROCHEHX-CSR-20160415/index.jhtml?WT.mc_id=POG">Hotel Reservations</a></li>
<li><a href="40th_chairman_letter.html">Chairman's Letter</a></li>
<li><a href="40th_save_the_date.html">Save The Date</a></li>
</ul>
Expand Down