You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by ov...@apache.org on 2021/04/22 10:03:06 UTC
[echarts-handbook] branch master updated (dfa9103 -> 02dce66)
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git.
from dfa9103 remove incubator and incubating.
new 53747d9 feat: update sidebar style
new ec3d83d merge
new 02dce66 update scroll-into-view type and style
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/partials/Sidebar.vue | 73 +++++++++++++++++++++++++++++++----------
layouts/default.vue | 1 +
package-lock.json | 6 ++++
package.json | 1 +
4 files changed, 64 insertions(+), 17 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[echarts-handbook] 02/03: merge
Posted by ov...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
commit ec3d83dd3e2378b726e471377a5eeb447b7cd192
Merge: 53747d9 dfa9103
Author: Ovilia <zw...@gmail.com>
AuthorDate: Mon Apr 12 12:00:43 2021 +0800
merge
README.md | 8 +-
build/generate.js | 4 +-
components/partials/Navbar.vue | 2 +-
components/partials/Sidebar.vue | 121 ++++++++++++-----------------
components/partials/SidebarNavItem.vue | 112 ++++++++++++++++++++++++++
configs/config.asf.js | 2 +-
configs/config.dev.js | 10 +--
contents/en/best-practice/canvas-vs-svg.md | 4 +-
contents/en/concepts/data-transform.md | 2 +-
contents/zh/application/custom-build.md | 4 +-
contents/zh/basics/download.md | 10 +--
contents/zh/basics/help.md | 2 +-
contents/zh/best-practice/canvas-vs-svg.md | 4 +-
contents/zh/concepts/data-transform.md | 2 +-
layouts/default.vue | 2 +-
package-lock.json | 9 ++-
package.json | 3 +-
pages/en/_post.vue | 5 +-
18 files changed, 201 insertions(+), 105 deletions(-)
diff --cc components/partials/Sidebar.vue
index aa4d126,5249e33..8f9763a
--- a/components/partials/Sidebar.vue
+++ b/components/partials/Sidebar.vue
@@@ -188,36 -136,21 +158,45 @@@ export default Vue.extend(
}
}
+ .level2 {
+ margin-top: 1px;
+
+ .level3 {
+ margin-top: 0;
+ }
+
+ .nav-link {
+ color: #666;
+ padding: 0;
+ }
+ }
+
+ .nav.level3 {
+ font-size: 12px;
+ padding-left: 10px;
+ margin-left: 0;
+ display: none;
+
+ li {
+ display: list-item;
+ list-style: disc;
+ }
++
+ .level1, .level2 {
+ margin-top: 0;
}
- .level2 .active .level3 {
- display: block;
+ .level1 .nav-link {
+ color: #444;
+ }
+
+ .nav.level2 {
+ border-left: 1px solid #eee;
+ padding-left: 10px;
+ margin-left: 0;
}
- .level3 .nav-link {
+ .level2 .nav-link {
margin: 2px 0;
color: #888;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[echarts-handbook] 03/03: update scroll-into-view type and style
Posted by ov...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
commit 02dce66e40ae8e4cef0dcade91ffe9fe2bd49547
Author: Ovilia <zw...@gmail.com>
AuthorDate: Thu Apr 22 18:02:41 2021 +0800
update scroll-into-view type and style
---
components/partials/Sidebar.vue | 17 +++++++----------
layouts/default.vue | 1 +
package-lock.json | 6 ++++++
package.json | 1 +
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/components/partials/Sidebar.vue b/components/partials/Sidebar.vue
index 8f9763a..8f0e3e4 100644
--- a/components/partials/Sidebar.vue
+++ b/components/partials/Sidebar.vue
@@ -1,5 +1,5 @@
<template>
- <div class="bd-sidebar border-bottom-0 col-sm-2 col-12">
+ <div class="bd-sidebar border-bottom-0 col-sm-3 col-sm-9 col-md-2 col-md-10">
<!-- active: {{ active }}. {{ posts }} -->
<div class="bd-docs-nav">
<div class="bd-toc-item level0"
@@ -44,7 +44,7 @@ export default Vue.extend({
mounted() {
setTimeout(() => {
- const $actived = this.$el.querySelector('.actived');
+ const $actived = this.$el.querySelector('.actived') as HTMLElement;
if ($actived) {
scrollIntoView($actived, {
time: 200,
@@ -52,10 +52,9 @@ export default Vue.extend({
top: 0,
topOffset: 300
},
- isScrollable: function(target, defaultIsScrollable){
- return target.className && target.className.indexOf('bd-sidebar') >= 0;
+ isScrollable: function(target){
+ return !!target.className && target.className.indexOf('bd-sidebar') >= 0;
}
-
});
}
}, 0);
@@ -76,7 +75,7 @@ export default Vue.extend({
}
.bd-toc-item {
- margin-bottom: 20px;
+ margin-bottom: 10px;
}
.bd-sidenav {
@@ -147,9 +146,10 @@ export default Vue.extend({
.level1 {
margin-top: 4px;
+ font-size: 14px;
.nav-link {
- padding: 10px 0;
+ padding: 5px 0;
color: #707070;
&:hover {
@@ -181,9 +181,6 @@ export default Vue.extend({
display: list-item;
list-style: disc;
}
-
- .level1, .level2 {
- margin-top: 0;
}
.level1 .nav-link {
diff --git a/layouts/default.vue b/layouts/default.vue
index c8abfde..12b87cf 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -65,6 +65,7 @@ export default {
border-left: 1px solid #e3e3e3;
padding: 10px;
color: #888;
+ background-color: #fff;
height: auto;
@media (max-width: 768px) {
diff --git a/package-lock.json b/package-lock.json
index 3dcafe2..cd66136 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1808,6 +1808,12 @@
"integrity": "sha1-a9p9uGU/piZD9e5p6facEaOS46Y=",
"dev": true
},
+ "@types/scroll-into-view": {
+ "version": "1.13.0",
+ "resolved": "https://registry.nlark.com/@types/scroll-into-view/download/@types/scroll-into-view-1.13.0.tgz",
+ "integrity": "sha1-c5AaxgtzOW11VHvbfwLNTrL6Kz0=",
+ "dev": true
+ },
"@types/serve-static": {
"version": "1.13.3",
"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.3.tgz",
diff --git a/package.json b/package.json
index f3c0cba..4074278 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
"@nuxt/typescript-build": "^0.6.0",
"@nuxtjs/eslint-config-typescript": "^1.0.0",
"@nuxtjs/eslint-module": "^1.0.0",
+ "@types/scroll-into-view": "^1.13.0",
"babel-eslint": "^10.0.1",
"child_process": "^1.0.2",
"eslint": "^6.1.0",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[echarts-handbook] 01/03: feat: update sidebar style
Posted by ov...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ovilia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-handbook.git
commit 53747d9dfc28417f065c98e0078e30c25820fe8b
Author: Ovilia <zw...@gmail.com>
AuthorDate: Mon Apr 12 11:26:47 2021 +0800
feat: update sidebar style
---
components/partials/Sidebar.vue | 42 ++++++++++++++++++++++++-----------------
1 file changed, 25 insertions(+), 17 deletions(-)
diff --git a/components/partials/Sidebar.vue b/components/partials/Sidebar.vue
index a2ec88b..aa4d126 100644
--- a/components/partials/Sidebar.vue
+++ b/components/partials/Sidebar.vue
@@ -112,14 +112,14 @@ export default Vue.extend({
}
.bd-sidenav {
- margin-top: 5px;
+ margin-top: 4px;
margin-left: 10px;
display: none;
}
.bd-toc-link {
font-weight: bold;
- color: #222;
+ color: #333;
&[href="javascript:;"] {
cursor: default;
@@ -130,7 +130,7 @@ export default Vue.extend({
}
&:focus, &:hover {
- color: #222;
+ color: #151515;
}
}
@@ -160,7 +160,7 @@ export default Vue.extend({
cursor: pointer;
transform: scale(0.8);
top: 2px;
- left: -5px;
+ left: -4px;
}
.nav-link .glyphicon-menu-up {
@@ -176,29 +176,41 @@ export default Vue.extend({
}
.level1 {
+ margin-top: 4px;
+
.nav-link {
- padding: 5px 0;
- color: #444;
+ padding: 10px 0;
+ color: #707070;
&:hover {
- color: #444;
+ color: #151515;
}
}
}
- .level2, .level3 {
- margin-top: 0;
- }
+ .level2 {
+ margin-top: 1px;
- .level2 .nav-link {
- color: #666;
+ .level3 {
+ margin-top: 0;
+ }
+
+ .nav-link {
+ color: #666;
+ padding: 0;
+ }
}
.nav.level3 {
- border-left: 1px solid #eee;
+ font-size: 12px;
padding-left: 10px;
margin-left: 0;
display: none;
+
+ li {
+ display: list-item;
+ list-style: disc;
+ }
}
.level2 .active .level3 {
@@ -209,10 +221,6 @@ export default Vue.extend({
margin: 2px 0;
color: #888;
}
-
- .nav-link:hover {
- text-decoration: underline;
- }
}
</style>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org