Skip to content

Calendar improvements, icon fix #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 23, 2015
Merged

Calendar improvements, icon fix #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26f8a0a
Removed past events from events calendar
sman591 Jun 23, 2015
3c3beaf
Updated BrickHack info
sman591 Jun 23, 2015
09b052d
Added link to BrickHack website
sman591 Jun 23, 2015
4e09403
Updated director email
sman591 Jun 23, 2015
d8615f9
Replaced cactus logo with codeRIT logo
sman591 Jun 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion _sass/main.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ a
&:hover
background: $orange-light
color: $white
&.blue
color: $blue-light
border-color: $blue-light
&:hover
background: $blue-light
color: $white

.banner
background: $blue
Expand Down Expand Up @@ -379,4 +385,4 @@ a
.inner
padding: 10px 3px
#event-list-cta
width: auto
width: auto
6 changes: 6 additions & 0 deletions assets/css/main.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified assets/images/icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion assets/scripts/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ var Events = {
'path' : '/calendar/v3/calendars/[email protected]/events',
'callback' : Events.displayEvents,
'orderBy' : 'startTime',
'params' : {
'timeMin': (new Date()).toISOString(),
},
'singleEvents' : true
});
},
Expand Down Expand Up @@ -89,4 +92,4 @@ var Events = {
$('.event-page-nav').on('click', Events.changeEventPage);
$('#event-list').css('minHeight', $('#event-list').height());
}
}
}
9 changes: 5 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ <h3 class="center">EVENT SCHEDULE</h3>
{% include events.html %}
</div>
<div class="col center">
<h3>Brick Hack</h3>
<h4>April 18-20th 2015</h4>
<h3>BrickHack</h3>
<h4>Returning for 2015-16</h4>
<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>
<a class="button orange" href="mailto:[email protected]">Get Involved</a>
<a class="button orange" href="mailto:[email protected]">Get Involved</a>
<a class="button orange" href="https://brickhack.io">BrickHack Website</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -103,7 +104,7 @@ <h2 class="title">GET IN TOUCH</h2>
</span>
Join our group.
</a>
<a href="mailto:carl@coderit.org" target="_blank" rel="nofollow">
<a href="mailto:stuart@coderit.org" target="_blank" rel="nofollow">
<span class="fa fa-stack">
<i class="fa fa-circle-thin fa-stack-2x"></i>
<i class="fa fa-envelope fa-stack-1x"></i>
Expand Down