Skip to content

Commit 605a0b6

Browse files
cjermaincjermain
committed
Merge branch 'master' into pymeasure-update-0.6
2 parents e6b7bbb + 2a1313d commit 605a0b6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+7681
-45
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
_site/
2-
.DS_Store
2+
.DS_Store
3+
*.swo

‎COPYING.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
The logos of projects which have endorsed the statement are used with the
2+
permission of the projects they represent. They are not covered by any of the
3+
licenses granted by this project.
4+
5+
The project uses the [SinglePaged template](https://github.com/t413/SinglePaged),
6+
which is under the MIT license:
7+
8+
Copyright (c) 2014 Tim O'Brien (t413)
9+
10+
Permission is hereby granted, free of charge, to any person obtaining a copy
11+
of this software and associated documentation files (the "Software"), to deal
12+
in the Software without restriction, including without limitation the rights
13+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
14+
copies of the Software, and to permit persons to whom the Software is
15+
furnished to do so, subject to the following conditions:
16+
17+
The above copyright notice and this permission notice shall be included in all
18+
copies or substantial portions of the Software.
19+
20+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
23+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
25+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
26+
SOFTWARE.
27+
28+
Any example computer code created for this project is published under a
29+
[CC0 license](https://creativecommons.org/publicdomain/zero/1.0/), meaning it
30+
can be used with no conditions.
31+
32+
Content not mentioned above (principally the text of the website), is published
33+
under the [CC-BY license](https://creativecommons.org/licenses/by/4.0/).

‎Gemfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
source 'https://rubygems.org'
2+
gem 'github-pages'
3+
gem "jekyll"
4+
gem "jekyll-redirect-from"
5+
gem "jekyll-paginate"
6+
gem "jekyll-sitemap"
7+
gem "jekyll-feed"

‎_config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ markdown: kramdown
1414

1515

1616
### content configuration ###
17-
title: "Sunsetting Python 2 support in scientific Python projects"
17+
title: "Sunsetting Python 2 support"
1818
keywords: "Python 3, support, Jupyter, IPython, matplotlib, Python 2, Legacy Python"
19-
description: "Scientific Python projects will drop Python 2 support by 2020."
19+
description: "A pledge to drop Python 2 support by 2020."
2020
source_link: "https://github.com/python3statement/python3statement.github.io"
2121
favicon: #put a path like: "img/favicon.ico"
2222
touch_icon: #put a path like: "img/apple-touch-icon.png"
@@ -35,4 +35,5 @@ colors:
3535

3636
collections:
3737
- sections
38+
- practicalities
3839

‎_includes/css/base.css

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
================================================== */
5353
body {
5454
background: #fff;
55-
font: 14px/21px "Raleway", "HelveticaNeue-Light", Arial, sans-serif;
55+
font: 14px/21px "Raleway", "HelveticaNeue", Arial, sans-serif;
5656
color: #444;
5757
-webkit-font-smoothing: antialiased; /* Fix for webkit rendering */
5858
-webkit-text-size-adjust: 100%;
@@ -274,7 +274,16 @@
274274
width:90%;
275275
}
276276

277-
.highlight pre, .highlight code { display:block; margin:0; padding:0; background: none; overflow:auto; word-wrap: normal; }
277+
.highlight pre, .highlight code {
278+
display:block;
279+
margin:0;
280+
padding:0;
281+
background:
282+
none;
283+
overflow:auto;
284+
word-wrap: normal;
285+
white-space: pre;
286+
}
278287

279288
.highlight, .linenodiv {
280289
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQIHWPQ1dU1BgABzQC7XXMTYQAAAABJRU5ErkJggg==);

‎_includes/css/main.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ html { box-sizing: border-box; }
2525
#{{id}} .sectiondivider { color: {{ bg }}; }
2626
{% endfor %}
2727

28+
{% for node in site.practicalities %}
29+
{% capture id %}{{ node.id | remove:'/' | downcase }}{% endcapture %}
30+
{% capture bg %}{% if site.colors[node.bg] %}{{ site.colors[node.bg] }}{% else %}{{ node.bg }}{% endif %}{% endcapture %}
31+
{% capture fg %}{% if site.colors[node.color] %}{{ site.colors[node.color] }}{% else %}{{ node.color }}{% endif %}{% endcapture %}
32+
nav .p-{{id}} { border-color: {{ bg }}; }
33+
#{{id}} { background-color: {{ bg }} !important; color: {{ fg }}; }
34+
#{{id}} a { color: {{ fg }}; }
35+
#{{id}} .sectiondivider { color: {{ bg }}; }
36+
{% endfor %}
37+
2838

2939
/* ----- code, syntax highlighting, etc ----- */
3040

0 commit comments

Comments
 (0)