You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by wa...@apache.org on 2021/09/01 10:36:29 UTC
[echarts-handbook] branch master updated: fix: 1) activate the
corresponding item in the header nav. 2) update navbar to the latest. 3)
`Applications` -> `How To Guides`. related commit:
https://github.com/apache/echarts-handbook/commit/c12152f1450414087158c61a8d78038d46448698
4) add i18n translation for `searchHandbook` term.
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
The following commit(s) were added to refs/heads/master by this push:
new ffdcc54 fix: 1) activate the corresponding item in the header nav. 2) update navbar to the latest. 3) `Applications` -> `How To Guides`. related commit: https://github.com/apache/echarts-handbook/commit/c12152f1450414087158c61a8d78038d46448698 4) add i18n translation for `searchHandbook` term.
ffdcc54 is described below
commit ffdcc54ac36e4a7483233987d2b0ba56af3324b9
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Wed Sep 1 18:32:31 2021 +0800
fix: 1) activate the corresponding item in the header nav.
2) update navbar to the latest.
3) `Applications` -> `How To Guides`. related commit: https://github.com/apache/echarts-handbook/commit/c12152f1450414087158c61a8d78038d46448698
4) add i18n translation for `searchHandbook` term.
---
app.html | 1 +
components/partials/Navbar/en.vue | 2 +-
components/partials/Navbar/zh.vue | 2 +-
components/partials/Sidebar.vue | 15 +++++++--------
contents/en/basics/inspiration.md | 2 +-
nuxt.config.js | 6 ++++--
6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/app.html b/app.html
index 75bebba..eb1f216 100644
--- a/app.html
+++ b/app.html
@@ -19,6 +19,7 @@
</head>
<body {{ BODY_ATTRS }}>
{{ APP }}
+ <script type="text/javascript">document.getElementById('nav-doc').className = 'active';</script>
<script src="https://cdn.jsdelivr.net/npm/jquery@2.2.4/dist/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/js/bootstrap.min.js"></script>
<script
diff --git a/components/partials/Navbar/en.vue b/components/partials/Navbar/en.vue
index 5c75d19..f682309 100644
--- a/components/partials/Navbar/en.vue
+++ b/components/partials/Navbar/en.vue
@@ -1,3 +1,3 @@
<template>
-<nav role="navigation" class="navbar navbar-default navbar-fixed-top"><div class="container-fluid"><div class="navbar-header"><button type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false" class="navbar-toggle collapsed"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a href="https://echarts.apache.org/en/index.html" class="navbar-brand"><img src="https://e [...]
+<nav role="navigation" class="navbar navbar-default navbar-fixed-top"><div class="container-fluid"><div class="navbar-header"><button type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false" class="navbar-toggle collapsed"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a href="https://echarts.apache.org/en/index.html" class="navbar-brand"><img src="https://e [...]
</template>
\ No newline at end of file
diff --git a/components/partials/Navbar/zh.vue b/components/partials/Navbar/zh.vue
index 676ede6..a8489fe 100644
--- a/components/partials/Navbar/zh.vue
+++ b/components/partials/Navbar/zh.vue
@@ -1,3 +1,3 @@
<template>
-<nav role="navigation" class="navbar navbar-default navbar-fixed-top"><div class="container-fluid"><div class="navbar-header"><button type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false" class="navbar-toggle collapsed"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a href="https://echarts.apache.org/zh/index.html" class="navbar-brand"><img src="https://c [...]
+<nav role="navigation" class="navbar navbar-default navbar-fixed-top"><div class="container-fluid"><div class="navbar-header"><button type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false" class="navbar-toggle collapsed"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a href="https://echarts.apache.org/zh/index.html" class="navbar-brand"><img src="https://c [...]
</template>
\ No newline at end of file
diff --git a/components/partials/Sidebar.vue b/components/partials/Sidebar.vue
index 126f4bf..5a754e7 100644
--- a/components/partials/Sidebar.vue
+++ b/components/partials/Sidebar.vue
@@ -4,7 +4,7 @@
<input
id="handbook-search-intput"
type="search"
- placeholder="Search Handbook"
+ :placeholder="$t('searchHandbook')"
/>
<div class="search-icon">
<svg
@@ -165,7 +165,11 @@ export default Vue.extend({
.bd-docs-nav {
overflow-x: hidden;
overflow-y: auto;
- height: calc(100vh - 50px);
+ height: calc(100% - 83px);
+ padding-bottom: 10px;
+ padding-top: 10px;
+ margin-top: 5px;
+ margin-bottom: 5px;
}
.sidebar-search {
@@ -177,7 +181,7 @@ export default Vue.extend({
}
input {
- @apply shadow rounded-xl border-0 p-4 w-full;
+ @apply shadow rounded-xl border-0 p-4 w-full outline-none;
}
.search-icon {
@@ -237,11 +241,6 @@ export default Vue.extend({
.page-content {
padding-bottom: 0;
- .bd-docs-nav {
- margin-top: 10px;
- margin-bottom: 20px;
- }
-
.nav {
display: block;
}
diff --git a/contents/en/basics/inspiration.md b/contents/en/basics/inspiration.md
index a023871..8d3653e 100644
--- a/contents/en/basics/inspiration.md
+++ b/contents/en/basics/inspiration.md
@@ -3,4 +3,4 @@
The following list provides some ideas when you have a question "I don't know how to design a chart" or "I don't know how to use Apache ECharts to achieve a certain effect".
- [Apache ECharts Official Examples](${mainSitePath}/examples)
-- "Applications - Common Charts" in this handbook
+- "How To Guides - Common Charts" in this handbook
diff --git a/nuxt.config.js b/nuxt.config.js
index 3cc5add..d978e51 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -88,10 +88,12 @@ export default {
fallbackLocale: 'en',
messages: {
en: {
- inThisPage: 'In This Page'
+ inThisPage: 'In This Page',
+ searchHandbook: 'Search Handbook'
},
zh: {
- inThisPage: '本页目录'
+ inThisPage: '本页目录',
+ searchHandbook: '搜索手册'
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org