Skip to content

Commit

Permalink
Merge pull request #189 from hugovk/add-pillow
Browse files Browse the repository at this point in the history
Add Pillow
  • Loading branch information
takluyver committed Apr 4, 2019
2 parents e1f34be + 1214bfa commit 83b1f76
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 16 deletions.
1 change: 1 addition & 0 deletions _sections/30-projects.md
Expand Up @@ -19,6 +19,7 @@ These projects pledge to drop Python 2 support in or before 2020.
- [![](assets/kivy.png)Kivy](https://kivy.org/)
- [![](assets/matplotlib.png)Matplotlib](https://matplotlib.org/)
- [![](assets/numpylogoicon.svg)NumPy](https://www.numpy.org/)
- [![](assets/pillow.png)Pillow](https://github.com/python-pillow/Pillow)
- [![](assets/scipyshiny_small.png)SciPy](https://www.scipy.org/)
- [![](assets/ccxt.png)ccxt](https://github.com/ccxt/ccxt)
- [![](assets/zulip.png)Zulip](https://zulip.org)
Expand Down
Binary file added assets/pillow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 20 additions & 16 deletions site.js
Expand Up @@ -26,18 +26,18 @@ $.extend($.easing,
navItems = this;

//attatch click listeners
navItems.on('click', function(event){
event.preventDefault();
navItems.on('click', function(event){
event.preventDefault();
var navID = $(this).attr("href").substring(1);
disableScrollFn = true;
activateNav(navID);
populateDestinations(); //recalculate these!
$('html,body').animate({scrollTop: sections[navID] - settings.scrollToOffset},
$('html,body').animate({scrollTop: sections[navID] - settings.scrollToOffset},
settings.scrollSpeed, "easeInOutExpo", function(){
disableScrollFn = false;
}
);
});
});

//populate lookup of clicable elements and destination sections
populateDestinations(); //should also be run on browser resize, btw
Expand Down Expand Up @@ -75,21 +75,21 @@ $(document).ready(function (){
$('nav li a').navScroller();

//section divider icon click gently scrolls to reveal the section
$(".sectiondivider").on('click', function(event) {
$('html,body').animate({scrollTop: $(event.target.parentNode).offset().top - 50}, 400, "linear");
});
$(".sectiondivider").on('click', function(event) {
$('html,body').animate({scrollTop: $(event.target.parentNode).offset().top - 50}, 400, "linear");
});

//links going to other sections nicely scroll
$(".container a").each(function(){
$(".container a").each(function(){
if ($(this).attr("href").charAt(0) == '#'){
$(this).on('click', function(event) {
event.preventDefault();
event.preventDefault();
var target = $(event.target).closest("a");
var targetHight = $(target.attr("href")).offset().top
$('html,body').animate({scrollTop: targetHight - 170}, 800, "easeInOutExpo");
$('html,body').animate({scrollTop: targetHight - 170}, 800, "easeInOutExpo");
});
}
});
});

// DOM element where the Timeline will be attached
var container = document.getElementById('visualization');
Expand Down Expand Up @@ -137,6 +137,10 @@ $(document).ready(function (){
{content: 'Py 2 bug fix', start: '2019-01-01', end:'2019-12-31', py2:true},
{content: 'Py 3 full', start: '2019-01-01', end:'2021-12-16'},
],
'Pillow':[
{content: 'Python 2 & 3', start: '2013-03-15', end:'2019-12-31', py2:true},
{content: 'Python 3 only', start: '2020-01-01', end:'2023-12-31'},
],
'Scipy':[
{content: 'Py 2 & 3 full', start: '2010-08-31', end:'2018-12-31', py2:true},
{content: 'Py 2 bug fix', start: '2019-01-01', end:'2019-12-31', py2:true},
Expand Down Expand Up @@ -208,13 +212,13 @@ $(document).ready(function (){
{content: '2.9.x', start: '2017-07-14', end:'2018-07-14'},
],
'FEniCS':[
{content: '2017.1.0', start: '2017-05-12', end: '2017-12-31', py2:true},
{content: '2018.1.0', start: '2018-01-01', end: '2018-06-01'}
{content: '2017.1.0', start: '2017-05-12', end: '2017-12-31', py2:true},
{content: '2018.1.0', start: '2018-01-01', end: '2018-06-01'}
],
'RDKit':[
{content: '2014.9.1 - 2019.03.1', start: '2014-09-1', end: '2019-09-1', py2:true},
{content: '2019.9.1 -' , start: '2019-09-01', end: '2021-03-01'}
],
{content: '2014.9.1 - 2019.03.1', start: '2014-09-1', end: '2019-09-1', py2:true},
{content: '2019.9.1 -' , start: '2019-09-01', end: '2021-03-01'}
],
'Toyplot':[
{content: 'Python 2 & 3', start: '2014-11-05', end:'2018-12-31', py2:true},
{content: 'Python 3 only', start: '2019-01-01', end:'2021-12-31'},
Expand Down

0 comments on commit 83b1f76

Please sign in to comment.