Skip to content

Commit 15ad018

Browse files
cbaudouinjrcbaudouinjr
committed
Fixes color bugs
1 parent 9536a0a commit 15ad018

File tree

7 files changed

+37
-89
lines changed

7 files changed

+37
-89
lines changed

‎_site/assets/css/main.css

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -192,45 +192,30 @@ a {
192192
color: #444444;
193193
margin: 75px auto;
194194
width: 50%; }
195-
#about .paragraph {
195+
#about p {
196196
font-size: 1.125em;
197197
margin-left: 10%;
198198
text-align: center;
199199
padding-bottom: 10px;
200200
width: 80%; }
201201

202202
#events {
203-
background: url("../images/coderit/coderit_background_light.png") center center fixed;
204203
color: #505050;
205204
padding-bottom: 100px;
206205
padding-top: 100px; }
206+
#events .coderit {
207+
color: #F3852A; }
208+
#events .clayhack {
209+
color: #FFFFFF; }
207210
#events .inner {
208211
background: #FFFFFF;
209212
margin: 10px;
210213
padding: 50px; }
211-
#events h3 {
212-
color: #F3852A; }
213214
#events p {
214215
margin: 0 auto;
215216
text-align: center;
216217
width: 50%; }
217218

218-
#events-clayhack {
219-
background: url("../images/clayhack/clayhack_background_light.png") center center fixed;
220-
color: #505050;
221-
padding-bottom: 100px;
222-
padding-top: 100px; }
223-
#events-clayhack .inner {
224-
background: #FFFFFF;
225-
margin: 10px;
226-
padding: 50px; }
227-
#events-clayhack h3 {
228-
color: #F3852A; }
229-
#events-clayhack p {
230-
margin: 0 auto;
231-
text-align: center;
232-
width: 50%; }
233-
234219
#event-list-cta {
235220
margin: 0 auto 15px;
236221
width: 65%; }
@@ -322,14 +307,9 @@ a {
322307
width: 48%; }
323308

324309
#contact-links a {
325-
color: #CE5F15;
326-
display: block;
327-
margin-bottom: 10px; }
328-
329-
#contact-links-clayhack a {
330-
color: #FFFFFF;
331310
display: block;
332-
margin-bottom: 10px; }
311+
margin-bottom: 10px;
312+
color: #FFFFFF; }
333313

334314
#footer {
335315
background: #242f3a;
@@ -347,11 +327,6 @@ a {
347327
margin-top: 0;
348328
padding-top: 25px; }
349329

350-
#clayhack-page h3 {
351-
font-size: 2em;
352-
margin-top: 0px;
353-
color: #FFFFFF; }
354-
355330
@media screen and (max-width: 768px) {
356331
body {
357332
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-08T13:33:28-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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
<div id="about" class="section container">
3333
<h2 class="title clayhack">What is ClayHack?</h2>
3434
<div class="grid-cta three">
35-
<p class="paragraph">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>
3737
<h2 class="title clayhack">What is a hackathon?</h2>
38-
<p class="paragraph">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>
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>
3939
<h2 class="title clayhack">Does it cost money?</h2>
40-
<p class="paragraph">In the spirit of a hackathon, everything's free.</p>
40+
<p>In the spirit of a hackathon, everything's free.</p>
4141
<hr/>
4242
<div class="col center badge-cta">
4343
<i class="fa fa-book fa-5x badge-icon clayhack"></i>
@@ -56,9 +56,9 @@ <h3 class="badge-name">Creativity</h3>
5656
</div>
5757
</div>
5858
</div>
59-
<div id="events-clayhack" class="banner">
60-
<div class="section" id="clayhack-page">
61-
<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>
6262
<div class="container">
6363
<div class="inner">
6464
<div class="col-xs-12 center">
@@ -82,7 +82,7 @@ <h2 class="title">GET IN TOUCH</h2>
8282
1 Lomb Memorial Dr.<br/>
8383
Rochester, NY 14623
8484
</div>
85-
<div id="contact-links-clayhack" class="col">
85+
<div id="contact-links" class="col">
8686
<a href="http://eepurl.com/gjUR1r" target="_blank" rel="nofollow">
8787
<span class="fa fa-stack">
8888
<i class="fa fa-circle-thin fa-stack-2x"></i>

‎_site/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<div id="about" class="section container">
3131
<h2 class="title coderit">WHAT IS CODERIT?</h2>
3232
<div class="grid-cta three">
33-
<p class="paragraph">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/>
@@ -51,9 +51,9 @@ <h3 class="badge-name">Empowerment</h3>
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">

‎assets/css/main.sass

Lines changed: 9 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -223,44 +223,30 @@ a
223223
color: $grey-dark
224224
margin: 75px auto
225225
width: 50%
226-
.paragraph
226+
p
227227
font-size: 1.125em
228228
margin-left: 10%
229229
text-align: center
230230
padding-bottom: 10px
231231
width: 80%
232232

233233
#events
234-
background: url("../images/coderit/coderit_background_light.png") center center fixed
235234
color: $grey-med
236235
padding-bottom: 100px
237236
padding-top: 100px
237+
.coderit
238+
color: $orange-light
239+
.clayhack
240+
color: $white
238241
.inner
239242
background: $white
240243
margin: 10px
241244
padding: 50px
242-
h3
243-
color: $orange-light
244245
p
245246
margin: 0 auto
246247
text-align: center
247248
width: 50%
248249

249-
#events-clayhack
250-
background: url("../images/clayhack/clayhack_background_light.png") center center fixed
251-
color: $grey-med
252-
padding-bottom: 100px
253-
padding-top: 100px
254-
.inner
255-
background: $white
256-
margin: 10px
257-
padding: 50px
258-
h3
259-
color: $orange-light
260-
p
261-
margin: 0 auto
262-
text-align: center
263-
width: 50%
264250
#event-list-cta
265251
margin: 0 auto 15px
266252
width: 65%
@@ -343,16 +329,10 @@ a
343329
vertical-align: middle
344330
width: 48%
345331
#contact-links
346-
a
347-
color: $orange-dark
348-
display: block
349-
margin-bottom: 10px
350-
351-
#contact-links-clayhack
352-
a
353-
color: $white
354-
display: block
355-
margin-bottom: 10px
332+
a
333+
display: block
334+
margin-bottom: 10px
335+
color: $white
356336

357337
#footer
358338
background: darken($blue, 10%)
@@ -371,13 +351,6 @@ a
371351
margin-top: 0
372352
padding-top: 25px
373353

374-
#clayhack-page
375-
h3
376-
font-size: 2em
377-
margin-top: 0px
378-
color: $white
379-
380-
381354
@media screen and (max-width: 768px)
382355
body
383356
font-size: 14px

‎clayhack.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
<div id="about" class="section container">
1515
<h2 class="title clayhack">What is ClayHack?</h2>
1616
<div class="grid-cta three">
17-
<p class="paragraph">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>
17+
<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>
1818
<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>
1919
<h2 class="title clayhack">What is a hackathon?</h2>
20-
<p class="paragraph">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>
20+
<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>
2121
<h2 class="title clayhack">Does it cost money?</h2>
22-
<p class="paragraph">In the spirit of a hackathon, everything's free.</p>
22+
<p>In the spirit of a hackathon, everything's free.</p>
2323
<hr/>
2424
<div class="col center badge-cta">
2525
<i class="fa fa-book fa-5x badge-icon clayhack"></i>
@@ -38,9 +38,9 @@ <h3 class="badge-name">Creativity</h3>
3838
</div>
3939
</div>
4040
</div>
41-
<div id="events-clayhack" class="banner">
42-
<div class="section" id="clayhack-page">
43-
<h3 class="center">EVENT SCHEDULE</h3>
41+
<div id="events" class="banner clayhack">
42+
<div class="section">
43+
<h3 class="center clayhack">EVENT SCHEDULE</h3>
4444
<div class="container">
4545
<div class="inner">
4646
<div class="col-xs-12 center">
@@ -59,7 +59,7 @@ <h2 class="title">GET IN TOUCH</h2>
5959
1 Lomb Memorial Dr.<br/>
6060
Rochester, NY 14623
6161
</div>
62-
<div id="contact-links-clayhack" class="col">
62+
<div id="contact-links" class="col">
6363
<a href="http://eepurl.com/gjUR1r" target="_blank" rel="nofollow">
6464
<span class="fa fa-stack">
6565
<i class="fa fa-circle-thin fa-stack-2x"></i>

‎index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<div id="about" class="section container">
1313
<h2 class="title coderit">WHAT IS CODERIT?</h2>
1414
<div class="grid-cta three">
15-
<p class="paragraph">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>
15+
<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>
1616
<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>
1717
<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>
1818
<hr/>
@@ -33,9 +33,9 @@ <h3 class="badge-name">Empowerment</h3>
3333
</div>
3434
</div>
3535
</div>
36-
<div id="events" class="banner">
36+
<div id="events" class="banner coderit">
3737
<div class="section">
38-
<h3 class="center">EVENT SCHEDULE</h3>
38+
<h3 class="center coderit">EVENT SCHEDULE</h3>
3939
<div class="container">
4040
<div class="inner">
4141
<div class="grid-cta two">

0 commit comments

Comments
 (0)