Merge branch 'gh-pages' into improve-menu-list

expressjs · Sep 8, 2024 · 146c049 · 146c049
2 parents 15fccd3 + 4ee32e2
commit 146c049
Show file tree

Hide file tree

Showing 28 changed files with 50 additions and 30 deletions.
diff --git a/2x/applications.html b/2x/applications.html
@@ -203,7 +203,7 @@
 				<div id="warning">
 				<center><strong>Express 2.x</strong> IS END-OF-LIFE AND NO LONGER MAINTAINED</center>
 				<p>Known and unknown security and performance issues in 2.x have not been addressed since the last update (29 June, 2012). It is highly recommended to <a href="https://github.com/expressjs/express/wiki/Migrating-from-2.x-to-3.x">upgrade to <strong>Express 3.x</strong></a> or to <a href="http://expressjs.com/4x/api.html"><strong>Express 4.x</strong></a>.</p>
-				<p>If you are unable to upgrade past 2.x, please consider <a href="/{{ page.lang }}/support#commercial-support-options">Commercial Support Options</a>.</p>
+				<p>If you are unable to upgrade past 2.x, please consider <a href="/en/support#commercial-support-options">Commercial Support Options</a>.</p>
 				</div>
 				<p id="tagline">
 				   High performance, high class web development for

diff --git a/2x/contrib.html b/2x/contrib.html
@@ -203,7 +203,7 @@
 				<div id="warning">
 				<center><strong>Express 2.x</strong> IS END-OF-LIFE AND NO LONGER MAINTAINED</center>
 				<p>Known and unknown security and performance issues in 2.x have not been addressed since the last update (29 June, 2012). It is highly recommended to <a href="https://github.com/expressjs/express/wiki/Migrating-from-2.x-to-3.x">upgrade to <strong>Express 3.x</strong></a> or to <a href="http://expressjs.com/4x/api.html"><strong>Express 4.x</strong></a>.</p>
-				<p>If you are unable to upgrade past 2.x, please consider <a href="/{{ page.lang }}/support#commercial-support-options">Commercial Support Options</a>.</p>
+				<p>If you are unable to upgrade past 2.x, please consider <a href="/en/support#commercial-support-options">Commercial Support Options</a>.</p>
 				</div>
 				<p id="tagline">
 				   High performance, high class web development for

diff --git a/2x/executable.html b/2x/executable.html
@@ -203,7 +203,7 @@
 				<div id="warning">
 				<center><strong>Express 2.x</strong> IS END-OF-LIFE AND NO LONGER MAINTAINED</center>
 				<p>Known and unknown security and performance issues in 2.x have not been addressed since the last update (29 June, 2012). It is highly recommended to <a href="https://github.com/expressjs/express/wiki/Migrating-from-2.x-to-3.x">upgrade to <strong>Express 3.x</strong></a> or to <a href="http://expressjs.com/4x/api.html"><strong>Express 4.x</strong></a>.</p>
-				<p>If you are unable to upgrade past 2.x, please consider <a href="/{{ page.lang }}/support#commercial-support-options">Commercial Support Options</a>.</p>
+				<p>If you are unable to upgrade past 2.x, please consider <a href="/en/support#commercial-support-options">Commercial Support Options</a>.</p>
 				</div>
 				<p id="tagline">
 				   High performance, high class web development for

diff --git a/2x/guide.html b/2x/guide.html
@@ -265,7 +265,7 @@
                 <div id="warning">
                 <center><strong>Express 2.x</strong> IS END-OF-LIFE AND NO LONGER MAINTAINED</center>
                 <p>Known and unknown security and performance issues in 2.x have not been addressed since the last update (29 June, 2012). It is highly recommended to <a href="https://github.com/expressjs/express/wiki/Migrating-from-2.x-to-3.x">upgrade to <strong>Express 3.x</strong></a> or to <a href="http://expressjs.com/4x/api.html"><strong>Express 4.x</strong></a>.</p>
-                <p>If you are unable to upgrade past 2.x, please consider <a href="/{{ page.lang }}/support#commercial-support-options">Commercial Support Options</a>.</p>
+                <p>If you are unable to upgrade past 2.x, please consider <a href="/en/support#commercial-support-options">Commercial Support Options</a>.</p>
                 </div>
 				<p id="tagline">
 				   High performance, high class web development for

diff --git a/2x/index.html b/2x/index.html
@@ -204,7 +204,7 @@
 				<div id="warning">
 				<center><strong>Express 2.x</strong> IS END-OF-LIFE AND NO LONGER MAINTAINED</center>
 				<p>Known and unknown security and performance issues in 2.x have not been addressed since the last update (29 June, 2012). It is highly recommended to use the latest version of Express.</p>
-				<p>If you are unable to upgrade past 2.x, please consider <a href="/{{ page.lang }}/support#commercial-support-options">Commercial Support Options</a>.</p>
+				<p>If you are unable to upgrade past 2.x, please consider <a href="/en/support#commercial-support-options">Commercial Support Options</a>.</p>
 				</div>
 				<p id="tagline">
 				   High performance, high class web development for

diff --git a/2x/migrate.html b/2x/migrate.html
@@ -203,7 +203,7 @@
 				<div id="warning">
 				<center><strong>Express 2.x</strong> IS END-OF-LIFE AND NO LONGER MAINTAINED</center>
 				<p>Known and unknown security and performance issues in 2.x have not been addressed since the last update (29 June, 2012). It is highly recommended to <a href="https://github.com/expressjs/express/wiki/Migrating-from-2.x-to-3.x">upgrade to <strong>Express 3.x</strong></a> or to <a href="http://expressjs.com/4x/api.html"><strong>Express 4.x</strong></a>.</p>
-				<p>If you are unable to upgrade past 2.x, please consider <a href="/{{ page.lang }}/support#commercial-support-options">Commercial Support Options</a>.</p>
+				<p>If you are unable to upgrade past 2.x, please consider <a href="/en/support#commercial-support-options">Commercial Support Options</a>.</p>
 				</div>
 				<p id="tagline">
 				   High performance, high class web development for

diff --git a/2x/screencasts.html b/2x/screencasts.html
@@ -203,7 +203,7 @@
 				<div id="warning">
 				<center><strong>Express 2.x</strong> IS END-OF-LIFE AND NO LONGER MAINTAINED</center>
 				<p>Known and unknown security and performance issues in 2.x have not been addressed since the last update (29 June, 2012). It is highly recommended to <a href="https://github.com/expressjs/express/wiki/Migrating-from-2.x-to-3.x">upgrade to <strong>Express 3.x</strong></a> or to <a href="http://expressjs.com/4x/api.html"><strong>Express 4.x</strong></a>.</p>
-				<p>If you are unable to upgrade past 2.x, please consider <a href="/{{ page.lang }}/support#commercial-support-options">Commercial Support Options</a>.</p>
+				<p>If you are unable to upgrade past 2.x, please consider <a href="/en/support#commercial-support-options">Commercial Support Options</a>.</p>
 				</div>
 				<p id="tagline">
 				   High performance, high class web development for

diff --git a/_includes/notice/notice-de.md b/_includes/notice/notice-de.md
@@ -1,3 +1,3 @@
 <p>Diese Übersetzung zur Verfügung gestellt von StrongLoop / IBM.</p>
 
-Dieses Dokument kann im Vergleich zur englischen Dokumentation veraltet sein. Aktuelle Updates finden Sie in der <a href="/">englischen Dokumentation</a>.
+Dieses Dokument kann im Vergleich zur englischen Dokumentation veraltet sein. Aktuelle Updates finden Sie in der <a href='{{ page.url | replace: page.lang, "en" }}'>englischen Dokumentation</a>.
diff --git a/_includes/notice/notice-en.md b/_includes/notice/notice-en.md
@@ -1 +1 @@
-This document might be outdated relative to the documentation in English. For the latest updates, please refer to the <a href="/">documentation in English</a>.
+This document might be outdated relative to the documentation in English. For the latest updates, please refer to the <a href='{{ page.url | replace: page.lang, "en" }}'>documentation in English</a>.
diff --git a/_includes/notice/notice-es.md b/_includes/notice/notice-es.md
@@ -1,3 +1,3 @@
 <p>Esta traducción proporcionada por StrongLoop / IBM.</p>
 
-Este documento puede estar desfasado respecto a la documentación en inglés. Para ver las últimas actualizaciones, consulte la <a href="/">documentación en inglés</a>.
+Este documento puede estar desfasado respecto a la documentación en inglés. Para ver las últimas actualizaciones, consulte la <a href='{{ page.url | replace: page.lang, "en" }}'>documentación en inglés</a>.
diff --git a/_includes/notice/notice-fr.md b/_includes/notice/notice-fr.md
@@ -1,3 +1,3 @@
 <p>Cette traduction fournie par StrongLoop / IBM.</p>
 
-Il se peut que ce document soit obsolète par rapport à la documentation en anglais. Pour connaître les mises à jour les plus récentes, reportez-vous à la <a href="/">documentation en anglais</a>.
+Il se peut que ce document soit obsolète par rapport à la documentation en anglais. Pour connaître les mises à jour les plus récentes, reportez-vous à la <a href='{{ page.url | replace: page.lang, "en" }}'>documentation en anglais</a>.
diff --git a/_includes/notice/notice-id.md b/_includes/notice/notice-id.md
@@ -1 +1 @@
-Dokumen ini mungkin sudah ketinggalan zaman jika dibandingkan dengan dokumentasi dalam bahasa Inggris. Untuk informasi terkini, lihat <a href="/">dokumentasi dalam bahasa Inggris</a>.
+Dokumen ini mungkin sudah ketinggalan zaman jika dibandingkan dengan dokumentasi dalam bahasa Inggris. Untuk informasi terkini, lihat <a href='{{ page.url | replace: page.lang, "en" }}'>dokumentasi dalam bahasa Inggris</a>.
diff --git a/_includes/notice/notice-it.md b/_includes/notice/notice-it.md
@@ -1,3 +1,3 @@
 <p>Questa traduzione fornita da StrongLoop / IBM.</p>
 
-È possibile che questo documento non sia aggiornato poiché la documentazione è in inglese. Per gli ultimi aggiornamenti, fare riferimento alla <a href="/">documentazione in inglese</a>.
+È possibile che questo documento non sia aggiornato poiché la documentazione è in inglese. Per gli ultimi aggiornamenti, fare riferimento alla <a href='{{ page.url | replace: page.lang, "en" }}'>documentazione in inglese</a>.
diff --git a/_includes/notice/notice-ja.md b/_includes/notice/notice-ja.md
@@ -1,3 +1,3 @@
 <p>StrongLoop / IBMによって提供されるこの翻訳.</p>
 
-本書は、英語の資料と比較すると古くなっている可能性があります。最新の更新については、<a href="/">英語版の資料</a>を参照してください。
+本書は、英語の資料と比較すると古くなっている可能性があります。最新の更新については、<a href='{{ page.url | replace: page.lang, "en" }}'>英語版の資料</a>を参照してください。
diff --git a/_includes/notice/notice-ko.md b/_includes/notice/notice-ko.md
@@ -1,3 +1,3 @@
 <p>StrongLoop / IBM에 의해 제공이 번역.</p>
 
-이 문서는 영문판 문서에 비해 더 오래된 버전일 수도 있습니다. 최신 업데이트를 확인하려면 <a href="/">영문판 문서</a>를 참조하십시오.
+이 문서는 영문판 문서에 비해 더 오래된 버전일 수도 있습니다. 최신 업데이트를 확인하려면 <a href='{{ page.url | replace: page.lang, "en" }}'>영문판 문서</a>를 참조하십시오.
diff --git a/_includes/notice/notice-pt-br.md b/_includes/notice/notice-pt-br.md
@@ -1,3 +1,3 @@
 <p>Esta tradução fornecida pelo StrongLoop / IBM.</p>
 
-Este documento pode estar desatualizado em relação à documentação em Inglês. Para obter as atualizações mais recentes, consulte a <a href="/">documentação em Inglês</a>.
+Este documento pode estar desatualizado em relação à documentação em Inglês. Para obter as atualizações mais recentes, consulte a <a href='{{ page.url | replace: page.lang, "en" }}'>documentação em Inglês</a>.
diff --git a/_includes/notice/notice-ru.md b/_includes/notice/notice-ru.md
@@ -1,3 +1,3 @@
 <p>Этот перевод обеспечивается StrongLoop / IBM.</p>
 
-Этот документ может быть устаревшим по отношению к документации на английском языке. Последние обновления содержатся в <a href="/">документации на английском языке</a>.
+Этот документ может быть устаревшим по отношению к документации на английском языке. Последние обновления содержатся в <a href='{{ page.url | replace: page.lang, "en" }}'>документации на английском языке</a>.
diff --git a/_includes/notice/notice-sk.md b/_includes/notice/notice-sk.md
@@ -1 +1 @@
-Tento dokument môže byť v porovnaní s dokumentáciou v angličtine zastaralý. Aktuálne informácie nájdete v <a href="/">dokumentácii v angličtine</a>.
+Tento dokument môže byť v porovnaní s dokumentáciou v angličtine zastaralý. Aktuálne informácie nájdete v <a href='{{ page.url | replace: page.lang, "en" }}'>dokumentácii v angličtine</a>.
diff --git a/_includes/notice/notice-th.md b/_includes/notice/notice-th.md
@@ -1 +1 @@
-ในเอกสารนี้อาจจะเก่าไปแล้วที่เกี่ยวเนื่องกับรุ่นของเอกสารในภาษาอังกฤษ สำหรับรุ่นล่าสุดโปรดอ้างอิงจาก <a href="/">เอกสารในภาษาอังกฤษ</a>.
+ในเอกสารนี้อาจจะเก่าไปแล้วที่เกี่ยวเนื่องกับรุ่นของเอกสารในภาษาอังกฤษ สำหรับรุ่นล่าสุดโปรดอ้างอิงจาก <a href='{{ page.url | replace: page.lang, "en" }}'>เอกสารในภาษาอังกฤษ</a>.
diff --git a/_includes/notice/notice-tr.md b/_includes/notice/notice-tr.md
@@ -1 +1 @@
-Bu doküman ingilizce dokümana göre eski olabilir. Son güncellemeler için lütfen <a href="/">İngilizce Dokümanı</a>. ziyaret edin
+Bu doküman ingilizce dokümana göre eski olabilir. Son güncellemeler için lütfen <a href='{{ page.url | replace: page.lang, "en" }}'>İngilizce Dokümanı</a>. ziyaret edin
diff --git a/_includes/notice/notice-uk.md b/_includes/notice/notice-uk.md
@@ -1 +1 @@
-Цей документ може бути застарілим, в порівнянні з оригінальною <a href="/">англійською версією документації</a>.
+Цей документ може бути застарілим, в порівнянні з оригінальною <a href='{{ page.url | replace: page.lang, "en" }}'>англійською версією документації</a>.
diff --git a/_includes/notice/notice-uz.md b/_includes/notice/notice-uz.md
@@ -1 +1 @@
-This document might be outdated relative to the documentation in English. For the latest updates, please refer to the <a href="/">documentation in English</a>.
+This document might be outdated relative to the documentation in English. For the latest updates, please refer to the <a href='{{ page.url | replace: page.lang, "en" }}'>documentation in English</a>.
diff --git a/_includes/notice/notice-zh-cn.md b/_includes/notice/notice-zh-cn.md
@@ -1,3 +1,3 @@
 <p>这个翻译StrongLoop / IBM提供.</p>
 
-相对于英文版的文档，本文档可能已过时。要了解最近的更新，请参阅<a href="/">英文版文档</a>。
+相对于英文版的文档，本文档可能已过时。要了解最近的更新，请参阅<a href='{{ page.url | replace: page.lang, "en" }}'>英文版文档</a>。
diff --git a/_includes/notice/notice-zh-tw.md b/_includes/notice/notice-zh-tw.md
@@ -1,3 +1,3 @@
 <p>這個翻譯StrongLoop / IBM提供.</p>
 
-相對於英文版說明文件，本文件可能已不合時宜。如需最新的更新，請參閱<a href="/">英文版說明文件</a>。
+相對於英文版說明文件，本文件可能已不合時宜。如需最新的更新，請參閱<a href='{{ page.url | replace: page.lang, "en" }}'>英文版說明文件</a>。
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -11,7 +11,7 @@
   <body class="en-doc">
   {% else %}
   <body class="non-en-doc">
-    <div id="i18n-notice-box" class="doc-box doc-warn">
+    <div id="i18n-notice-box" class="doc-box doc-notice">
       {% include i18n-notice.html %}
     </div>
   {% endif %}

diff --git a/_layouts/page.html b/_layouts/page.html
@@ -21,7 +21,7 @@
       <div id="overlay"></div>
 
       {% if page.lang != 'en' %}
-        <div id="i18n-notice-box" class="doc-box doc-warn">
+        <div id="i18n-notice-box" class="doc-box doc-notice">
           {% include i18n-notice.html %}
         </div>
       {% endif %}

diff --git a/css/dark-theme.css b/css/dark-theme.css
@@ -6,6 +6,7 @@
   --notice-accent: rgb(249, 232, 195);
   --warn-bg: rgb(78, 34, 50);
   --warn-accent: rgb(249, 195, 214);
+  --code-bg: #0d1117;
 }
 
 :root {
@@ -281,3 +282,7 @@ html.dark-mode #blog-side-menu-container h3 a{
 html.dark-mode #blog-side-menu > li > a{
   color: var(--dark_inner_text);
 }
+
+html.dark-mode pre code {
+  background-color: inherit;
+} 
diff --git a/css/style.css b/css/style.css
@@ -13,6 +13,7 @@
   --notice-accent: rgb(115, 82, 13);
   --warn-bg: rgb(250, 209, 223);
   --warn-accent: rgb(138, 15, 58);
+  --code-bg: #f0f1f3;
 }
 
 * {
@@ -78,12 +79,16 @@ strong, th {
 }
 
 #home-content {
-  margin: 183px 0 2% 5%;
+  margin: 40px 0 2% 5%;
   max-width: 900px;
   padding-right: 9%;
   display: flex;
 }
 
+.en-doc #home-content {
+  margin-top: 150px;
+}
+
 #homepage-leftpane {
   min-width: 500px;
   margin-right: 30px;
@@ -352,6 +357,16 @@ pre {
 pre code {
   overflow: scroll;
   word-break: break-all;
+  background-color: inherit;
+}
+
+code {
+  background-color: var(--code-bg);
+  margin-block: -.125rem;
+  font-size: 13px;
+  padding: .125rem .375rem;
+  line-height: 28px;
+  border-radius: 6px;
 }
 
 /* top button */
@@ -565,15 +580,15 @@ html[xmlns] .clearfix {
 }
 
 #i18n-notice-box {
-  margin-top: 150px;
+  margin: 100px 3% 20px 3%;
   position: relative;
 }
 
 #close-i18n-notice-box {
   position: absolute;
   top: 3px;
   right: 4px;
-  color: #550000;
+  color: var(--notice-accent);
   cursor: pointer;
 }
 
@@ -944,7 +959,7 @@ h2 a {
   }
 
   #home-content {
-    margin: 150px 0 0 5%;
+    margin: 60px 0 0 5%;
     padding-right: 5%;
   }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		This document might be outdated relative to the documentation in English. For the latest updates, please refer to the <a href="/">documentation in English</a>.
		This document might be outdated relative to the documentation in English. For the latest updates, please refer to the <a href='{{ page.url \| replace: page.lang, "en" }}'>documentation in English</a>.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Dokumen ini mungkin sudah ketinggalan zaman jika dibandingkan dengan dokumentasi dalam bahasa Inggris. Untuk informasi terkini, lihat <a href="/">dokumentasi dalam bahasa Inggris</a>.
		Dokumen ini mungkin sudah ketinggalan zaman jika dibandingkan dengan dokumentasi dalam bahasa Inggris. Untuk informasi terkini, lihat <a href='{{ page.url \| replace: page.lang, "en" }}'>dokumentasi dalam bahasa Inggris</a>.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Tento dokument môže byť v porovnaní s dokumentáciou v angličtine zastaralý. Aktuálne informácie nájdete v <a href="/">dokumentácii v angličtine</a>.
		Tento dokument môže byť v porovnaní s dokumentáciou v angličtine zastaralý. Aktuálne informácie nájdete v <a href='{{ page.url \| replace: page.lang, "en" }}'>dokumentácii v angličtine</a>.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ในเอกสารนี้อาจจะเก่าไปแล้วที่เกี่ยวเนื่องกับรุ่นของเอกสารในภาษาอังกฤษ สำหรับรุ่นล่าสุดโปรดอ้างอิงจาก <a href="/">เอกสารในภาษาอังกฤษ</a>.
		ในเอกสารนี้อาจจะเก่าไปแล้วที่เกี่ยวเนื่องกับรุ่นของเอกสารในภาษาอังกฤษ สำหรับรุ่นล่าสุดโปรดอ้างอิงจาก <a href='{{ page.url \| replace: page.lang, "en" }}'>เอกสารในภาษาอังกฤษ</a>.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Bu doküman ingilizce dokümana göre eski olabilir. Son güncellemeler için lütfen <a href="/">İngilizce Dokümanı</a>. ziyaret edin
		Bu doküman ingilizce dokümana göre eski olabilir. Son güncellemeler için lütfen <a href='{{ page.url \| replace: page.lang, "en" }}'>İngilizce Dokümanı</a>. ziyaret edin
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Цей документ може бути застарілим, в порівнянні з оригінальною <a href="/">англійською версією документації</a>.
		Цей документ може бути застарілим, в порівнянні з оригінальною <a href='{{ page.url \| replace: page.lang, "en" }}'>англійською версією документації</a>.