You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2021/01/20 05:31:23 UTC
[echarts-www] 01/01: Merge branch 'master' into next
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/echarts-www.git
commit cd7fae65191aee16dc37e59e42f445cdcfb90254
Merge: b6617d4 0ef320a
Author: pissang <bm...@gmail.com>
AuthorDate: Wed Jan 20 13:30:44 2021 +0800
Merge branch 'master' into next
README.md | 2 +-
_jade/components/download.jade | 16 ++++++------
_jade/components/footer.jade | 4 +--
_jade/components/nav-mixin.jade | 4 +--
_jade/en/committers.jade | 2 +-
_jade/en/contributing.jade | 8 +++---
_jade/en/download-extension.jade | 4 +--
_jade/en/download.jade | 16 ++++++------
_jade/en/faq.jade | 4 +--
_jade/en/footer.jade | 4 +--
_jade/en/nav-mixin.jade | 6 ++---
_jade/zh/committers.jade | 2 +-
_jade/zh/contributing.jade | 8 +++---
_jade/zh/faq.jade | 4 +--
_scss/_components.nav.scss | 29 +++++++++++++++++++--
bin/release.sh | 2 +-
bin/uploadBOS.js | 2 +-
builder/build.js | 18 +++++++------
config/common.js | 12 ++++++++-
config/env.asf.js | 6 ++---
config/env.dev.js | 6 ++---
config/env.localsite.js | 8 +++---
ecop-public/asf-email/tpl/announce-release.tpl | 2 +-
.../asf-email/tpl/vote-dev-release-result.tpl | 20 ++++++--------
ecop-public/asf-email/tpl/vote-dev-release.tpl | 13 ++++-----
ecop-public/asf-email/tpl/vote-urge.tpl | 2 +-
images/extensions/amap.jpg | Bin 0 -> 70708 bytes
js/download.js | 24 ++++++++++++-----
28 files changed, 135 insertions(+), 93 deletions(-)
diff --cc _jade/components/nav-mixin.jade
index 8913e75,05ca807..aec8fac
--- a/_jade/components/nav-mixin.jade
+++ b/_jade/components/nav-mixin.jade
@@@ -72,13 -72,13 +72,13 @@@ mixin nav(hostParam, cdnPayRootParam, c
li
a(href='#{hostParam}/zh/coding-standard.html') 代码规范
li
- a(href='https://github.com/apache/incubator-echarts', target='_blank') 源码(GitHub)
+ a(href='https://github.com/apache/echarts', target='_blank') 源码(GitHub)
include ./svg/external-link
li
- a(href='https://github.com/apache/incubator-echarts/issues', target='_blank') Issues(GitHub)
+ a(href='https://github.com/apache/echarts/issues', target='_blank') Issues(GitHub)
include ./svg/external-link
li#nav-others
- a(href='#', class="dropdown-toggle", data-toggle="dropdown") 其他
+ a(href='#', class="dropdown-toggle", data-toggle="dropdown") ASF
b.caret
ul.dropdown-menu
li
diff --cc _jade/en/nav-mixin.jade
index 87724f0,46a6cb0..32a4c4c
--- a/_jade/en/nav-mixin.jade
+++ b/_jade/en/nav-mixin.jade
@@@ -70,13 -70,13 +70,13 @@@ mixin nav(hostParam, cdnPayRootParam, c
li
a(href='#{hostParam}/en/coding-standard.html') Code Standard
li
- a(href='https://github.com/apache/incubator-echarts', target='_blank') Source Code (GitHub)
+ a(href='https://github.com/apache/echarts', target='_blank') Source Code (GitHub)
include ../components/svg/external-link
li
- a(href='https://github.com/apache/incubator-echarts/issues', target='_blank') Issues (GitHub)
+ a(href='https://github.com/apache/echarts/issues', target='_blank') Issues (GitHub)
include ../components/svg/external-link
li#nav-others
- a(href='#', class="dropdown-toggle", data-toggle="dropdown") Others
+ a(href='#', class="dropdown-toggle", data-toggle="dropdown") ASF
b.caret
ul.dropdown-menu
li
diff --cc _scss/_components.nav.scss
index 5b92e73,20c7d6b..b213732
--- a/_scss/_components.nav.scss
+++ b/_scss/_components.nav.scss
@@@ -244,9 -212,10 +245,9 @@@ $collapse-break-point: 768px
opacity: 0.5;
}
- @media (max-width: 768px) {
+ @media (max-width: $collapse-break-point) {
.navbar-default {
.navbar-nav {
- background-color: $clr-primary;
transition: background-color 0.5s linear;
margin-top: 0;
margin-bottom: 0;
@@@ -264,12 -239,9 +265,12 @@@
#nav-download {
display: none;
}
+ .dropdown-menu {
+ width: 100% !important;
+ }
}
- @media (max-width: 992px) and (min-width: 768px) {
+ @media (max-width: 1280px) and (min-width: 1192px) {
.navbar-default {
.navbar-nav li a {
padding: 15px 15px;
diff --cc config/env.asf.js
index 472c7ef,7e78059..04f7081
--- a/config/env.asf.js
+++ b/config/env.asf.js
@@@ -12,10 -12,11 +12,10 @@@ config.cdnPayRootMap =
config.cdnFreeRootMap = {
// 'echarts.cdn.apache.org' have been configured for zh (?)
// zh: 'https://echarts.cdn.apache.org',
- zh: 'https://cdn.jsdelivr.net/gh/apache/incubator-echarts-website@asf-site',
+ zh: 'https://cdn.jsdelivr.net/gh/apache/echarts-website@asf-site',
en: 'https://echarts.apache.org'
};
-config.galleryPath = 'https://www.echartsjs.com/gallery/';
-config.blogPath = 'https://efe.baidu.com/tags/ECharts/';
+config.galleryPath = 'https://echarts.apache.org/examples/';
- config.releaseDestDir = path.resolve(__dirname, '../../incubator-echarts-website');
+ config.releaseDestDir = path.resolve(__dirname, '../../echarts-website');
module.exports = config;
diff --cc config/env.dev.js
index 62bb25a,1cdaac0..2690664
--- a/config/env.dev.js
+++ b/config/env.dev.js
@@@ -11,7 -11,8 +11,7 @@@ config.cdnFreeRootMap =
zh: config.host,
en: config.host
};
-config.galleryPath = 'https://www.echartsjs.com/gallery/';
-config.blogPath = 'https://efe.baidu.com/tags/ECharts/';
+config.galleryPath = 'https://echarts.apache.org/examples/';
- config.releaseDestDir = path.resolve(__dirname, '../../incubator-echarts-website');
+ config.releaseDestDir = path.resolve(__dirname, '../../echarts-website');
module.exports = config;
diff --cc config/env.localsite.js
index ffccf9e,38b0d85..96d01f8
--- a/config/env.localsite.js
+++ b/config/env.localsite.js
@@@ -6,14 -6,15 +6,14 @@@ config.host = 'http://localhost/echarts
config.cdnPayRootMap = {
zh: config.host,
- en: 'http://localhost/incubator-echarts-website'
- en: 'http://localhost:8001/echarts/echarts-website'
++ en: 'http://localhost/echarts-website'
};
config.cdnFreeRootMap = {
zh: config.host,
en: config.host
};
-config.galleryPath = 'https://www.echartsjs.com/gallery/';
-config.blogPath = 'https://efe.baidu.com/tags/ECharts/';
+config.galleryPath = 'https://echarts.apache.org/examples/';
- config.releaseDestDir = path.resolve(__dirname, '../../incubator-echarts-website');
+ config.releaseDestDir = path.resolve(__dirname, '../../echarts-website');
module.exports = config;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org