Skip to content

Commit f01018e

Browse files
nateperrynateperry
committed
Merge pull request #11 from codeRIT/feature/redesign
Feature/redesign
2 parents 1f54c8f + d98e988 commit f01018e

File tree

12 files changed

+514
-145
lines changed

12 files changed

+514
-145
lines changed

‎_config.yml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
11
# Dependencies
22
markdown: redcarpet
3-
pygments: false
4-
5-
# Permalinks
6-
permalink: /blog/:title
3+
highliter: pygments
74

85
# Setup
96
title: codeRIT
10-
tagline: 'codeRIT'
11-
description: '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.'
127
url: http://coderit.org
8+
9+
committees:
10+
- name: Logistics & Hospitality
11+
description: Our main goal is to make sure that everyone is comfortable and having during Brick Hack events. We are responsible for planning out many the many needs of the event, such as locations, events, venue setup, food, and many other important event amenities.
12+
image: http://placehold.it/150
13+
14+
- name: Marketing & Design
15+
description: Our team is in charge of the branding of our organization by creatings logos, building and managing websites, getting swag to hand out, and handling all of our social media efforts. We also handle advertising our events to help increase the number of attendees.
16+
image: http://placehold.it/150
17+
18+
- name: Director
19+
description: Communicates all organization ongoings with each committee as well as with administration.
20+
image: http://placehold.it/150
21+
22+
- name: Sponsorship
23+
description: We reach out to some of the best companies in the world to come to and sponsor our events. Without the financial support from these different companies, none of our events could take place.
24+
image: http://placehold.it/150
25+
26+
- name: Travel & Outreach
27+
description: We communicate with other schools to learn how make our own organization better. By networking with other schools, we open more opportunities to attend their events and for them to attend ours.
28+
image: http://placehold.it/150

‎_includes/events.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<ul class="event-list">
2+
{% for post in site.categories.events order:asc %}
3+
<li class="event">
4+
<h4 class="event-title">{{ post.title }}</h4>
5+
<ul class="event-info">
6+
<li><i class="fa fa-calendar-o"></i>{{ post.date | date: "%b %-d %Y"}}
7+
{% if post.time %}<li><i class="fa fa-clock-o"></i>{{ post.time }}{% endif %}
8+
<li><i class="fa fa-map-marker"></i>{{ post.location }}
9+
</ul>
10+
</li>
11+
{% endfor %}
12+
</ul>

‎_includes/foot.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<footer id="footer" class="banner">
1+
<footer id="footer">
22
<div class="inner container">
33
<p>&copy;codeRIT 2014 All Rights Reserved</p>
44
</div>

‎_sass/main.sass

Lines changed: 182 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
/* Main.sass */
22

3+
@import '_mixins'
4+
35
// general colors
46
$yellow : #FEE375
5-
$white : #ECF0F1
6-
$grey-light : darken($white, 8%)
7+
$white : #FFFFFF
8+
$grey-med : #505050
79
$grey-dark : #444444
810
// logo colors
9-
$orange-light : #F98728
11+
$orange-light : #F3852A
1012
$orange-med : #F36321
1113
$orange-dark : #CE5F15
1214
$blue : #384859
15+
$blue-light : #194774
1316
$offwhite : #FCF3E8
1417

1518
// fonts
1619
$font-body-family : 'Open Sans', sans-serif
1720
$font-headlines-family : 'Montserrat', sans-serif
18-
$font-headlines-weight-bold : 700
19-
$font-headlines-weight-reg : 400
21+
$font-bold : 700
22+
$font-reg : 400
2023

2124
// constants
2225
$footer-height: 90px
@@ -27,15 +30,16 @@ body, html
2730

2831
body
2932
background: $white
30-
color: $grey-dark
33+
color: $grey-med
3134
font-family: $font-body-family
3235
font-size: 16px
3336
margin: 0
3437
padding: 0
3538

3639
h1, h2, h3
3740
font-family: $font-headlines-family
38-
font-weight: $font-headlines-weight-reg
41+
font-weight: $font-reg
42+
margin-top: 0
3943
&.subtitle
4044
color: $white
4145
h1
@@ -61,8 +65,28 @@ a
6165
max-width: 1200px
6266
padding: 0 8px
6367

68+
.button
69+
border: 1px solid $white
70+
@include border-radius (8px)
71+
color: $white
72+
display: inline-block
73+
font-weight: $font-bold
74+
margin-top: 25px
75+
padding: 5px 25px 8px
76+
position: relative
77+
&:hover
78+
background: $white
79+
color: $blue
80+
&.orange
81+
color: $orange-light
82+
border-color: $orange-light
83+
&:hover
84+
background: $orange-light
85+
color: $white
86+
6487
.banner
6588
background: $blue
89+
background: url('coderit_background.png') center center fixed
6690
box-sizing: border-box
6791
color: $white
6892
display: block
@@ -73,31 +97,30 @@ a
7397
.inner
7498
left: 0
7599
right: 0
76-
h1
77-
color: $orange-light
78100
// custom banners
79101
&.welcome
80102
background: url('coderit_background.png') center center fixed
103+
font-size: 1.25em
104+
height: 100%
105+
min-height: 200px
81106
padding: 60px 0 80px
82107
text-align: center
83-
84-
.divider
85-
background: darken($blue, 10%)
86-
height: 25px
87-
margin: 0
88-
89-
.button
90-
background: lighten($blue, 8%)
91-
border: 2px solid darken($blue, 8%)
92-
color: $white
93-
display: inline-block
94-
padding: 5px 10px
95-
text-decoration: none
96-
&:hover
97-
background: lighten($blue, 12%)
98-
color: $white
99-
&.large
100-
font-size: 1.25em
108+
.logo
109+
margin-bottom: 25px
110+
max-width: 60%
111+
#learn-more
112+
&:after
113+
border-color: $white transparent transparent transparent
114+
border-style: solid
115+
border-width: 12px
116+
content: ''
117+
display: block
118+
height: 0
119+
left: 50%
120+
position: absolute
121+
top: 150%
122+
transform: translateX(-50%)
123+
width: 0
101124

102125
.text-large
103126
font-size: 2em
@@ -110,6 +133,8 @@ a
110133
box-sizing: border-box
111134
float: left
112135
padding-right: 35px
136+
&:last-child
137+
padding-right: 0
113138
&.two
114139
.col
115140
width: 50%
@@ -130,37 +155,131 @@ a
130155
height: 100%
131156
margin-bottom: -$footer-height
132157

158+
.title
159+
color: $orange-light
160+
text-align: center
161+
133162
// SECTIONS
134-
#mission
135-
color: $grey-dark
136-
padding: 25px 0
163+
.section
164+
padding: 90px 0
165+
.title
166+
margin-bottom: 110px
137167

138-
#brickhack
139-
background: url("coderit_background.png") center center fixed
140-
text-align: center
141-
padding: 20px
142-
h1
143-
font-size: 5em
144-
margin-bottom: 0
145-
margin-top: 0
168+
#about
169+
.title
170+
margin-bottom: 110px
171+
.badge-cta
172+
.badge-icon
173+
@include border-radius (100%)
174+
border: 1px solid
175+
box-sizing: border-box
176+
color: $blue-light
177+
height: 150px
178+
padding: 30px
179+
width: 150px
180+
.badge-name
181+
margin-top: 30px
182+
hr
183+
background: $grey-dark
184+
border-color: $grey-dark
185+
color: $grey-dark
186+
margin: 75px auto
187+
width: 50%
188+
#mission
189+
font-size: 1.125em
190+
margin-left: 10%
191+
text-align: justify
192+
width: 80%
193+
194+
#events
195+
background: url("coderit_background_light.png") center center fixed
196+
color: $grey-med
197+
padding-bottom: 100px
198+
padding-top: 100px
199+
.inner
200+
background: $white
201+
margin: 10px
202+
padding: 50px
146203
h3
147-
font-size: 1.545em
204+
color: $orange-light
205+
p
206+
margin: 0 auto
207+
text-align: justify
208+
width: 50%
209+
.event-list
210+
list-style: none
211+
margin: 0 auto
212+
padding-left: 0
213+
width: 50%
214+
.event
215+
color: $blue-light
216+
margin-bottom: 10px
217+
.event-title
218+
font-size: 1.125em
219+
margin: 0 0 5px
220+
.event-info
221+
font-size: 0.875em
222+
list-style: none
223+
padding: 0
224+
.fa
225+
margin-right: 10px
226+
227+
#committees
228+
.committee
229+
box-sizing: border-box
230+
display: inline-block
231+
margin-bottom: 10px
232+
margin-left: -2px
233+
width: 49%
234+
.committee-img
235+
@include border-radius (100%)
236+
display: inline-block
237+
vertical-align: top
238+
width: 25%
239+
.committee-info
240+
display: inline-block
241+
margin-left: 1%
242+
vertical-align: top
243+
width: 70%
244+
.committee-desc
245+
text-align: justify
246+
.committee-name
247+
color: $orange-light
248+
margin: 0
249+
&.middle
250+
text-align: center
251+
transform: translateX(50%)
252+
.committee-img
253+
display: block
254+
margin: 0 auto
255+
&.right
256+
text-align: right
257+
.committee-info
258+
margin-left: 0
259+
margin-right: 1%
148260

149261
#contact
150-
background: $grey-light
151262
padding: 20px 0
152263
.fa
153264
margin-right: 10px
154265
vertical-align: middle
155-
&.fa-facebook-square
156-
font-size: 2em
157-
&.fa-envelope
158-
vertical-align: top
159-
font-size: 1.45em
266+
.grid-cta
267+
margin: 0 auto
268+
width: 50%
269+
.col
270+
display: inline-block
271+
float: none
272+
vertical-align: middle
273+
width: 48%
274+
#contact-links
275+
a
276+
display: block
277+
margin-bottom: 10px
160278

161279
#footer
162-
height: $footer-height
163-
border-bottom: 25px solid darken($blue, 10%)
280+
background: darken($blue, 10%)
281+
color: $white
282+
padding: 3px 0
164283
text-align: center
165284

166285
#error-page
@@ -177,4 +296,19 @@ a
177296
clear: both
178297
float: none !important
179298
margin-top: 8px
180-
width: 100% !important
299+
padding-right: 0
300+
width: 100% !important
301+
302+
#about
303+
.badge-cta
304+
margin-bottom: 40px
305+
.badge-name
306+
margin: 0
307+
308+
#events
309+
.inner
310+
padding: 20px 10px
311+
p
312+
width: auto
313+
.event-list
314+
width: 100%

‎assets/css/coderit_background_light.png

43 KB
Loading

0 commit comments

Comments
 (0)