Skip to content

Commit 5158eab

Browse files
ellisonbgellisonbg
committed
Clean up usage of bootstrap grid system. Ouch!
1 parent 186f801 commit 5158eab

File tree

6 files changed

+208
-169
lines changed

6 files changed

+208
-169
lines changed

‎_includes/donate.html

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<div id="donate" class="about-section section-grey">
2+
3+
<div class="row">
4+
<img src="{{site.url}}/assets/donations-icon2.svg" class="section-icon img-responsive" alt="Donate">
5+
<h3 class="col-sm-12 section-header">Donate</h3>
6+
<p>
7+
Jupyter will always be 100% open source software, free for all
8+
to use and released under the liberal terms of the <a
9+
href="https://opensource.org/licenses/BSD-3-Clause">modified BSD
10+
license</a>. If you have found Project Jupyter to be useful in
11+
your work, research or company, please consider making a
12+
donation to the project commensurate with your resources.
13+
</p>
14+
<p>
15+
All donations will be used strictly to fund the development of
16+
Project Jupyter's open source software, documentation and
17+
community. Our donations are managed by the <a
18+
href="https://numfocus.org">NumFOCUS Foundation</a>, which is
19+
the legal and fiscal umbrella for the project.
20+
</p>
21+
<p>
22+
NumFOCUS is a 501(c)3 non-profit foundation; if you are subject to US Tax law,
23+
your contributions will be tax-deductible.
24+
</p>
25+
</div>
26+
27+
<div class="row">
28+
<div class="col-md-12">
29+
<a href="https://numfocus.org">
30+
<img id="numfocus-logo" src="{{site.url}}/assets/numfocus_logo.png" class="img-responsive center-block" alt="numfocus logo">
31+
</a>
32+
</div>
33+
</div>
34+
35+
<div class="row">
36+
<div id="col-md-12 donate-formatting">
37+
<a href="https://numfocus.salsalabs.org/donate-to-jupyter/index.html" class="orange-button" id="donate-link">
38+
Support Project Jupyter
39+
</a>
40+
</div>
41+
</div>
42+
43+
</div>

‎_includes/partners.html

+49-45
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,66 @@
1-
<div class="section-white" id="partners">
2-
<div class="row">
1+
<div id="partners" class="about-section section-white top-section-border">
2+
<div class="row section-header">
33
<img src="{{site.url}}/assets/institutional_partners2.svg" class="section-icon img-responsive" alt="institutional partners">
44
<h3 class="col-sm-12 section-header">Institutional Partners</h3>
55
<p class="col-sm-12 support-paragraph">
66
Institutional Partners are organizations that support the project by employing Jupyter Steering Council members.
77
Current Institutional Partners include:
88
</p>
9-
<div class="col-xs-12 section-center">
10-
<div class="col-sm-4 col-xs-6 sponsor">
11-
<a href="https://www.anaconda.com/">
12-
<img src="{{site.url}}/assets/anaconda-logo-colors.svg" class="company-logo" height="60" width="200" alt="anaconda inc logo">
13-
</a>
14-
</div>
15-
<div class="col-sm-4 col-xs-6 sponsor">
16-
<a href="https://www.bloomberg.com/">
17-
<img src="{{site.url}}/assets/bloomberg-color.svg" class="company-logo" alt="bloomberg logo">
18-
</a>
19-
</div>
20-
<div class="col-sm-4 col-xs-6 sponsor">
21-
<a href="https://techblog.netflix.com">
22-
<img src="{{site.url}}/assets/netflix-color.svg" class="company-logo" alt="netflix logo">
23-
</a>
24-
</div>
25-
<div class="col-sm-4 col-xs-6 sponsor">
9+
</div>
10+
<div class="row">
11+
<div class="col-sm-3 col-xs-6 sponsor">
12+
<a href="https://www.anaconda.com/">
13+
<img src="{{site.baseurl}}/assets/anaconda-logo-colors.svg" class="company-logo" height="60" width="200" alt="anaconda inc logo">
14+
</a>
15+
</div>
16+
<div class="col-sm-3 col-xs-6 sponsor">
17+
<a href="https://www.bloomberg.com/">
18+
<img src="{{site.baseurl}}/assets/bloomberg-color.svg" class="company-logo" alt="bloomberg logo">
19+
</a>
20+
</div>
21+
<div class="col-sm-3 col-xs-6 sponsor">
22+
<a href="https://techblog.netflix.com">
23+
<img src="{{site.baseurl}}/assets/netflix-color.svg" class="company-logo" alt="netflix logo">
24+
</a>
25+
</div>
26+
<div class="col-sm-3 col-xs-6 sponsor">
2627
<a href="https://www.calpoly.edu/">
2728
<img src="{{site.baseurl}}/assets/poly-color.svg" class="company-logo" alt="cal poly logo">
2829
</a>
29-
</div>
30-
<div class="col-sm-4 col-xs-6 sponsor">
31-
<a href="https://www.berkeley.edu/">
32-
<img src="{{site.baseurl}}/assets/berkeley-color.svg" class="company-logo" alt="UC Berkeley logo">
33-
</a>
34-
</div>
35-
<div class="col-sm-4 col-xs-6 sponsor ">
36-
<a href="https://quantstack.net/">
37-
<img src="{{site.baseurl}}/assets/quantstack-color.svg" class="company-logo" alt="QuantStack logo">
38-
</a>
39-
</div>
40-
<div class="col-sm-4 col-xs-6 sponsor ">
41-
<a href="https://www.jpmorganchase.com/">
42-
<img src="{{site.baseurl}}/assets/jpmc_logo.png" class="company-logo" alt="JPMorgan Chase logo">
43-
</a>
44-
</div>
45-
<div class="col-sm-4 col-xs-6 sponsor">
30+
</div>
31+
</div>
32+
<div class="row">
33+
<div class="col-sm-3 col-xs-6 sponsor">
34+
<a href="https://www.berkeley.edu/">
35+
<img src="{{site.baseurl}}/assets/berkeley-color.svg" class="company-logo" alt="UC Berkeley logo">
36+
</a>
37+
</div>
38+
<div class="col-sm-3 col-xs-6 sponsor ">
39+
<a href="https://quantstack.net/">
40+
<img src="{{site.baseurl}}/assets/quantstack-color.svg" class="company-logo" alt="QuantStack logo">
41+
</a>
42+
</div>
43+
<div class="col-sm-3 col-xs-6 sponsor">
4644
<a href="https://www.twosigma.com/">
4745
<img src="{{site.baseurl}}/assets/two-sigma.svg" class="company-logo" alt="Two Sigma logo">
4846
</a>
4947
</div>
50-
<div class="col-sm-4 col-xs-6 sponsor">
51-
<a href="https://www.ucmerced.edu">
52-
<img src="{{site.baseurl}}/assets/UC_Merced_logo.svg" class="company-logo" alt="UC Merced logo"/>
53-
</a>
54-
</div>
55-
<div class="col-sm-4 col-xs-6 sponsor">
56-
<a href="https://aws.amazon.com/">
57-
<img src="{{site.baseurl}}/assets/aws.svg" class="company-logo" alt="AWS logo"/>
48+
<div class="col-sm-3 col-xs-6 sponsor ">
49+
<a href="https://www.jpmorganchase.com/">
50+
<img src="{{site.baseurl}}/assets/jpmc_logo.png" class="company-logo" alt="JPMorgan Chase logo">
5851
</a>
59-
</div>
52+
</div>
53+
</div>
54+
<div class="row">
55+
<div class="col-sm-3 col-xs-6 sponsor">
56+
<a href="https://www.ucmerced.edu">
57+
<img src="{{site.baseurl}}/assets/UC_Merced_logo.svg" class="company-logo" alt="UC Merced logo"/>
58+
</a>
59+
</div>
60+
<div class="col-sm-3 col-xs-6 sponsor">
61+
<a href="https://aws.amazon.com/">
62+
<img src="{{site.baseurl}}/assets/aws.svg" class="company-logo" alt="AWS logo"/>
63+
</a>
6064
</div>
6165
</div>
6266
</div>

‎_includes/sponsors.html

+61-56
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,68 @@
1-
<div class="section-grey" id="sponsors">
1+
<div id="sponsors" class="about-section section-grey top-section-border">
2+
23
<div class="row">
34
<img src="{{site.url}}/assets/sponsors2.svg" class="section-icon img-responsive" alt="sponsors">
45
<h3 class="col-sm-12 section-header">Sponsors</h3>
56
<p class="col-sm-12 support-paragraph">Project Jupyter receives direct funding from the following sources:</p>
6-
<div class="col-xs-12 section-center">
7-
<div class="col-sm-3 col-xs-6 sponsor">
8-
<a href="https://helmsleytrust.org">
9-
<img src="{{site.url}}/assets/helmsley.svg" class="company-logo" alt="helmsley trust logo"/>
10-
</a>
11-
</div>
12-
<div class="col-sm-3 col-xs-6 sponsor">
13-
<a href="https://www.sloan.org/">
14-
<img src="{{site.url}}/assets/alfred.svg" class="company-logo" alt="sloan logo"/>
15-
</a>
16-
</div>
17-
<div class="col-sm-3 col-xs-6 sponsor">
18-
<a href="https://www.moore.org/">
19-
<img src="{{site.url}}/assets/moore.svg" class="company-logo" alt="moore foundation logo"/>
20-
</a>
21-
</div>
22-
<div class="col-sm-3 col-xs-6 sponsor">
23-
<a href="https://www.google.com/">
24-
<img src="{{site.url}}/assets/google-color.svg" class="company-logo" alt="google logo"/>
25-
</a>
26-
</div>
27-
</div>
28-
<div class="col-xs-12 section-center">
29-
<div class="col-sm-3 col-xs-6 sponsor">
30-
<a href="https://developer.rackspace.com/">
31-
<img src="{{site.url}}/assets/rackspace-color.svg" class="company-logo" alt="rackspace logo"/>
32-
</a>
33-
</div>
34-
<div class="col-sm-3 col-xs-6 sponsor">
35-
<a href="https://www.fastly.com/">
36-
<img src="{{site.url}}/assets/fastly.svg" class="company-logo" alt="fastly logo"/>
37-
</a>
38-
</div>
39-
<div class="col-sm-3 col-xs-6 sponsor">
40-
<a href="https://opendreamkit.org/">
41-
<img src="{{site.url}}/assets/EC-H2020.svg" class="company-logo" alt="EU logo"/>
42-
</a>
43-
</div>
44-
<div class="col-sm-3 col-xs-6 sponsor">
45-
<a href="https://www.microsoft.com/">
46-
<img src="{{site.url}}/assets/microsoft-color.svg" class="company-logo" alt="microsoft logo"/>
47-
</a>
48-
</div>
49-
</div>
50-
<div class="col-xs-12 section-center">
51-
<div class="col-sm-3 col-xs-6 sponsor">
52-
<a href="https://www.quansight.com/">
53-
<img src="{{site.baseurl}}/assets/quansight.svg" class="company-logo" alt="Quansight logo"/>
54-
</a>
55-
</div>
56-
<div class="col-sm-3 col-xs-6 sponsor">
57-
<a href="https://schmidtfutures.com/">
58-
<img src="{{site.baseurl}}/assets/schmidt.png" class="company-logo" alt="Schmidt logo"/>
59-
</a>
60-
</div>
7+
</div>
8+
9+
<div class="row">
10+
<div class="col-sm-3 col-xs-6 sponsor">
11+
<a href="https://helmsleytrust.org">
12+
<img src="{{site.url}}/assets/helmsley.svg" class="company-logo" alt="helmsley trust logo"/>
13+
</a>
14+
</div>
15+
<div class="col-sm-3 col-xs-6 sponsor">
16+
<a href="https://www.sloan.org/">
17+
<img src="{{site.url}}/assets/alfred.svg" class="company-logo" alt="sloan logo"/>
18+
</a>
19+
</div>
20+
<div class="col-sm-3 col-xs-6 sponsor">
21+
<a href="https://www.moore.org/">
22+
<img src="{{site.url}}/assets/moore.svg" class="company-logo" alt="moore foundation logo"/>
23+
</a>
24+
</div>
25+
<div class="col-sm-3 col-xs-6 sponsor">
26+
<a href="https://www.google.com/">
27+
<img src="{{site.url}}/assets/google-color.svg" class="company-logo" alt="google logo"/>
28+
</a>
29+
</div>
30+
</div>
31+
32+
<div class="row">
33+
<div class="col-sm-3 col-xs-6 sponsor">
34+
<a href="https://developer.rackspace.com/">
35+
<img src="{{site.url}}/assets/rackspace-color.svg" class="company-logo" alt="rackspace logo"/>
36+
</a>
37+
</div>
38+
<div class="col-sm-3 col-xs-6 sponsor">
39+
<a href="https://www.fastly.com/">
40+
<img src="{{site.url}}/assets/fastly.svg" class="company-logo" alt="fastly logo"/>
41+
</a>
42+
</div>
43+
<div class="col-sm-3 col-xs-6 sponsor">
44+
<a href="https://opendreamkit.org/">
45+
<img src="{{site.url}}/assets/EC-H2020.svg" class="company-logo" alt="EU logo"/>
46+
</a>
47+
</div>
48+
<div class="col-sm-3 col-xs-6 sponsor">
49+
<a href="https://www.microsoft.com/">
50+
<img src="{{site.url}}/assets/microsoft-color.svg" class="company-logo" alt="microsoft logo"/>
51+
</a>
52+
</div>
53+
</div>
54+
55+
<div class="row">
56+
<div class="col-sm-3 col-xs-6 sponsor">
57+
<a href="https://www.quansight.com/">
58+
<img src="{{site.url}}/assets/quansight.svg" class="company-logo" alt="Quansight logo"/>
59+
</a>
60+
</div>
61+
<div class="col-sm-3 col-xs-6 sponsor">
62+
<a href="https://schmidtfutures.com/">
63+
<img src="{{site.url}}/assets/schmidt.png" class="company-logo" alt="Schmidt logo"/>
64+
</a>
6165
</div>
6266
</div>
67+
6368
</div>

‎_includes/steering.html

+35-38
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,41 @@
1-
<div id="steering-council">
2-
<div class="section-white top-section-border">
3-
<div class="container">
4-
<div class="row">
5-
<img src="{{site.url}}/assets/steering.svg" class="section-icon img-responsive" alt="steering committee icon">
6-
<h3 class="col-sm-12 section-header">Steering Council</h3>
7-
<p class="col-sm-12 support-paragraph">
8-
The role of the Jupyter Steering Council is to ensure, through working with and serving the broader Jupyter community,
9-
the long-term well-being of the project, both technically and as a community. The Jupyter Steering Council currently consists
10-
of the following members (in alphabetical order).
11-
</p>
1+
<div id="steering-council" class="about-section section-white top-section-border">
122

3+
<div class="row">
4+
<img src="{{site.url}}/assets/steering.svg" class="section-icon img-responsive" alt="steering committee icon">
5+
<h3 class="col-sm-12 section-header">Steering Council</h3>
6+
<p class="col-sm-12">
7+
The role of the Jupyter Steering Council is to ensure, through working with and serving the broader Jupyter community,
8+
the long-term well-being of the project, both technically and as a community. The Jupyter Steering Council currently consists
9+
of the following members (in alphabetical order).
10+
</p>
11+
</div>
12+
<div class="row">
13+
{% assign sorted = page.steering | sort: "last" %}
14+
{% for member in sorted %}
15+
<div class="col-sm-3 col-xs-6 material section-content section-center">
16+
<img class="council-member-photo" alt="{{member.first}} {{member.last}}'s avatar picture" src='{{member.avatar}}' />
17+
<p class="card-header">{{member.first}} {{member.last}}</p>
18+
<p class="card-info">{{member.affiliation}}<br><a href="https://github.com/{{member.gh_handle}}" target="_blank"><em>@{{member.gh_handle}}</em></a> on GitHub</p>
19+
</div>
20+
{% endfor %}
21+
</div>
1322

23+
{% if page.retired_steering %}
24+
{% assign num = page.retired_steering | size %}
25+
<div class="row">
26+
<h3 class="col-sm-12 section-header">Retired Steering Council Member{% if num > 1 %}s{% endif %}</h3>
27+
</div>
28+
<div class="row">
29+
{% assign sorted = page.retired_steering | sort: "last" %}
30+
{% for member in sorted %}
31+
<div class="col-sm-3 col-xs-6 material">
32+
<img class="council-member-photo" alt="{{member.first}} {{member.last}}'s avatar picture" src='{{member.avatar}}' />
33+
<p class="card-header">{{member.first}} {{member.last}}</p>
34+
<p class="card-info">Member: {{member.dates}}<br>
35+
<a href="https://github.com/{{member.gh_handle}}" target="_blank"><em>@{{member.gh_handle}}</em></a> on GitHub</p>
1436
</div>
15-
</div>
37+
{% endfor %}
1638
</div>
17-
<div class="col-md-12 section-content section-center">
18-
{% assign sorted = page.steering | sort: "last" %}
19-
{% for member in sorted %}
20-
<div class="col-md-4 material">
21-
<img class="council-member-photo" alt="{{member.first}} {{member.last}}'s avatar picture" src='{{member.avatar}}' />
22-
<p class="card-header">{{member.first}} {{member.last}}</p>
23-
<p class="card-info">{{member.affiliation}}<br><a href="https://github.com/{{member.gh_handle}}" target="_blank"><em>@{{member.gh_handle}}</em></a> on GitHub</p>
24-
</div>
25-
{% endfor %}
26-
</div>
39+
{% endif %}
2740

28-
{% if page.retired_steering %}
29-
{% assign num = page.retired_steering | size %}
30-
<h3 class="col-sm-12 section-header">Retired Steering Council Member{% if num > 1 %}s{% endif %}</h3>
31-
<div class="col-md-12 section-content section-center">
32-
{% assign sorted = page.retired_steering | sort: "last" %}
33-
{% for member in sorted %}
34-
<div class="col-md-4 material">
35-
<img class="council-member-photo" alt="{{member.first}} {{member.last}}'s avatar picture" src='{{member.avatar}}' />
36-
<p class="card-header">{{member.first}} {{member.last}}</p>
37-
<p class="card-info">Member: {{member.dates}}<br>
38-
<a href="https://github.com/{{member.gh_handle}}" target="_blank"><em>@{{member.gh_handle}}</em></a> on GitHub</p>
39-
</div>
40-
{% endfor %}
41-
</div>
42-
<br class="clear" />
43-
{% endif %}
4441
</div>

‎about.md

+2-30
Original file line numberDiff line numberDiff line change
@@ -109,35 +109,7 @@ users and contributors to participate in the project with respect and safety.
109109
{% include steering.html %}
110110

111111
{% include sponsors.html %}
112-
{% include partners.html %}
113-
114-
<div class="section-grey top-section-border" markdown="1">
115-
116-
![]({{site.url}}/assets/donations-icon2.svg){:.section-icon}
117-
118-
{:.section-header}
119-
<h3>Donations</h3>
120112

121-
Jupyter will always be 100% open source software, free for all to use and
122-
released under the liberal terms of the [modified BSD license](https://opensource.org/licenses/BSD-3-Clause).
123-
If you have found Project Jupyter to be useful in your work, research or company, please consider making a donation to the project
124-
commensurate with your resources.
125-
126-
All donations will be used strictly to fund the development of Project Jupyter's open source software, documentation
127-
and community. Our donations are managed by the [NumFOCUS Foundation](https://numfocus.org), which is the
128-
legal and fiscal umbrella for the project.
129-
130-
NumFOCUS is a 501(c)3 non-profit foundation; if you are subject to US Tax law, your contributions will be tax-deductible.
131-
132-
</div>
113+
{% include partners.html %}
133114

134-
<div class="col-md-12 donate-box">
135-
<a href="https://numfocus.org">
136-
<img id="numfocus-logo" src="{{site.url}}/assets/numfocus_logo.png" class="img-responsive center-block" alt="numfocus logo">
137-
</a>
138-
<div id="donate-formatting">
139-
<a href="https://numfocus.salsalabs.org/donate-to-jupyter/index.html" class="orange-button" id="donate-link">
140-
Support Project Jupyter
141-
</a>
142-
</div>
143-
</div>
115+
{% include donate.html %}

0 commit comments

Comments
 (0)