Skip to content

Commit 20d0779

Browse files
author
Christopher Baudouin
committed
Merge branch 'feature/clean' into develop
2 parents be3e02b + 99f2f1f commit 20d0779

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+33
-267
lines changed

‎_includes/events.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div id="event-list-cta">
22
<div class="center">
3-
<img class="loader" src="assets/css/loader.gif" />
3+
<img class="loader" src="assets/images/loader.gif" />
44
</div>
5-
</div>
5+
</div>

‎_posts/2014-04-30-Welcome-codeRIT.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎_site/2014/04/30/Welcome-codeRIT.html

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎_site/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1>Looks like this tiger den is empty.</h1>
2828
</div>
2929
<footer id="footer">
3030
<div class="inner container">
31-
<p>&copy; codeRIT 2018 All Rights Reserved</p>
31+
<p>&copy; codeRIT 2019 All Rights Reserved</p>
3232
</div>
3333
</footer>
3434
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>

‎_site/README.md

Lines changed: 2 additions & 2 deletions

‎_site/assets/css/clayhack_background.afphoto

-32.9 KB
Binary file not shown.

‎_site/assets/css/clayhack_background_light.afphoto

-42.2 KB
Binary file not shown.

‎_site/assets/css/clayhack_background_light.png

-15.6 KB
Binary file not shown.

‎_site/assets/css/clayhack_logo.svg

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎_site/assets/css/main.css

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ img {
3333
width: auto; }
3434

3535
a {
36+
color: #CE5F15;
3637
text-decoration: none; }
3738
a:hover {
3839
color: #F36321; }
@@ -84,7 +85,7 @@ a {
8485

8586
.banner {
8687
background: #384859;
87-
background: url("coderit_background.png") center center fixed;
88+
background: url("../images/coderit/coderit_background.png") center center fixed;
8889
box-sizing: border-box;
8990
color: #FFFFFF;
9091
display: block;
@@ -96,7 +97,7 @@ a {
9697
left: 0;
9798
right: 0; }
9899
.banner.welcome {
99-
background: url("coderit_background.png") center center fixed;
100+
background: url("../images/coderit/coderit_background.png") center center fixed;
100101
font-size: 1.25em;
101102
height: 100%;
102103
min-height: 350px;
@@ -128,7 +129,7 @@ a {
128129

129130
.banner-clayhack {
130131
background: clay;
131-
background: url("clayhack_background.png") center center fixed;
132+
background: url("../images/clayhack/clayhack_background.png") center center fixed;
132133
box-sizing: border-box;
133134
color: #FFFFFF;
134135
display: block;
@@ -140,7 +141,7 @@ a {
140141
left: 0;
141142
right: 0; }
142143
.banner-clayhack.welcome {
143-
background: url("clayhack_background.png") center center fixed;
144+
background: url("../images/clayhack/clayhack_background.png") center center fixed;
144145
font-size: 1.25em;
145146
height: 100%;
146147
min-height: 350px;
@@ -268,7 +269,7 @@ a {
268269
width: 80%; }
269270

270271
#events {
271-
background: url("coderit_background_light.png") center center fixed;
272+
background: url("../images/coderit/coderit_background_light.png") center center fixed;
272273
color: #505050;
273274
padding-bottom: 100px;
274275
padding-top: 100px; }
@@ -284,7 +285,7 @@ a {
284285
width: 50%; }
285286

286287
#events-clayhack {
287-
background: url("clayhack_background_light.png") center center fixed;
288+
background: url("../images/clayhack/clayhack_background_light.png") center center fixed;
288289
color: #505050;
289290
padding-bottom: 100px;
290291
padding-top: 100px; }

‎_site/assets/images/mlh_logo.jpg

-17.7 KB
Binary file not shown.

‎_site/assets/images/mlh_logo.png

-32.3 KB
Binary file not shown.

‎_site/atom.xml

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,13 @@
44
<title>codeRIT</title>
55
<link href="http://localhost:4000/atom.xml" rel="self"/>
66
<link href="http://localhost:4000/"/>
7-
<updated>2018-07-26T15:44:11-04:00</updated>
7+
<updated>2019-03-06T10:09:22-05:00</updated>
88
<id>http://localhost:4000</id>
99
<author>
1010
<name></name>
1111
<email></email>
1212
</author>
1313

1414

15-
<entry>
16-
<title>codeRIT General Meeting</title>
17-
<link href="http://localhost:4000/events/2017/09/12/Meeting-1.html"/>
18-
<updated>2017-09-12T00:00:00-04:00</updated>
19-
<id>http://localhost:4000/events/2017/09/12/Meeting-1</id>
20-
<content type="html">
21-
</content>
22-
</entry>
23-
24-
<entry>
25-
<title>Y-Hack</title>
26-
<link href="http://localhost:4000/events/2014/10/31/Y-Hack.html"/>
27-
<updated>2014-10-31T00:00:00-04:00</updated>
28-
<id>http://localhost:4000/events/2014/10/31/Y-Hack</id>
29-
<content type="html">
30-
</content>
31-
</entry>
32-
33-
<entry>
34-
<title>Hack MIT</title>
35-
<link href="http://localhost:4000/events/2014/10/03/Hack-MIT.html"/>
36-
<updated>2014-10-03T00:00:00-04:00</updated>
37-
<id>http://localhost:4000/events/2014/10/03/Hack-MIT</id>
38-
<content type="html">
39-
</content>
40-
</entry>
41-
42-
<entry>
43-
<title>Big Red Hacks</title>
44-
<link href="http://localhost:4000/events/2014/09/26/Big-Red-Hacks.html"/>
45-
<updated>2014-09-26T00:00:00-04:00</updated>
46-
<id>http://localhost:4000/events/2014/09/26/Big-Red-Hacks</id>
47-
<content type="html">
48-
</content>
49-
</entry>
50-
51-
<entry>
52-
<title>Welcome</title>
53-
<link href="http://localhost:4000/2014/04/30/Welcome-codeRIT.html"/>
54-
<updated>2014-04-30T00:00:00-04:00</updated>
55-
<id>http://localhost:4000/2014/04/30/Welcome-codeRIT</id>
56-
<content type="html">&lt;p&gt;codeRIT represents a coalition of 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&lt;/p&gt;
57-
58-
&lt;p&gt;Video that was used to make this awesome site.&lt;br /&gt;&lt;/p&gt;
59-
&lt;iframe width=&quot;560&quot; height=&quot;315&quot; src=&quot;//www.youtube.com/embed/HlGcXcdwJqk&quot; frameborder=&quot;0&quot; allowfullscreen=&quot;&quot;&gt;&lt;/iframe&gt;
60-
61-
</content>
62-
</entry>
63-
6415

6516
</feed>

‎_site/clayhack.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<body>
2424
<div class="banner-clayhack welcome">
2525
<div class="inner container">
26-
<img class="logo" src="/assets/images/clayhack_logo.svg" alt="codeRIT" title="codeRIT" />
26+
<img class="logo" src="/assets/images/clayhack/clayhack_logo.svg" alt="codeRIT" title="codeRIT" />
2727
<p>RIT's first ever new student hackathon.</p>
2828
<p>August 24, 2018</p>
2929
<a id="learn-more" href="#about" class="button scroll-to">LEARN MORE</a>
@@ -66,9 +66,10 @@ <h3 class="center">EVENT SCHEDULE</h3>
6666
<div class="col">
6767
<div id="event-list-cta">
6868
<div class="center">
69-
<img class="loader" src="assets/css/loader.gif" />
69+
<img class="loader" src="assets/images/loader.gif" />
7070
</div>
7171
</div>
72+
7273
</div>
7374
<div class="col center">
7475
<h4>BrickHack V</h4>
@@ -112,12 +113,12 @@ <h2 class="title-clayhack-contact">GET IN TOUCH</h2>
112113

113114
<footer id="footer-clayhack">
114115
<div class="inner container">
115-
<p>&copy; codeRIT 2018 All Rights Reserved</p>
116+
<p>&copy; codeRIT 2019 All Rights Reserved</p>
116117
</div>
117118
</footer>
118119
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
119120
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.3/moment.min.js"></script>
120-
<script type="text/javascript" src="/assets/scripts/main.js"></script>
121+
<script type="text/javascript" src="/assets/scripts/main_clayhack.js"></script>
121122
<script>function GAPILoad(){Events.init();}</script>
122123
<script src="https://apis.google.com/js/client.js?onload=GAPILoad"></script>
123124

‎_site/events/2014/09/26/Big-Red-Hacks.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎_site/events/2014/10/03/Hack-MIT.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎_site/events/2014/10/31/Y-Hack.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎_site/events/2017/09/12/Meeting-1.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎_site/index.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,17 @@
2222
<body>
2323
<div class="banner welcome">
2424
<div class="inner container">
25-
<img class="logo" src="/assets/images/coderit_logo2.svg" alt="codeRIT" title="codeRIT" />
25+
<img class="logo" src="/assets/images/coderit/coderit_logo.svg" alt="codeRIT" title="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">
3131
<h2 class="title">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 newcommers, with the tools and knowledge neccessary to become succesful makers.</p>
34-
<p class="center"><a href="http://eepurl.com/bwy-a1" class="button orange">Sign up for our mailing list<span class="fa fa-arrow-right icon-space-l"></span></a></p>
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>
34+
<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>
35+
<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>
3536
<hr/>
3637
<div class="col center badge-cta">
3738
<i class="fa fa-book fa-5x badge-icon"></i>
@@ -59,9 +60,10 @@ <h3 class="center">EVENT SCHEDULE</h3>
5960
<div class="col">
6061
<div id="event-list-cta">
6162
<div class="center">
62-
<img class="loader" src="assets/css/loader.gif" />
63+
<img class="loader" src="assets/images/loader.gif" />
6364
</div>
6465
</div>
66+
6567
</div>
6668
<div class="col center">
6769
<h3>BrickHack V</h3>
@@ -114,7 +116,7 @@ <h2 class="title">GET IN TOUCH</h2>
114116

115117
<footer id="footer">
116118
<div class="inner container">
117-
<p>&copy; codeRIT 2018 All Rights Reserved</p>
119+
<p>&copy; codeRIT 2019 All Rights Reserved</p>
118120
</div>
119121
</footer>
120122
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>

‎assets/css/clayhack_background.afphoto

-32.9 KB
Binary file not shown.

‎assets/css/clayhack_background.png

-15.9 KB
Binary file not shown.

‎assets/css/clayhack_background_light.afphoto

-42.2 KB
Binary file not shown.

‎assets/css/clayhack_background_light.png

-15.6 KB
Binary file not shown.

‎assets/css/clayhack_background_light.svg

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎assets/css/clayhack_logo.png

-89.8 KB
Binary file not shown.

‎assets/css/clayhack_logo.svg

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎assets/css/coderit_background.png

-17.8 KB
Binary file not shown.

‎assets/css/coderit_background_light.png

-43 KB
Binary file not shown.

‎assets/css/loader.gif

-33.6 KB
Binary file not shown.

‎assets/css/main.sass

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ a
112112

113113
.banner
114114
background: $blue
115-
background: url('coderit_background.png') center center fixed
115+
background: url("../images/coderit/coderit_background.png") center center fixed
116116
box-sizing: border-box
117117
color: $white
118118
display: block
@@ -125,7 +125,7 @@ a
125125
right: 0
126126
// custom banners
127127
&.welcome
128-
background: url('coderit_background.png') center center fixed
128+
background: url("../images/coderit/coderit_background.png") center center fixed
129129
font-size: 1.25em
130130
height: 100%
131131
min-height: 350px
@@ -158,7 +158,7 @@ a
158158

159159
.banner-clayhack
160160
background: clay
161-
background: url('clayhack_background.png') center center fixed
161+
background: url("../images/clayhack/clayhack_background.png") center center fixed
162162
box-sizing: border-box
163163
color: $white
164164
display: block
@@ -171,7 +171,7 @@ a
171171
right: 0
172172
// custom banners
173173
&.welcome
174-
background: url('clayhack_background.png') center center fixed
174+
background: url("../images/clayhack/clayhack_background.png") center center fixed
175175
font-size: 1.25em
176176
height: 100%
177177
min-height: 350px
@@ -299,7 +299,7 @@ a
299299
width: 80%
300300

301301
#events
302-
background: url("coderit_background_light.png") center center fixed
302+
background: url("../images/coderit/coderit_background_light.png") center center fixed
303303
color: $grey-med
304304
padding-bottom: 100px
305305
padding-top: 100px
@@ -315,7 +315,7 @@ a
315315
width: 50%
316316

317317
#events-clayhack
318-
background: url("clayhack_background_light.png") center center fixed
318+
background: url("../images/clayhack/clayhack_background_light.png") center center fixed
319319
color: $grey-med
320320
padding-bottom: 100px
321321
padding-top: 100px

‎_site/assets/css/clayhack_background.png renamed to ‎assets/images/clayhack/clayhack_background.png

File renamed without changes.

‎_site/assets/images/clayhack_background_light.png renamed to ‎assets/images/clayhack/clayhack_background_light.png

File renamed without changes.

‎_site/assets/css/clayhack_background_light.svg renamed to ‎assets/images/clayhack/clayhack_background_light.svg

File renamed without changes.

‎_site/assets/css/clayhack_logo.png renamed to ‎assets/images/clayhack/clayhack_logo.png

File renamed without changes.

‎_site/assets/images/clayhack_logo.svg renamed to ‎assets/images/clayhack/clayhack_logo.svg

File renamed without changes.

‎assets/images/clayhack_background_light.png

-15.6 KB
Binary file not shown.

‎assets/images/clayhack_logo.svg

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎_site/assets/css/coderit_background.png renamed to ‎assets/images/coderit/coderit_background.png

File renamed without changes.

‎_site/assets/css/coderit_background_light.png renamed to ‎assets/images/coderit/coderit_background_light.png

File renamed without changes.

‎_site/assets/images/coderit_logo2.png renamed to ‎assets/images/coderit/coderit_logo.png

File renamed without changes.

‎_site/assets/images/coderit_logo2.svg renamed to ‎assets/images/coderit/coderit_logo.svg

File renamed without changes.

‎_site/assets/images/icon.png renamed to ‎assets/images/coderit/icon.png

File renamed without changes.

‎assets/images/coderit_logo2.png

-12.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)