Skip to content

Commit a33b910

Browse files
rswiernikrswiernik
committed
Merge pull request #70 from stevenmirabito/2016-site-rewrite
Bug Fixes and 40th improvements
2 parents d0aa6c0 + 88e2a40 commit a33b910

File tree

10 files changed

+342
-33
lines changed

10 files changed

+342
-33
lines changed

‎40th.html‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<include file="resources/templates/_header.html"></include>
4+
<link rel="stylesheet" href="resources/css/timeline.css">
5+
6+
<body>
7+
<include file="resources/templates/_navbar.html"></include>
8+
9+
<!-- Main jumbotron for a primary marketing message or call to action -->
10+
<div class="jumbotron csh-page-header">
11+
<div class="container">
12+
<div class="row">
13+
<div class="col-xs-12 col-sm-12 col-md-12 vcenter">
14+
<div class="csh-header-text">
15+
40th Anniversary
16+
</div>
17+
</div>
18+
</div>
19+
</div>
20+
</div>
21+
22+
<div class="container csh-body">
23+
<!-- Insert Page Content In this Area -->
24+
<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>
25+
<div class="panel panel-default">
26+
<div class="panel-heading">
27+
<h3 class="panel-title">Event Calendar</h3>
28+
</div>
29+
<div class="panel-body event-calendar">
30+
<ul class="nav nav-tabs nav-justified" role="tablist">
31+
<li role="presentation" class="active"><a href="#evcal-friday" aria-controls="home" role="tab" data-toggle="tab">Friday, April 15</a></li>
32+
<li role="presentation"><a href="#evcal-saturday" aria-controls="profile" role="tab" data-toggle="tab">Saturday, April 16</a></li>
33+
<li role="presentation"><a href="#evcal-sunday" aria-controls="messages" role="tab" data-toggle="tab">Sunday, April 17</a></li>
34+
</ul>
35+
<div class="tab-content">
36+
<div role="tabpanel" class="tab-pane active" id="evcal-friday">
37+
<h3>Capture the Disk</h3>
38+
<p>Starting around dusk we'll be playing Capture the Disk. Like the name suggests, Capture the Disk is a game similar to Capture the Flag, but with a CSH spin. Rules will be explained prior to the start of the game.</p>
39+
<h3>Plates</h3>
40+
<p>After Capture the Disk is finished it's time to get plates! Small groups will organize and go to various restaurants. Whether you like Mark's, Nick Tahou's, Steve T, or another place entirely this is the time to undo any kind of remotely healthy exercise Capture the Disk provided.</p>
41+
</div>
42+
<div role="tabpanel" class="tab-pane" id="evcal-saturday">
43+
<h3>Tours of Gene Polisseni Center</h3>
44+
<p>Saturday afternoon you can tour the new RIT hockey arena. Tours for this event will be in smaller groups. More information to come.</p>
45+
<h3>Tour Floor</h3>
46+
<p>Haven't been to floor in years? Want to come hang out? Tours of floor and probably many stories from past and present generations will occur all afternoon.</p>
47+
<h3>Formal Banquet</h3>
48+
<p>In the evening there will be a formal banquet held in the Davis Room of the Student Alumni Union at 7:00 PM Saturday. There will be a buffet of Italian food including Chicken Piccata, Tortellini, Salads, and a dessert of Tiramisu! There will be plenty of refreshments, a dance floor, and a brief speech on the current state of Computer Science House.</p>
49+
</div>
50+
<div role="tabpanel" class="tab-pane" id="evcal-sunday">
51+
<h3>Goodbye Brunch</h3>
52+
<p>Brunch and one last get together before everyone heads out. T-Shirts designed specially for 40th will be given out at this event.</p>
53+
</div>
54+
</div>
55+
</div>
56+
</div>
57+
<div class="panel panel-default">
58+
<div class="panel-heading">
59+
<h3 class="panel-title">News & Updates</h3>
60+
</div>
61+
<div class="panel-body">
62+
<div id="timeline">
63+
<div class="timeline-item">
64+
<div class="timeline-icon">
65+
<i class="fa fa-bed"></i>
66+
</div>
67+
<div class="timeline-content">
68+
<h2>Hotel Reservations Begin</h2>
69+
<p>
70+
<span class="timeline-date">January 10, 2016</span>
71+
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.
72+
</p>
73+
<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>
74+
</div>
75+
</div>
76+
77+
<div class="timeline-item">
78+
<div class="timeline-icon">
79+
<i class="fa fa-envelope"></i>
80+
</div>
81+
<div class="timeline-content right">
82+
<h2>Chairman's Letter Mailed</h2>
83+
<p>
84+
<span class="timeline-date">December 4, 2015</span>
85+
RIT Alumni Relations has mailed a letter from our chairman to all alumni marked as members of CSH. This letter gives a high level overview of the event including activities and the formal dinner.
86+
</p>
87+
<a href="40th_chairman_letter.html" class="btn csh-btn">Read the letter <i class="fa fa-arrow-right"></i></a>
88+
</div>
89+
</div>
90+
91+
<div class="timeline-item">
92+
<div class="timeline-icon">
93+
<i class="fa fa-paper-plane"></i>
94+
</div>
95+
<div class="timeline-content">
96+
<h2>Save the Date Postcards Mailed</h2>
97+
<p>
98+
<span class="timeline-date">July 17, 2015</span>
99+
RIT Alumni Relations has mailed save the date postcards to all alumni marked as members of CSH.
100+
</p>
101+
<a href="40th_save_the_date.html" class="btn csh-btn">View the card <i class="fa fa-arrow-right"></i></a>
102+
</div>
103+
</div>
104+
</div>
105+
</div>
106+
</div>
107+
<!-- End Page Content Here -->
108+
</div>
109+
<include file="resources/templates/_footer.html"></include>
110+
111+
112+
<!-- Bootstrap core JavaScript
113+
================================================== -->
114+
<include file="resources/templates/_coreJS.html"></include>
115+
</body>
116+
</html>

‎contact.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<!-- Insert Page Content In this Area -->
2323
<div class="row">
2424
<div class="col-md-8 col-xs-12 col-sm-6">
25-
<div class="col-md-12 contact-header">
26-
<h3 class="mobile-center-text" style="color:#222; margin-left:-15px;"><i class="fa fa-comment"></i> Send Us a Message</h3>
25+
<div class="contact-header">
26+
<h3 class="mobile-center-text" style="color:#222"><i class="fa fa-comment"></i> Send Us a Message</h3>
2727
</div>
2828
<form method="POST" action="resources/php/mailer.php" id="mailerForm" data-toggle="validator">
2929
<div class="row">
@@ -67,8 +67,8 @@ <h3 class="mobile-center-text" style="color:#222; margin-left:-15px;"><i class="
6767
</form>
6868
</div>
6969
<div class="col-md-4 col-xs-12 col-sm-6">
70-
<div class="col-md-12 contact-header">
71-
<h3 class="mobile-center-text" style="color:#222; margin-left:-15px;"><i class="fa fa-home"></i> Reach Out to Us</h3>
70+
<div class="contact-header">
71+
<h3 class="mobile-center-text" style="color:#222"><i class="fa fa-home"></i> Reach Out to Us</h3>
7272
</div>
7373
<h4 style="text-decoration:underline;">Computer Science House</h4>
7474
<p>

‎insights.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
</p>
3636
<br>
3737

38-
39-
4038
<div class="container-fluid">
4139
<div class="row">
4240
<div class="col-md-4">

‎resources/css/main.css‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,47 @@ nav a:hover, nav a:focus{
250250

251251
}
252252

253+
.event-calendar {
254+
padding: 0;
255+
}
256+
257+
.event-calendar .tab-content {
258+
padding: 0 20px 10px 20px;
259+
}
260+
261+
.event-calendar a {
262+
color: #B0197E;
263+
}
264+
265+
.event-calendar a:hover {
266+
color: #9c1670;
267+
}
268+
269+
.event-calendar ul > li > a {
270+
border: 0 !important;
271+
margin: 0 !important;
272+
border-bottom: 1px solid #e6e6e6 !important;
273+
border-radius: 0 !important;
274+
background-color: #f2f2f2;
275+
}
276+
277+
.event-calendar ul > li > a:hover,
278+
.event-calendar ul > li > a:focus,
279+
.event-calendar ul > li.active > a:hover,
280+
.event-calendar ul > li.active > a:focus {
281+
background-color: #e6e6e6;
282+
}
283+
284+
.event-calendar ul > li > a:focus,
285+
.event-calendar ul > li.active > a:focus {
286+
color: #B0197E;
287+
}
288+
289+
.event-calendar ul > li.active > a {
290+
color: #B0197E;
291+
background-color: #e6e6e6;
292+
}
293+
253294

254295
@media(max-width:767px){
255296
.csh-logo{

‎resources/css/timeline.css‎

Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
#timeline .timeline-item:after,
2+
#timeline .timeline-item:before {
3+
content: '';
4+
display: block;
5+
width: 100%;
6+
clear: both;
7+
}
8+
9+
*,*:before,*:after {
10+
box-sizing: border-box;
11+
-webkit-box-sizing: border-box;
12+
-moz-box-sizing: border-box;
13+
}
14+
15+
#timeline {
16+
line-height: 1.5em;
17+
font-size: 14px;
18+
width: 90%;
19+
margin: 30px auto;
20+
position: relative;
21+
-webkit-transition: all 0.4s ease;
22+
-moz-transition: all 0.4s ease;
23+
-ms-transition: all 0.4s ease;
24+
transition: all 0.4s ease;
25+
}
26+
27+
#timeline:before {
28+
content: "";
29+
width: 3px;
30+
height: 100%;
31+
background: #e11c52;
32+
left: 50%;
33+
top: 0;
34+
position: absolute;
35+
}
36+
37+
#timeline:after {
38+
content: "";
39+
clear: both;
40+
display: table;
41+
width: 100%;
42+
}
43+
44+
#timeline .timeline-item {
45+
margin-bottom: 50px;
46+
position: relative;
47+
}
48+
49+
#timeline .timeline-item .timeline-icon {
50+
background: #e11c52;
51+
width: 50px;
52+
height: 50px;
53+
position: absolute;
54+
top: 0;
55+
left: 50%;
56+
overflow: hidden;
57+
margin-left: -23px;
58+
-webkit-border-radius: 50%;
59+
-moz-border-radius: 50%;
60+
-ms-border-radius: 50%;
61+
border-radius: 50%;
62+
}
63+
64+
#timeline .timeline-item .timeline-icon img {
65+
position: relative;
66+
top: 14px;
67+
left: 14px;
68+
}
69+
70+
#timeline .timeline-item .timeline-icon i {
71+
font-size: 1.3em;
72+
color: #fff;
73+
position: relative;
74+
top: 15px;
75+
left: 15px;
76+
}
77+
78+
#timeline .timeline-item .timeline-content {
79+
width: 45%;
80+
background: #fff;
81+
padding: 20px;
82+
-webkit-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.75);
83+
-moz-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.75);
84+
-ms-box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.75);
85+
box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.75);
86+
-webkit-border-radius: 5px;
87+
-moz-border-radius: 5px;
88+
-ms-border-radius: 5px;
89+
border-radius: 5px;
90+
-webkit-transition: all 0.3s ease;
91+
-moz-transition: all 0.3s ease;
92+
-ms-transition: all 0.3s ease;
93+
transition: all 0.3s ease;
94+
}
95+
96+
#timeline .timeline-item .timeline-content h2 {
97+
padding: 15px;
98+
font-size: initial;
99+
background: #e11c52;
100+
color: #fff;
101+
margin: -20px -20px 0 -20px;
102+
font-weight: 500;
103+
-webkit-border-radius: 6px 6px 0 0;
104+
-moz-border-radius: 6px 6px 0 0;
105+
-ms-border-radius: 6px 6px 0 0;
106+
border-radius: 6px 6px 0 0;
107+
}
108+
109+
#timeline .timeline-item .timeline-content p {
110+
margin: 1em 0;
111+
}
112+
113+
#timeline .timeline-item .timeline-content p span {
114+
display: block;
115+
font-weight: bold;
116+
margin-bottom: 10px;
117+
}
118+
119+
#timeline .timeline-item .timeline-content:before {
120+
content: '';
121+
position: absolute;
122+
left: 45%;
123+
top: 20px;
124+
width: 0;
125+
height: 0;
126+
border-top: 7px solid transparent;
127+
border-bottom: 7px solid transparent;
128+
border-left: 7px solid #e11c52;
129+
}
130+
131+
#timeline .timeline-item .timeline-content.right {
132+
float: right;
133+
}
134+
135+
#timeline .timeline-item .timeline-content.right:before {
136+
content: '';
137+
right: 45%;
138+
left: inherit;
139+
border-left: 0;
140+
border-right: 7px solid #e11c52;
141+
}
142+
143+
@media screen and (max-width: 768px) {
144+
#timeline {
145+
margin: 30px;
146+
padding: 0;
147+
}
148+
149+
#timeline:before {
150+
left: 0;
151+
}
152+
153+
#timeline .timeline-item .timeline-content {
154+
width: 90%;
155+
float: right;
156+
}
157+
158+
#timeline .timeline-item .timeline-content:before,#timeline .timeline-item .timeline-content.right:before {
159+
left: 10%;
160+
margin-left: -6px;
161+
border-left: 0;
162+
border-right: 7px solid #e11c52;
163+
}
164+
165+
#timeline .timeline-item .timeline-icon {
166+
left: 0;
167+
}
168+
}

‎resources/templates/_coreJS.html‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,11 @@
33
<script src="resources/js/bootstrap.min.js"></script>
44
<!-- Main JS -->
55
<script src="resources/js/main.js"></script>
6-
6+
<!-- Google Analytics -->
7+
<script>
8+
!function(h,a,r,o,l,d){h.GoogleAnalyticsObject=r;h[r]||(h[r]=function(){
9+
(h[r].q=h[r].q||[]).push(arguments)});h[r].l=+new Date;l=a.createElement(o);
10+
d=a.getElementsByTagName(o)[0];l.src='//www.google-analytics.com/analytics.js';
11+
d.parentNode.insertBefore(l,d)}(window,document,'ga','script');
12+
ga('create','UA-75959-4','csh.rit.edu');ga('send','pageview');
13+
</script>

‎resources/templates/_footer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h3 style="color:#FFF;">Site Map</h3>
88
<div class="sitemap-ul-container">
99
<ul class="sitemap">
1010
<li><a href="index.html" class="sitemap-link">Home</a></li>
11-
<li><a href="40th_chairman_letter.html" class="sitemap-link">40th Information</a></li>
11+
<li><a href="40th.html" class="sitemap-link">40th Anniversary</a></li>
1212
<li><a href="about.html" class="sitemap-link">About</a></li>
1313
<ul class="sitemap">
1414
<li><a href="projects.html" class="sitemap-link">Projects</a></li>

0 commit comments

Comments
 (0)