Skip to content

Commit

Permalink
Merge branch 'gh-pages' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ozasadnyy committed Nov 14, 2014
2 parents 481f19a + e95e3c7 commit 5ab4083
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion css/main.css

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions css/main.min.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions js/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@
var iframe = $(this).find('iframe');
iframe.attr('src', iframe.attr('src'));
});
$('.slot').click(function() {
location.hash = $(this).attr('id');
});


if (typeof twitterFeedUrl !== 'undefined') {
Expand Down
Loading

0 comments on commit 5ab4083

Please sign in to comment.