Skip to content

Commit e97f5f8

Browse files
palewirepalewire
committed
Merge
2 parents f5753e8 + efbc57a commit e97f5f8

40 files changed

+209
-8218
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ Gemfile.lock
33
.DS_Store
44
.jekyll-metadata
55
vendor
6-
.bundle
6+
.bundle
7+
.sass-cache

‎_config.yml

+4
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ include: [".well-known"]
2020
plugins:
2121
- jekyll-redirect-from
2222
- jekyll-sitemap
23+
24+
sass:
25+
sass_dir: _sass
26+
style: compressed

‎_data/nav.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
head:
22
- title: Install
33
url: /install
4-
- About Us
4+
- title: About Us
5+
url: /about
56
- title: Get Involved
67
url: /community
78
- title: Events
89
url: /events
910
- title: Documentation
1011
url: https://jupyter.readthedocs.io/
1112
newpage: true
12-
- Widgets
13+
- title: Widgets
14+
url: /widgets
1315
- title: News
1416
url: https://blog.jupyter.org
1517
newpage: true

‎_includes/community_lists.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ <h3 class="resource-name">Jupyter for Research Facilities</h3>
7979
</div>
8080
<div class="col-md-8 resource-text">
8181
<h3 class="resource-name">Jupyter Gitter Chatroom</h3>
82-
<p class="resource-desc">A real-time chatroom, for general development related discussions.</p>
82+
<p class="resource-desc">A real-time chatroom, for general development related discussions. Many Jupyter subprojects have their own Gitter channels.</p>
8383
</div>
8484
<div class="col-md-2 resource-button">
8585
<a href="https://gitter.im/jupyter/jupyter">View</a>

‎_includes/head.html

+4-16
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,11 @@
77
<title>{{ site.title }} {% if page.title %}| {{ page.title }}{% endif %}</title>
88
<meta property="og:title" content="Project Jupyter" />
99
<meta property="og:description" content="{{ site.description|strip_html }}">
10-
<meta property="og:url" content="https://www.jupyter.org" />
11-
<meta property="og:image" content="https://jupyter.org/assets/homepage.png" />
10+
<meta property="og:url" content="{{ site.url }}" />
11+
<meta property="og:image" content="{{ "/assets/homepage.png" | prepend: site.url }}" />
1212
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
13-
<!-- Bootstrap Core CSS -->
14-
<link rel="stylesheet" href="{{ "/css/bootstrap.min.css" | prepend: site.baseurl }}">
15-
<link rel="stylesheet" href="{{ "/css/logo-nav.css" | prepend: site.baseurl }}?{{site.time | date: '%s%N'}}">
16-
<link rel="stylesheet" href="{{ "/css/cardlist.css" | prepend: site.baseurl }}">
17-
<link rel="stylesheet" href="{{ "/css/github-buttons.css" | prepend: site.baseurl }}">
18-
<link rel="stylesheet" href="{{ "/css/markdown_page.css" | prepend: site.baseurl }}">
19-
<link rel="stylesheet" href="{{ "/css/about.css" | prepend: site.baseurl }}">
13+
<link rel="stylesheet" href="{{ "/assets/css/bootstrap.css" | prepend: site.baseurl }}">
14+
<link rel="stylesheet" href="{{ "/assets/css/main.css" | prepend: site.baseurl }}">
2015
<link rel="icon" type="image/png" href="favicon.ico" />
2116
<link href="{{site.baseurl}}/assets/apple-touch-icon.png" rel="apple-touch-icon" />
2217
<link href="{{site.baseurl}}/assets/apple-touch-icon-76x76.png" rel="apple-touch-icon" sizes="76x76" />
@@ -25,12 +20,5 @@
2520
<link href="{{site.baseurl}}/assets/apple-touch-icon-180x180.png" rel="apple-touch-icon" sizes="180x180" />
2621
<link href="{{site.baseurl}}/assets/icon-hires.png" rel="icon" sizes="192x192" />
2722
<link href="{{site.baseurl}}/assets/icon-normal.png" rel="icon" sizes="128x128" />
28-
29-
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
30-
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
31-
<!--[if lt IE 9]>
32-
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
33-
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
34-
<![endif]-->
3523
<script>console.log('Welcome to Project Jupyter! Explore the various tools available and their corresponding documentation. If you are interested in contributing to the platform, please visit the community resources section at https://jupyter.org/community.html.')</script>
3624
</head>

‎_includes/header.html

+7-25
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,16 @@
2424
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
2525
<ul class="nav navbar-nav navbar-right">
2626
{%- for nav in site.data.nav.head -%}
27-
{%- if nav.url %}
28-
<li>
29-
{%- if nav.newpage %}
30-
<a href="{{site.baseurl}}{{nav.url}}" class="tab" target="_blank" rel="noopener noreferrer">{{nav.title}}</a>
31-
{%- else %}
32-
<a href="{{site.baseurl}}{{nav.url}}" class="tab">{{nav.title}}</a>
33-
{%- endif %}
34-
</li>
35-
{%- else -%}
36-
{%- for targetpage in site.pages %}
37-
{%- if nav contains targetpage.title -%}
38-
{%- if page.title == targetpage.title %}
39-
<li>
40-
<a href="{{site.baseurl}}{{targetpage.url}}" class="tab navbar-active">{{targetpage.title}}</a>
41-
</li>
42-
{%- else %}
43-
<li>
44-
<a href="{{site.baseurl}}{{targetpage.url}}" class="tab">{{targetpage.title}}</a>
45-
</li>
46-
{%- endif -%}
47-
{%- endif -%}
48-
{%- endfor -%}
49-
{%- endif -%}
27+
<li>
28+
<a href="{{nav.url}}"
29+
{%- if nav.newpage %}target="_blank" rel="noopener noreferrer"{% endif %}
30+
class="tab {% if nav.url == page.url %}navbar-active{% endif %}">
31+
{{nav.title}}
32+
</a>
33+
</li>
5034
{%- endfor %}
5135
</ul>
5236
</div>
53-
<!-- /.navbar-collapse -->
5437
</div>
55-
<!-- /.container -->
5638
</div>
5739
</nav>

‎css/about.css renamed to ‎_sass/_about.scss

File renamed without changes.

‎css/bootstrap.css renamed to ‎_sass/_bootstrap.scss

File renamed without changes.

‎css/cardlist.css renamed to ‎_sass/_cards.scss

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
.cardlist {
44
margin: 10px auto 20px auto;
5-
max-width: 980px;
5+
max-width: 930px;
66
}
77

88
.cardlist-col {
99
padding: 16px;
1010
}
1111

1212
.cardlist-card {
13-
width: 275px;
14-
min-height: 300px;
13+
min-height: 320px;
1514
background: white;
1615
box-shadow: 0 3px 6px rgba(0, 0, 0, .24);
1716
border-radius: 2px;
@@ -76,8 +75,8 @@ a.try-link:visited {
7675
}
7776

7877
/* try cards need to be a little taller */
79-
.cardlist-card.try-card {
80-
height: 320px;
78+
.cardlist-card.try-card {
79+
height: 340px;
8180
}
8281

8382
/* shrink-to-fit logos */

‎css/gallery.css renamed to ‎_sass/_gallery.scss

File renamed without changes.

‎css/github-buttons.css renamed to ‎_sass/_github.scss

File renamed without changes.

‎css/markdown_page.css renamed to ‎_sass/_markdown.scss

File renamed without changes.

‎css/logo-nav.css renamed to ‎_sass/_nav.scss

File renamed without changes.

‎css/syntax.css renamed to ‎_sass/_syntax.scss

File renamed without changes.

‎assets/NASA.svg

+1-3
Loading

‎assets/css/bootstrap.scss

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
# this ensures Jekyll reads the file to be transformed into CSS later
3+
# only Main files contain this front matter, not partials.
4+
---
5+
@import "bootstrap";

‎assets/css/main.scss

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
# this ensures Jekyll reads the file to be transformed into CSS later
3+
# only Main files contain this front matter, not partials.
4+
---
5+
@import "nav";
6+
@import "cards";
7+
@import "github";
8+
@import "markdown";
9+
@import "about";
10+
@import "gallery";
11+
@import "syntax";

‎assets/latimes.svg

+119
Loading

‎binder.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ permalink: /binder
1010

1111
The Binder project offers an easy place to share computing environments to everyone.
1212
It allows users to specify custom environments and share them with a single link.
13-
Use-cases involve workshops, scientific workflows and streamline sharing among teams.
13+
Use cases involve workshops, scientific workflows and streamline sharing among teams.
1414

15-
The Binder Project builds tools that reward best-practices in reproducible data
15+
The Binder Project builds tools that reward best practices in reproducible data
1616
science by utilizing community-developed standards for
17-
reproducibility. When repositories follow these best-practices and are hosted in
17+
reproducibility. When repositories follow these best practices and are hosted in
1818
an online repository, then Binder automatically builds a linkable environment anybody can access.
1919

2020

‎community.md

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ in these organizations:
3838
- [jupyter-widgets](https://github.com/jupyter-widgets)
3939
- [jupyter-server](https://github.com/jupyter-server)
4040
- [jupyter-xeus](https://github.com/jupyter-xeus)
41+
- [jupyter-lsp](https://github.com/jupyter-lsp)
4142
- [voila-dashboards](https://github.com/voila-dashboards)
4243
- [binder-examples](https://github.com/binder-examples)
4344
- [jupyter-resources](https://github.com/jupyter-resources)

‎css/bootstrap.min.css

-5
This file was deleted.

0 commit comments

Comments
 (0)