Skip to content

Commit 1cda414

Browse files
sman591sman591
committed
Merge pull request #27 from codeRIT/calendar-fixes
Calendar improvements, icon fix
2 parents b2f6853 + d8615f9 commit 1cda414

File tree

5 files changed

+22
-6
lines changed

5 files changed

+22
-6
lines changed

‎_sass/main.sass

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ a
8484
&:hover
8585
background: $orange-light
8686
color: $white
87+
&.blue
88+
color: $blue-light
89+
border-color: $blue-light
90+
&:hover
91+
background: $blue-light
92+
color: $white
8793

8894
.banner
8995
background: $blue
@@ -379,4 +385,4 @@ a
379385
.inner
380386
padding: 10px 3px
381387
#event-list-cta
382-
width: auto
388+
width: auto

‎assets/css/main.css

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/images/icon.png

-6.65 KB
Loading

‎assets/scripts/main.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ var Events = {
1818
'path' : '/calendar/v3/calendars/coderit.public@gmail.com/events',
1919
'callback' : Events.displayEvents,
2020
'orderBy' : 'startTime',
21+
'params' : {
22+
'timeMin': (new Date()).toISOString(),
23+
},
2124
'singleEvents' : true
2225
});
2326
},
@@ -89,4 +92,4 @@ var Events = {
8992
$('.event-page-nav').on('click', Events.changeEventPage);
9093
$('#event-list').css('minHeight', $('#event-list').height());
9194
}
92-
}
95+
}

‎index.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@ <h3 class="center">EVENT SCHEDULE</h3>
4141
{% include events.html %}
4242
</div>
4343
<div class="col center">
44-
<h3>Brick Hack</h3>
45-
<h4>April 18-20th 2015</h4>
44+
<h3>BrickHack</h3>
45+
<h4>Returning for 2015-16</h4>
4646
<p>If you would like to be a part of RIT's history, we could use your help. Join one of our committees and help create something great.</p>
47-
<a class="button orange" href="mailto:carl@coderit.org">Get Involved</a>
47+
<a class="button orange" href="mailto:stuart@coderit.org">Get Involved</a>
48+
<a class="button orange" href="https://brickhack.io">BrickHack Website</a>
4849
</div>
4950
</div>
5051
</div>
@@ -103,7 +104,7 @@ <h2 class="title">GET IN TOUCH</h2>
103104
</span>
104105
Join our group.
105106
</a>
106-
<a href="mailto:carl@coderit.org" target="_blank" rel="nofollow">
107+
<a href="mailto:stuart@coderit.org" target="_blank" rel="nofollow">
107108
<span class="fa fa-stack">
108109
<i class="fa fa-circle-thin fa-stack-2x"></i>
109110
<i class="fa fa-envelope fa-stack-1x"></i>

0 commit comments

Comments
 (0)