Skip to content

Commit e6ee237

Browse files
palewirepalewire
authored
Merge branch 'master' into simplify-about
2 parents ca61f53 + 70bf9f6 commit e6ee237

File tree

11 files changed

+99
-156
lines changed

11 files changed

+99
-156
lines changed

‎README.md

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -92,34 +92,7 @@ Here's an image of this box on a GitHub PR page:
9292

9393
## Structure of this website
9494

95-
Most pages are located at the place where their URL is, nothing fancy. Headers
96-
and footer are in `_includes/head.html`, `_includes/header.html`,
97-
`_includes/footer.html`.
98-
99-
The **navbar** is in `_data/nav.yml` and looks like that:
100-
101-
```yaml
102-
head:
103-
- Home
104-
- title: Install
105-
url: https://jupyter.readthedocs.io/en/latest/install.html
106-
- About
107-
- title: Documentation
108-
url: https://jupyter.readthedocs.io/en/latest/install.html
109-
- title: Blog
110-
url: https://blog.jupyter.org
111-
- Donate
112-
```
113-
114-
which means, insert in order the following links into the navbar:
115-
116-
- Link to `Home` page, guess the url by yourself.
117-
- link to `Install` page, the url is...
118-
- Link to `About`, guess the url by yourself,
119-
- ... etc.
120-
121-
The navbar will automatically target `_blank` pages where the url is explicit,
122-
and mark the correct link as the "current" one.
95+
Most pages are located at the place where their URL is, nothing fancy. Some are written in HTML. Others are written in Markdown. The homepage is in `index.html. The about page is in `about.md`.
12396

12497
## Create a new page
12598

‎_data/nav.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎_includes/footer.html

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎_includes/head.html

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎_includes/header.html

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎_layouts/default.html

Lines changed: 93 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,100 @@
1+
---
2+
nav:
3+
- title: Install
4+
url: /install
5+
- title: Get Involved
6+
url: /community
7+
- title: Documentation
8+
url: /documentation
9+
- title: News
10+
url: https://blog.jupyter.org
11+
newpage: true
12+
- title: Security
13+
url: /security
14+
- title: About
15+
url: /about
16+
---
117
<!DOCTYPE html>
218
<html lang="en">
3-
4-
{% include head.html %}
5-
19+
<head>
20+
<meta charset="utf-8">
21+
<meta name="viewport" content="width=device-width, initial-scale=1">
22+
<meta itemprop="description" name="description" content="{% if page.tagline %}{{ page.tagline }}{% else %}{{ site.description }}{% endif %}" />
23+
<title>{{ site.title }} {% if page.title %}| {{ page.title }}{% endif %}</title>
24+
<meta property="og:title" content="Project Jupyter" />
25+
<meta property="og:description" content="{{ site.description|strip_html }}">
26+
<meta property="og:url" content="{{ site.url }}" />
27+
<meta property="og:image" content="{{ "/assets/share.png" | prepend: site.url }}" />
28+
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
29+
<link rel="stylesheet" href="{{ "/assets/css/bootstrap.css" | prepend: site.baseurl }}">
30+
<link rel="stylesheet" href="{{ "/assets/css/main.css" | prepend: site.baseurl }}">
31+
<link rel="icon" type="image/png" href="favicon.ico" />
32+
<link href="{{ site.baseurl }}/assets/apple-touch-icon.png" rel="apple-touch-icon" />
33+
<link href="{{ site.baseurl }}/assets/apple-touch-icon-76x76.png" rel="apple-touch-icon" sizes="76x76" />
34+
<link href="{{ site.baseurl }}/assets/apple-touch-icon-120x120.png" rel="apple-touch-icon" sizes="120x120" />
35+
<link href="{{ site.baseurl }}/assets/apple-touch-icon-152x152.png" rel="apple-touch-icon" sizes="152x152" />
36+
<link href="{{ site.baseurl }}/assets/apple-touch-icon-180x180.png" rel="apple-touch-icon" sizes="180x180" />
37+
<link href="{{ site.baseurl }}/assets/icon-hires.png" rel="icon" sizes="192x192" />
38+
<link href="{{ site.baseurl }}/assets/icon-normal.png" rel="icon" sizes="128x128" />
39+
<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>
40+
</head>
641
<body>
7-
8-
{% include header.html %}
42+
<nav class="navbar navbar-fixed-top" role="navigation" id="navbar" >
43+
<div class="navbar-inner">
44+
<div class="container">
45+
<!-- Brand and toggle get grouped for better mobile display -->
46+
<div class="navbar-header">
47+
<button type="button" class="navbar-toggle" data-bs-toggle="collapse" data-bs-target="#bs-example-navbar-collapse-1">
48+
<span class="sr-only">Toggle navigation</span>
49+
{% if page.url == '/' or page.url == '/index.html' %}
50+
<span class="icon-bar white-icon-bar"></span>
51+
<span class="icon-bar white-icon-bar"></span>
52+
<span class="icon-bar white-icon-bar"></span>
53+
{% else %}
54+
<span class="icon-bar"></span>
55+
<span class="icon-bar"></span>
56+
<span class="icon-bar"></span>
57+
{% endif %}
58+
</button>
59+
<a class="navbar-brand" href="{{ site.baseurl }}/index.html">
60+
<img id="jupyter-nav-logo" class="navbar-logo" src="{{ site.baseurl }}/assets/nav_logo.svg" alt="Jupyter logo">
61+
</a>
62+
</div>
63+
<div class="blur"></div>
64+
<!-- Collect the nav links, forms, and other content for toggling -->
65+
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
66+
<ul class="nav navbar-nav navbar-right">
67+
{%- for nav in layout.nav -%}
68+
<li>
69+
<a href="{{nav.url}}"
70+
{%- if nav.newpage %}target="_blank" rel="noopener noreferrer"{% endif %}
71+
class="tab {% if nav.url == page.url %}navbar-active{% endif %}">
72+
{{nav.title}}
73+
</a>
74+
</li>
75+
{%- endfor %}
76+
</ul>
77+
</div>
78+
</div>
79+
</div>
80+
</nav>
981
<section>
10-
{{ content }}
82+
{{ content }}
1183
</section>
12-
13-
{% include footer.html %}
14-
84+
<footer>
85+
<div class="footer" role="navigation">
86+
<div class="container">
87+
<div class="navbar-text">
88+
<p>
89+
Copyright © {{site.time | date: '%Y' }} Project Jupyter
90+
</p>
91+
<p>
92+
The Jupyter Trademark is registered with the U.S. Patent & Trademark Office.
93+
</p>
94+
</div>
95+
</div>
96+
</div>
97+
</footer>
98+
<script src="{{site.baseurl}}/assets/js/bootstrap-native.min.js" defer></script>
1599
</body>
16-
17100
</html>

‎_layouts/markdown.html

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎_layouts/page.html

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎_sass/bootstrap/_index.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
@import "normalize"; // Baseline the site across browsers
1818
@import "basics"; // Basic layout tools
19-
@import "hyperlinks"; // <a> tags
2019
@import "images"; // <img> tags
2120
@import "sr"; // Screen reader adaptations
2221
@import "headlines"; // <h1>, <h2>, etc. tags

‎_sass/bootstrap/_hyperlinks.scss renamed to ‎_sass/components/_hyperlinks.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
@import "settings/colors";
2+
13
a {
2-
color: #337ab7;
4+
color: $orange;
35
text-decoration: none;
46
}
57
a:hover,
68
a:focus {
7-
color: #23527c;
9+
opacity: 0.8;
810
text-decoration: underline;
911
}
1012
a:focus {

‎assets/css/main.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
@import "gallery";
1111
@import "syntax";
1212
@import "components/logogrid";
13+
@import "components/hyperlinks";
1314
@import "components/footer";
1415
@import "components/jumbotron";
1516
@import "components/jupyterhub";

0 commit comments

Comments
 (0)