Skip to content

Commit a446b85

Browse files
go-bearsgo-bears
authored
Merge pull request jupyter#4 from jupyter/master
update fork
2 parents b86357a + 5a6439d commit a446b85

29 files changed

+2201
-238
lines changed

‎.travis.yml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
language: ruby
2+
rvm:
3+
- 2.2
4+
5+
matrix:
6+
allow_failures:
7+
- rvm: 2.2
8+
9+
before_install:
10+
- nvm install node
11+
12+
install:
13+
- npm install -g csslint
14+
- bundle install
15+
16+
script:
17+
- bash .travis/cibuild
18+
- csslint _site/css/gallery.css
19+
- csslint _site/css/logo-nav.css
20+
- csslint _site/css/syntax.css
21+
22+
# branch whitelist, only for GitHub Pages
23+
24+
env:
25+
global:
26+
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer

‎.travis/cibuild

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
set -e # halt script on error
3+
4+
bundle exec jekyll build
5+
bundle exec htmlproofer ./_site

‎Gemfile

+6
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
source 'https://rubygems.org'
22
gem 'github-pages'
3+
gem "jekyll"
4+
gem "jekyll-redirect-from"
5+
gem "jekyll-paginate"
6+
gem "jekyll-sitemap"
7+
gem "jekyll-feed"
8+
gem "html-proofer"

‎README.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Jupyter's main website
22

3+
[![Build Status](https://travis-ci.org/jupyter/jupyter.github.io.svg?branch=master)](https://travis-ci.org/jupyter/jupyter.github.io)
4+
35
This is the source to [Jupyter.org](http://jupyter.org/).
46

57
# Build instruction.
@@ -11,7 +13,7 @@ what where.
1113
# Quick local testing
1214

1315
```
14-
$ gem install jekyll
16+
$ gem install jekyll kramdown github-pages
1517
```
1618

1719
cd into the root of this directory,
@@ -78,4 +80,11 @@ Add commit (and don't forget to add to `_data/nav.yml`
7880

7981
`navbar_gray: true` start the navbar with a grey background if you need it.
8082

83+
# Continuous Integration Testing on Travis
84+
85+
Travis will run and test:
86+
87+
- jekyll build
88+
- html-proofer
89+
- csslint
8190

‎_config.yml

+3
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ github_username: Jupyter
1212

1313
# Build settings
1414
markdown: kramdown
15+
highlighter: rouge
16+
17+
exclude: [vendor]

‎_data/nav.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ head:
77
url: http://jupyter.readthedocs.org/en/latest/index.html
88
- title: NBViewer
99
url: https://nbviewer.jupyter.org
10+
- Widgets
1011
- title: Blog
1112
url: https://blog.jupyter.org
1213
- Donate

‎_includes/footer.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@
3737
<script src="{{site.baseurl}}/js/scroll.js"></script>
3838
<script src="{{site.baseurl}}/js/architecture.js"></script>
3939
<script src="{{site.baseurl}}/js/simon.js"></script>
40-
<script src="{{site.baseurl}}/js/timeline/main.js"></script> <!-- Resource jQuery -->
41-
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
40+
<!-- <script src="{{site.baseurl}}/js/timeline/main.js"></script> <!-- Resource jQuery -->
41+
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>

‎_includes/header.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<span class="icon-bar"></span>
1111
</button>
1212
<a class="navbar-brand" href="{{site.baseurl}}/index.html">
13-
<img src="{{site.baseurl}}/assets/nav_logo.svg" style="height:45px;">
13+
<img src="{{site.baseurl}}/assets/nav_logo.svg" style="height:45px;" alt="Jupyter logo">
1414
</a>
1515
</div>
1616
<!-- Collect the nav links, forms, and other content for toggling -->

‎about.html

+100-112
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h1>About Project Jupyter</h1>
3838
<section>
3939
<div class="about-block">
4040
<div class="container">
41-
<img src="assets/community.svg" class="img-responsive">
41+
<img src="assets/community.svg" class="img-responsive" alt="community graphic with orange circle and network">
4242
<h2>Community</h2>
4343
<p class="supportparagraph" style="display:inline;">Our vibrant community empowers us to create an amazing platform. Dynamic developers, cutting edge scientists as well as everyday users work together to further Jupyter's best-in-class tools.</p>
4444
<p class="supportparagraph hidden-xs hidden-sm" style="display:inline;">Here is a dynamic visualization of our most recent contributors:</p>
@@ -47,110 +47,98 @@ <h2>Community</h2>
4747
<div id="visualization" class="hidden-xs hidden-sm">
4848
</div>
4949
<div id="visualization" class="hidden-md hidden-lg">
50-
<img src="assets/community-replace.png" class="img-responsive">
50+
<img src="assets/community-replace.png" class="img-responsive" alt="community graphic">
5151
<script>
5252

53-
//basic tuning parameters
54-
var width = 600,
55-
height = 500,
56-
radius = 15,
57-
distance = 70,
58-
gravity = .09,
59-
charge = -550;
60-
61-
//scale for icon classes
62-
var scale = new Array();
63-
scale["contributor"] = 1;
64-
scale["repo"] = 1.4;
65-
scale["center"] = 4.5;
66-
67-
//Whether to show label
68-
var showLabel = new Array();
69-
showLabel["contributor"] = true;
70-
showLabel["repo"] = true;
71-
showLabel["center"] = false;
72-
73-
var svg = d3.select("#visualization").append("svg")
74-
.attr("width", width)
75-
.attr("height", height);
76-
77-
var force = d3.layout.force()
78-
.gravity(gravity)
79-
.distance(function (d) {return d.value * distance})
80-
.charge(charge)
81-
.size([width, height]);
82-
83-
d3.json("graphData.json", function(error, json) {
84-
if (error) throw error;
85-
86-
force
87-
.nodes(json.nodes)
88-
.links(json.links)
89-
.start();
90-
91-
var link = svg.selectAll(".link")
92-
.data(json.links)
93-
.enter().append("line")
94-
.attr("class", function(d) {return "link" + d.value});
95-
96-
var node = svg.selectAll(".node")
97-
.data(json.nodes)
98-
.enter().append("g")
99-
.attr("class", "node")
100-
.call(force.drag);
101-
102-
svg.append("clipPath")
103-
.attr("id", "clipCircle-contributor")
104-
.append("circle")
105-
.attr("r", radius * scale["contributor"]);
106-
107-
//uncomment to enable circle clipping for repo icons
108-
/*
109-
svg.append("clipPath")
110-
.attr("id", "clipCircle-repo")
111-
.append("circle")
112-
.attr("r", radius * scale["repo"]);
113-
114-
svg.append("clipPath")
115-
.attr("id", "clipCircle-center")
116-
.append("circle")
117-
.attr("r", radius * scale["center"]);
118-
*/
119-
120-
node.append("svg:image")
121-
.attr("xlink:href", function(d) {return d.image;})
122-
.attr("x", function(d) {return -radius * scale[d.type]})
123-
.attr("y", function(d) {return -radius * scale[d.type]})
124-
.attr("width", function(d) {return radius * 2 * scale[d.type]})
125-
.attr("height", function(d) {return radius * 2 * scale[d.type]})
126-
.attr("clip-path", function(d) {return "url(#clipCircle-" + d.type + ")" });
127-
128-
node.append("text")
129-
.attr("dx", 20)
130-
.attr("dy", ".35em")
131-
.text(function(d) { return (showLabel[d.type]) ? d.name : ""});
132-
133-
force.on("tick", function() {
134-
node.attr("cx", function(d) { return d.x = Math.max(radius, Math.min(width - radius, d.x)); })
135-
.attr("cy", function(d) { return d.y = Math.max(radius, Math.min(height - radius, d.y)); });
136-
137-
link.attr("x1", function(d) { return d.source.x; })
138-
.attr("y1", function(d) { return d.source.y; })
139-
.attr("x2", function(d) { return d.target.x; })
140-
.attr("y2", function(d) { return d.target.y; });
141-
142-
node.attr("transform", function(d) { return "translate(" + d.x + "," + d.y + ")"; });
143-
});
144-
});
145-
146-
</script>
53+
//basic tuning parameters
54+
var width = 600,
55+
height = 500,
56+
radius = 15,
57+
distance = 70,
58+
gravity = .09,
59+
charge = -550;
60+
61+
//scale for icon classes
62+
var scale = new Array();
63+
scale["contributor"] = 1;
64+
scale["repo"] = 1.4;
65+
scale["center"] = 4.5;
66+
67+
//Whether to show label
68+
var showLabel = new Array();
69+
showLabel["contributor"] = true;
70+
showLabel["repo"] = true;
71+
showLabel["center"] = false;
72+
73+
var svg = d3.select("#visualization").append("svg")
74+
.attr("width", width)
75+
.attr("height", height);
76+
77+
var force = d3.layout.force()
78+
.gravity(gravity)
79+
.distance(function (d) {return d.value * distance})
80+
.charge(charge)
81+
.size([width, height]);
82+
83+
d3.json("graphData.json", function(error, json) {
84+
if (error) throw error;
85+
86+
force
87+
.nodes(json.nodes)
88+
.links(json.links)
89+
.start();
90+
91+
var link = svg.selectAll(".link")
92+
.data(json.links)
93+
.enter().append("line")
94+
.attr("class", function(d) {return "link" + d.value});
95+
96+
var node = svg.selectAll(".node")
97+
.data(json.nodes)
98+
.enter().append("g")
99+
.attr("class", "node")
100+
.call(force.drag);
101+
102+
svg.append("clipPath")
103+
.attr("id", "clipCircle-contributor")
104+
.append("circle")
105+
.attr("r", radius * scale["contributor"]);
106+
107+
node.append("svg:image")
108+
.attr("xlink:href", function(d) {return d.image;})
109+
.attr("x", function(d) {return -radius * scale[d.type]})
110+
.attr("y", function(d) {return -radius * scale[d.type]})
111+
.attr("width", function(d) {return radius * 2 * scale[d.type]})
112+
.attr("height", function(d) {return radius * 2 * scale[d.type]})
113+
.attr("clip-path", function(d) {return "url(#clipCircle-" + d.type + ")" });
114+
115+
node.append("text")
116+
.attr("dx", 20)
117+
.attr("dy", ".35em")
118+
.text(function(d) { return (showLabel[d.type]) ? d.name : ""});
119+
120+
force.on("tick", function() {
121+
node.attr("cx", function(d) { return d.x = Math.max(radius, Math.min(width - radius, d.x)); })
122+
.attr("cy", function(d) { return d.y = Math.max(radius, Math.min(height - radius, d.y)); });
123+
124+
link.attr("x1", function(d) { return d.source.x; })
125+
.attr("y1", function(d) { return d.source.y; })
126+
.attr("x2", function(d) { return d.target.x; })
127+
.attr("y2", function(d) { return d.target.y; });
128+
129+
node.attr("transform", function(d) { return "translate(" + d.x + "," + d.y + ")"; });
130+
});
131+
});
132+
133+
</script>
134+
</div>
147135
</div>
148136
</div>
149137
</section>
150138
<section>
151139
<div class="about-block steering-council gray">
152140
<div class="container">
153-
<img src="assets/steering.svg" class="img-responsive">
141+
<img src="assets/steering.svg" class="img-responsive" alt="steering committee icon">
154142
<h2>Steering Council</h2>
155143
<p class="supportparagraph">Our team is primarily led by 10 steering committee members who ultimately make the final decisions.</p>
156144
<div class="col-md-12">
@@ -205,38 +193,38 @@ <h2>Steering Council</h2>
205193
<section>
206194
<div class="about-block">
207195
<div class="container">
208-
<img src="assets/sponsors2.svg" class="img-responsive">
196+
<img src="assets/sponsors2.svg" class="img-responsive" alt="sponsors">
209197
<h2>Sponsors</h2>
210198
<p class="supportparagraph">Project Jupyter receives direct funding from the following foundations and companies:</p>
211-
<div class="col6"><a href="http://helmsleytrust.org"><img src="assets/helmsley.svg" class="customerLogo"></a></div>
212-
<div class="col6"><a href="http://www.sloan.org/"><img src="assets/alfred.svg" class="customerLogo"></a></div>
213-
<div class="col6"><a href="https://www.moore.org/"><img src="assets/moore.svg" class="customerLogo"></a></div>
214-
<div class="col6"><a href="https://www.google.com/"><img src="assets/google-color.svg" class="customerLogo"></a></div>
215-
<div class="col6"><a href="http://www.microsoft.com/"><img src="assets/microsoft-color.svg" class="customerLogo logo-fix"></a></div>
216-
<div class="col6"><a href="http://developer.rackspace.com/"><img src="assets/rackspace-color.svg" class="customerLogo logo-fix"></a></div>
217-
<div class="col6"><a href="https://www.fastly.com/"><img src="assets/fastly.svg" class="customerLogo"></a></div>
199+
<div class="col6"><a href="http://helmsleytrust.org"><img src="assets/helmsley.svg" class="customerLogo" alt="helmsley trust logo"></a></div>
200+
<div class="col6"><a href="http://www.sloan.org/"><img src="assets/alfred.svg" class="customerLogo" alt="sloan logo"></a></div>
201+
<div class="col6"><a href="https://www.moore.org/"><img src="assets/moore.svg" class="customerLogo" alt="moore foundation logo"></a></div>
202+
<div class="col6"><a href="https://www.google.com/"><img src="assets/google-color.svg" class="customerLogo" alt="google logo"></a></div>
203+
<div class="col6"><a href="http://www.microsoft.com/"><img src="assets/microsoft-color.svg" class="customerLogo logo-fix" alt="microsoft logo"></a></div>
204+
<div class="col6"><a href="http://developer.rackspace.com/"><img src="assets/rackspace-color.svg" class="customerLogo logo-fix" alt="rackspace logo"></a></div>
205+
<div class="col6"><a href="https://www.fastly.com/"><img src="assets/fastly.svg" class="customerLogo" alt="fastly logo"></a></div>
218206
</div>
219207
</div>
220208
</section>
221209
<section>
222210
<div class="about-block gray" id="institutional">
223211
<div class="container">
224-
<img src="assets/institutional_partners2.svg" class="img-responsive">
212+
<img src="assets/institutional_partners2.svg" class="img-responsive" alt="institutional partners">
225213
<h2>Institutional Partners</h2>
226214
<p class="supportparagraph">Institutional Partners are companies and universities that support the project by employing Steering Council members.
227215
Current Institutional Partners include:</p>
228-
<div class="col6"><a href="http://continuum.io/"><img src="assets/continuum-color.svg" class="customerLogo" height="60" width="200"></a></div>
229-
<div class="col6"><a href="http://www.bloomberg.com/"><img src="assets/bloomberg-color.svg" class="customerLogo logo-fix"></a></div>
230-
<div class="col6"><a href="http://developer.rackspace.com/"><img src="assets/rackspace-color.svg" class="customerLogo"></a></div>
231-
<div class="col6"><a href="http://www.calpoly.edu/"><img src="assets/poly-color.svg" class="customerLogo"></a></div>
232-
<div class="col6"><a href="http://www.berkeley.edu/"><img src="assets/berkeley-color.svg" class="customerLogo"></a></div>
216+
<div class="col6"><a href="http://continuum.io/"><img src="assets/continuum-color.svg" class="customerLogo" height="60" width="200" alt="continuum.io logo"></a></div>
217+
<div class="col6"><a href="http://www.bloomberg.com/"><img src="assets/bloomberg-color.svg" class="customerLogo logo-fix" alt="bloomberg logo"></a></div>
218+
<div class="col6"><a href="http://developer.rackspace.com/"><img src="assets/rackspace-color.svg" class="customerLogo" alt="rackspace logo"></a></div>
219+
<div class="col6"><a href="http://www.calpoly.edu/"><img src="assets/poly-color.svg" class="customerLogo" alt="cal poly logo"></a></div>
220+
<div class="col6"><a href="http://www.berkeley.edu/"><img src="assets/berkeley-color.svg" class="customerLogo" alt="UC Berkeley logo"></a></div>
233221
</div>
234222
</div>
235223
</section>
236224
<section>
237225
<div class="about-block institutional">
238226
<div class="container">
239-
<img src="assets/governance-icon2.svg" class="img-responsive" id="governance">
227+
<img src="assets/governance-icon2.svg" class="img-responsive" id="governance" alt="governance icon">
240228
<h2>Governance</h2>
241229
<p class="supportparagraph">Robust, community driven development with institutional backing.</p>
242230
<div class="menu col-md-12">

0 commit comments

Comments
 (0)