Skip to content

Commit 9df1fad

Browse files
bjohansebasbjohansebas
committed
Merge branch 'gh-pages' of github.com:expressjs/expressjs.com into svg-themes
2 parents eea806c + 52c111d commit 9df1fad

Some content is hidden

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

70 files changed

+357
-803
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ help: ## This help
1616

1717
serve: ## Local server
1818
@echo "${BLUE}Starting expressjs.com at http://localhost:4000${RESET}"
19-
docker run -p 4000:4000 -p 35729:35729 -v $(DIR):/usr/src/app expressjs.com bundle exec jekyll serve --host 0.0.0.0
19+
docker run -p 4000:4000 -p 35729:35729 -v $(DIR):/usr/src/app expressjs.com bundle exec jekyll serve --host 0.0.0.0 --incremental
2020

2121
build: ## Build site
2222
@echo "${BLUE}Building site...${RESET}"

‎_data/en/general.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
title_announcement: "Express 5.0 documentation is now available."
2+
body_announcement: "The <a href='{{ page.lang }}/5x/api.html'>API documentation</a> is a work in progress. For information on what's in the release, see the Express <a href='https://github.com/expressjs/express/blob/5.0/History.md'>release history</a>"

‎_includes/announcement.html

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ul>
2+
<li>
3+
<p class="announcement-title">{% include icons/announcement.svg %} {{ site.data[page.lang].general.title_announcement }}</p>
4+
<p markdown="1">
5+
{{ site.data[page.lang].general.body_announcement }}
6+
</p>
7+
</li>
8+
</ul>
9+

‎_includes/announcement/announcement-de.md

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

‎_includes/announcement/announcement-en.md

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

‎_includes/announcement/announcement-es.md

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

‎_includes/announcement/announcement-fr.md

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

‎_includes/announcement/announcement-id.md

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

‎_includes/announcement/announcement-it.md

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

‎_includes/announcement/announcement-ja.md

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

‎_includes/announcement/announcement-ko.md

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

‎_includes/announcement/announcement-pt-br.md

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

‎_includes/announcement/announcement-ru.md

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

‎_includes/announcement/announcement-sk.md

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

‎_includes/announcement/announcement-th.md

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

‎_includes/announcement/announcement-tr.md

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

‎_includes/announcement/announcement-uk.md

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

‎_includes/announcement/announcement-uz.md

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

‎_includes/announcement/announcement-zh-cn.md

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

‎_includes/announcement/announcement-zh-tw.md

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

‎_includes/api/en/4x/res-type.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ res.type('application/json')
1414
res.type('png')
1515
// => 'image/png'
1616
```
17+
18+
Aliased as `res.contentType(type)`.

‎_includes/api/en/5x/res-type.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<h3 id='res.type'>res.type(type)</h3>
22

3-
Sets the `Content-Type` HTTP header to the MIME type as determined by the specified `type`. If `type` contains the "/" character, then it sets the `Content-Type` to the exact value of `type`, otherwise it is assumed to be a file extension and the MIME type is looked up in a mapping using the `express.static.mime.lookup()` method.
3+
Sets the `Content-Type` HTTP header to the MIME type as determined by the specified `type`. If `type` contains the "/" character, then it sets the `Content-Type` to the exact value of `type`, otherwise it is assumed to be a file extension and the MIME type is looked up using the `contentType()` method of the `mime-types` package.
44

55
```js
66
res.type('.html') // => 'text/html'
@@ -9,3 +9,5 @@ res.type('json') // => 'application/json'
99
res.type('application/json') // => 'application/json'
1010
res.type('png') // => image/png:
1111
```
12+
13+
Aliased as `res.contentType(type)`.

‎_includes/blog/tags-menu.md

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

‎_includes/head.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
<link rel="icon" type="image/png" href="/images/favicon.png" />
77
<script data-cfasync="false" src="/js/theme.js"></script>
8-
<link rel="stylesheet" href="/css/dark-theme.css?_={{ site.time | date: '%s' }}">
8+
<link rel="stylesheet" href="/css/variables.css?_={{ site.time | date: '%s' }}">
9+
<link rel="stylesheet" href="/css/themes/dark-theme.css?_={{ site.time | date: '%s' }}">
10+
<link rel="stylesheet" href="/css/themes/light-theme.css?_={{ site.time | date: '%s' }}">
911
<link rel="stylesheet" href="/css/style.css?_={{ site.time | date: '%s' }}">
1012
<link rel="stylesheet" href="/css/sintax.css?_={{ site.time | date: '%s' }}">
1113

1214
<link rel="stylesheet" href="/css/font-awesome.min.css">
1315
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&amp;amp;subset=latin,latin-ext">
14-
<link rel="stylesheet" href="/css/{{ page.lang }}.css">
16+
<link rel="stylesheet" href="/css/langs/{{ page.lang }}.css">
1517

1618
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
1719
<meta name="description" content="{{page.description}}">

‎_layouts/home.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html lang="{{ page.lang }}">
2+
<html class="light-mode" lang="{{ page.lang }}">
33

44
{% include head.html %}
55

0 commit comments

Comments
 (0)