Skip to content

Commit 8191df7

Browse files
cbaudouinjrcbaudouinjr
committed
Merge branch 'feature/css-overhaul' into develop
2 parents 8a59d86 + 15ad018 commit 8191df7

File tree

8 files changed

+113
-304
lines changed

8 files changed

+113
-304
lines changed

‎_site/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1" />
66
<meta name="description" content="codeRIT represents a coalition of RIT students with a mission to represent the RIT hackathon community on a national level. It focuses its attention towards increasing its relationship with other collegiate technical communities, teaching software development and entrepreneurial skills to its members, and uniting a fragmented collection of groups amongst GCCIS as one RIT group." />
77
<meta property="og:description" content="codeRIT represents a coalition of RIT students with a mission to represent the RIT hackathon community on a national level. It focuses its attention towards increasing its relationship with other collegiate technical communities, teaching software development and entrepreneurial skills to its members, and uniting a fragmented collection of groups amongst GCCIS as one RIT group." />
8-
<meta property="og:image" content="/assets/images/coderit_logo2.png" />
8+
<meta property="og:image" content="/assets/images/coderit/coderit_logo.png" />
99
<meta property="og:url" content="http:coderit.org" />
1010
<meta name="twitter:card" content="summary" />
1111
<meta name="twitter:url" content="https://coderit.org" />

‎_site/assets/css/main.css

Lines changed: 21 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ a {
8484
color: #FFFFFF; }
8585

8686
.banner {
87-
background: #384859;
88-
background: url("../images/coderit/coderit_background.png") center center fixed;
8987
box-sizing: border-box;
9088
color: #FFFFFF;
9189
display: block;
@@ -96,8 +94,13 @@ a {
9694
.banner .inner {
9795
left: 0;
9896
right: 0; }
97+
.banner.coderit {
98+
background: #384859;
99+
background: url("../images/coderit/coderit_background.png") center center fixed; }
100+
.banner.clayhack {
101+
background: #ED7277;
102+
background: url("../images/clayhack/clayhack_background.png") center center fixed; }
99103
.banner.welcome {
100-
background: url("../images/coderit/coderit_background.png") center center fixed;
101104
font-size: 1.25em;
102105
height: 100%;
103106
min-height: 350px;
@@ -114,62 +117,6 @@ a {
114117
-o-transform: translate(-50%, -50%); }
115118
.banner.welcome .logo {
116119
margin-bottom: 25px; }
117-
.banner.welcome #learn-more:after {
118-
border-color: #FFFFFF transparent transparent transparent;
119-
border-style: solid;
120-
border-width: 12px;
121-
content: "";
122-
display: block;
123-
height: 0;
124-
left: 50%;
125-
position: absolute;
126-
top: 150%;
127-
transform: translateX(-50%);
128-
width: 0; }
129-
130-
.banner-clayhack {
131-
background: clay;
132-
background: url("../images/clayhack/clayhack_background.png") center center fixed;
133-
box-sizing: border-box;
134-
color: #FFFFFF;
135-
display: block;
136-
margin: 0 auto;
137-
padding: 10px 0;
138-
position: relative;
139-
width: 100%; }
140-
.banner-clayhack .inner {
141-
left: 0;
142-
right: 0; }
143-
.banner-clayhack.welcome {
144-
background: url("../images/clayhack/clayhack_background.png") center center fixed;
145-
font-size: 1.25em;
146-
height: 100%;
147-
min-height: 350px;
148-
padding: 60px 0 80px;
149-
text-align: center; }
150-
.banner-clayhack.welcome .inner.container {
151-
position: absolute;
152-
left: 50%;
153-
top: 50%;
154-
min-width: 320px;
155-
transform: translate(-50%, -50%);
156-
-webkit-transform: translate(-50%, -50%);
157-
-moz-transform: translate(-50%, -50%);
158-
-o-transform: translate(-50%, -50%); }
159-
.banner-clayhack.welcome .logo {
160-
margin-bottom: 25px; }
161-
.banner-clayhack.welcome #learn-more:after {
162-
border-color: #FFFFFF transparent transparent transparent;
163-
border-style: solid;
164-
border-width: 12px;
165-
content: "";
166-
display: block;
167-
height: 0;
168-
left: 50%;
169-
position: absolute;
170-
top: 150%;
171-
transform: translateX(-50%);
172-
width: 0; }
173120

174121
.text-large {
175122
font-size: 2em; }
@@ -202,16 +149,11 @@ a {
202149
margin-bottom: -90px; }
203150

204151
.title {
205-
color: #F3852A;
206-
text-align: center; }
207-
208-
.title-clayhack {
209-
color: #ED7277;
210-
text-align: center; }
211-
212-
.title-clayhack-contact {
213-
color: #FFFFFF;
214152
text-align: center; }
153+
.title.coderit {
154+
color: #F3852A; }
155+
.title.clayhack {
156+
color: #ED7277; }
215157

216158
.loader {
217159
max-width: 80px;
@@ -235,71 +177,45 @@ a {
235177
border-radius: 100%;
236178
border: 1px solid;
237179
box-sizing: border-box;
238-
color: #194774;
239180
height: 150px;
240181
padding: 30px;
241182
width: 150px; }
183+
#about .badge-cta .badge-icon.coderit {
184+
color: #194774; }
185+
#about .badge-cta .badge-icon.clayhack {
186+
color: #EF6669; }
242187
#about .badge-cta .badge-name {
243188
margin-top: 30px; }
244-
#about .clayhack_badge-cta .badge-icon {
245-
-webkit-border-radius: 100%;
246-
-moz-border-radius: 100%;
247-
-ms-border-radius: 100%;
248-
-o-border-radius: 100%;
249-
border-radius: 100%;
250-
border: 1px solid;
251-
box-sizing: border-box;
252-
color: #EF6669;
253-
height: 150px;
254-
padding: 30px;
255-
width: 150px; }
256-
#about .clayhack_badge-cta .badge-name {
257-
margin-top: 30px; }
258189
#about hr {
259190
background: #444444;
260191
border-color: #444444;
261192
color: #444444;
262193
margin: 75px auto;
263194
width: 50%; }
264-
#about #mission {
195+
#about p {
265196
font-size: 1.125em;
266197
margin-left: 10%;
267198
text-align: center;
268199
padding-bottom: 10px;
269200
width: 80%; }
270201

271202
#events {
272-
background: url("../images/coderit/coderit_background_light.png") center center fixed;
273203
color: #505050;
274204
padding-bottom: 100px;
275205
padding-top: 100px; }
206+
#events .coderit {
207+
color: #F3852A; }
208+
#events .clayhack {
209+
color: #FFFFFF; }
276210
#events .inner {
277211
background: #FFFFFF;
278212
margin: 10px;
279213
padding: 50px; }
280-
#events h3 {
281-
color: #F3852A; }
282214
#events p {
283215
margin: 0 auto;
284216
text-align: center;
285217
width: 50%; }
286218

287-
#events-clayhack {
288-
background: url("../images/clayhack/clayhack_background_light.png") center center fixed;
289-
color: #505050;
290-
padding-bottom: 100px;
291-
padding-top: 100px; }
292-
#events-clayhack .inner {
293-
background: #FFFFFF;
294-
margin: 10px;
295-
padding: 50px; }
296-
#events-clayhack h3 {
297-
color: #F3852A; }
298-
#events-clayhack p {
299-
margin: 0 auto;
300-
text-align: center;
301-
width: 50%; }
302-
303219
#event-list-cta {
304220
margin: 0 auto 15px;
305221
width: 65%; }
@@ -391,14 +307,9 @@ a {
391307
width: 48%; }
392308

393309
#contact-links a {
394-
color: #CE5F15;
395310
display: block;
396-
margin-bottom: 10px; }
397-
398-
#contact-links-clayhack a {
399-
color: #FFFFFF;
400-
display: block;
401-
margin-bottom: 10px; }
311+
margin-bottom: 10px;
312+
color: #FFFFFF; }
402313

403314
#footer {
404315
background: #242f3a;
@@ -416,11 +327,6 @@ a {
416327
margin-top: 0;
417328
padding-top: 25px; }
418329

419-
#clayhack-page h3 {
420-
font-size: 2em;
421-
margin-top: 0px;
422-
color: #FFFFFF; }
423-
424330
@media screen and (max-width: 768px) {
425331
body {
426332
font-size: 14px; }

‎_site/atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<title>codeRIT</title>
55
<link href="http://localhost:4000/atom.xml" rel="self"/>
66
<link href="http://localhost:4000/"/>
7-
<updated>2019-03-06T11:13:00-05:00</updated>
7+
<updated>2019-03-08T14:13:47-05:00</updated>
88
<id>http://localhost:4000</id>
99
<author>
1010
<name></name>

‎_site/clayhack.html

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,45 +21,44 @@
2121
</head>
2222

2323
<body>
24-
<div class="banner-clayhack welcome">
24+
<div class="banner clayhack welcome">
2525
<div class="inner container">
26-
<img class="logo" src="/assets/images/clayhack/clayhack_logo.svg" alt="ClayHack" title="ClayHack" />
26+
<img class="logo" src="/assets/images/clayhack/clayhack_logo.svg" alt="ClayHack" title clayhack="ClayHack" />
2727
<p>RIT's new student hackathon.</p>
2828
<p>Comming soon.</p>
2929
<a id="learn-more" href="#about" class="button scroll-to">LEARN MORE</a>
3030
</div>
3131
</div>
3232
<div id="about" class="section container">
33-
<h2 class="title-clayhack">What is ClayHack?</h2>
33+
<h2 class="title clayhack">What is ClayHack?</h2>
3434
<div class="grid-cta three">
35-
<p id="mission">ClayHack is a mini hackathon designed to bring new students at RIT together for 6 hours of creativity and innovation. Form a team and start a project from nothing and transform it into greatness in only 6 hours. All new students no matter the skill level are encouraged to join us for a night of fun and programming! <br />What can you build in 6 hours?</p>
35+
<p>ClayHack is a mini hackathon designed to bring new students at RIT together for 6 hours of creativity and innovation. Form a team and start a project from nothing and transform it into greatness in only 6 hours. All new students no matter the skill level are encouraged to join us for a night of fun and programming! <br />What can you build in 6 hours?</p>
3636
<p class="center"><a href="http://eepurl.com/dCiizP" class="button clay">Keep me updated<span class="fa fa-arrow-right icon-space-l"></span></a></p>
37-
38-
<h2 class="title-clayhack">What is a hackathon?</h2>
39-
<p id="mission">A typical hackathon is a weekend where students have 24 hours to create something from nothing. It could be an app or a website or even a computer! The spirit of a hackathon is to foster a community of makers - no matter what the skill level.</p>
40-
<h2 class="title-clayhack">Does it cost money?</h2>
41-
<p id="mission">In the spirit of a hackathon, everything's free.</p>
37+
<h2 class="title clayhack">What is a hackathon?</h2>
38+
<p>A typical hackathon is a weekend where students have 24 hours to create something from nothing. It could be an app or a website or even a computer! The spirit of a hackathon is to foster a community of makers - no matter what the skill level.</p>
39+
<h2 class="title clayhack">Does it cost money?</h2>
40+
<p>In the spirit of a hackathon, everything's free.</p>
4241
<hr/>
43-
<div class="col center clayhack_badge-cta">
44-
<i class="fa fa-book fa-5x badge-icon"></i>
42+
<div class="col center badge-cta">
43+
<i class="fa fa-book fa-5x badge-icon clayhack"></i>
4544
<h3 class="badge-name">Education</h3>
4645
<p>Learn something new.</p>
4746
</div>
48-
<div class="col center clayhack_badge-cta">
49-
<i class="fa fa-group fa-5x badge-icon"></i>
47+
<div class="col center badge-cta">
48+
<i class="fa fa-group fa-5x badge-icon clayhack"></i>
5049
<h3 class="badge-name">Community</h3>
5150
<p>Join a community of makers.</p>
5251
</div>
53-
<div class="col center clayhack_badge-cta">
54-
<i class="fas fa-palette fa-5x badge-icon"></i>
52+
<div class="col center badge-cta">
53+
<i class="fas fa-palette fa-5x badge-icon clayhack"></i>
5554
<h3 class="badge-name">Creativity</h3>
5655
<p>Bring your imagination to life.</p>
5756
</div>
5857
</div>
5958
</div>
60-
<div id="events-clayhack" class="banner">
61-
<div class="section" id="clayhack-page">
62-
<h3 class="center">EVENT SCHEDULE</h3>
59+
<div id="events" class="banner clayhack">
60+
<div class="section">
61+
<h3 class="center clayhack">EVENT SCHEDULE</h3>
6362
<div class="container">
6463
<div class="inner">
6564
<div class="col-xs-12 center">
@@ -74,17 +73,17 @@ <h3 class="center">EVENT SCHEDULE</h3>
7473
</div>
7574
</div>
7675
</div>
77-
<div id="contact" class="banner-clayhack">
76+
<div id="contact" class="banner clayhack">
7877
<div class="section container">
79-
<h2 class="title-clayhack-contact">GET IN TOUCH</h2>
78+
<h2 class="title">GET IN TOUCH</h2>
8079
<div class="grid-cta two">
8180
<div class="col">
8281
Rochester Institute of Technology<br/>
8382
1 Lomb Memorial Dr.<br/>
8483
Rochester, NY 14623
8584
</div>
86-
<div id="contact-links-clayhack" class="col">
87-
<a href="http://eepurl.com/dCiizP" target="_blank" rel="nofollow">
85+
<div id="contact-links" class="col">
86+
<a href="http://eepurl.com/gjUR1r" target="_blank" rel="nofollow">
8887
<span class="fa fa-stack">
8988
<i class="fa fa-circle-thin fa-stack-2x"></i>
9089
<i class="fa fa-envelope fa-stack-1x"></i>

‎_site/index.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1" />
66
<meta name="description" content="codeRIT represents a coalition of RIT students with a mission to represent the RIT hackathon community on a national level. It focuses its attention towards increasing its relationship with other collegiate technical communities, teaching software development and entrepreneurial skills to its members, and uniting a fragmented collection of groups amongst GCCIS as one RIT group." />
77
<meta property="og:description" content="codeRIT represents a coalition of RIT students with a mission to represent the RIT hackathon community on a national level. It focuses its attention towards increasing its relationship with other collegiate technical communities, teaching software development and entrepreneurial skills to its members, and uniting a fragmented collection of groups amongst GCCIS as one RIT group." />
8-
<meta property="og:image" content="/assets/images/coderit_logo2.png" />
8+
<meta property="og:image" content="/assets/images/coderit/coderit_logo.png" />
99
<meta property="og:url" content="http:coderit.org" />
1010
<meta name="twitter:card" content="summary" />
1111
<meta name="twitter:url" content="https://coderit.org" />
@@ -20,40 +20,40 @@
2020
</head>
2121

2222
<body>
23-
<div class="banner welcome">
23+
<div class="banner coderit welcome">
2424
<div class="inner container">
25-
<img class="logo" src="/assets/images/coderit/coderit_logo.svg" alt="codeRIT" title="codeRIT" />
25+
<img class="logo" src="/assets/images/coderit/coderit_logo.svg" alt="codeRIT" title coderit="codeRIT" />
2626
<p>RIT's premier hackathon club.</p>
2727
<a id="learn-more" href="#about" class="button scroll-to">LEARN MORE</a>
2828
</div>
2929
</div>
3030
<div id="about" class="section container">
31-
<h2 class="title">WHAT IS CODERIT?</h2>
31+
<h2 class="title coderit">WHAT IS CODERIT?</h2>
3232
<div class="grid-cta three">
33-
<p id="mission">codeRIT is a community of students who like to make things. We empower all RIT students, especially newcomers, with the tools and knowledge necessary to become successful makers.</p>
33+
<p>codeRIT is a community of students who like to make things. We empower all RIT students, especially newcomers, with the tools and knowledge necessary to become successful makers.</p>
3434
<p class="center"><a href="https://campusgroups.rit.edu/CODERIT/club_signup" class="button orange">Join codeRIT on CampusGroups<span class="fa fa-arrow-right icon-space-l"></span></a></p>
3535
<p class="center"><a href="https://coderit.slack.com/" class="button orange">Join our Slack<span class="fa fa-arrow-right icon-space-l"></span></a></p>
3636
<hr/>
3737
<div class="col center badge-cta">
38-
<i class="fa fa-book fa-5x badge-icon"></i>
38+
<i class="fa fa-book fa-5x badge-icon coderit"></i>
3939
<h3 class="badge-name">Education</h3>
4040
<p>Learn something new.</p>
4141
</div>
4242
<div class="col center badge-cta">
43-
<i class="fa fa-group fa-5x badge-icon"></i>
43+
<i class="fa fa-group fa-5x badge-icon coderit"></i>
4444
<h3 class="badge-name">Community</h3>
4545
<p>Join a community of makers.</p>
4646
</div>
4747
<div class="col center badge-cta">
48-
<i class="fa fa-home fa-5x badge-icon"></i>
48+
<i class="fa fa-home fa-5x badge-icon coderit"></i>
4949
<h3 class="badge-name">Empowerment</h3>
5050
<p>Give back to the RIT community.</p>
5151
</div>
5252
</div>
5353
</div>
54-
<div id="events" class="banner">
54+
<div id="events" class="banner coderit">
5555
<div class="section">
56-
<h3 class="center">EVENT SCHEDULE</h3>
56+
<h3 class="center coderit">EVENT SCHEDULE</h3>
5757
<div class="container">
5858
<div class="inner">
5959
<div class="grid-cta two">
@@ -78,9 +78,9 @@ <h4>We're getting ready for the next BrickHack.</h4>
7878
</div>
7979
</div>
8080
</div>
81-
<div id="contact" class="banner">
81+
<div id="contact" class="banner coderit">
8282
<div class="section container">
83-
<h2 class="title">GET IN TOUCH</h2>
83+
<h2 class="title coderit">GET IN TOUCH</h2>
8484
<div class="grid-cta two">
8585
<div class="col">
8686
Rochester Institute of Technology<br/>

0 commit comments

Comments
 (0)