Skip to content
Permalink
Browse files
Merge branch 'master' of https://github.com/ecomfe/echarts-www into f…
…ix-typo
  • Loading branch information
plainheart committed Aug 11, 2020
2 parents 88dd6fc + b07b090 commit 6b46ab51a826a35165b8c5a75677c4cfe859da81
Show file tree
Hide file tree
Showing 50 changed files with 824 additions and 121 deletions.
@@ -123,7 +123,7 @@ block content
//- input(type="text" name="email" id="email" placeholder="someone@email.com")
//- .clear
//- div
a.btn.btn-thirdary#build(href="javascript:;") #{isCN ? '下载' : 'Download'}
a.btn.btn-main.btn-thirdary#build(href="javascript:;") #{isCN ? '下载' : 'Download'}

if isCN
include ./footer
@@ -90,9 +90,9 @@ block content
h3 方法三:选择需要的模块,在线定制下载

if isECharts4
a.btn.btn-thirdary.more-btn(href="builder.html") 在线定制
a.btn.btn-main.btn-thirdary.more-btn(href="builder.html") 在线定制
else
a.btn.btn-thirdary.more-btn(href="builder3.html") 在线定制
a.btn.btn-main.btn-thirdary.more-btn(href="builder3.html") 在线定制
p.center 可自由选择所需图表和组件进行打包下载

h3 下载后……
@@ -114,8 +114,8 @@ block content
//- .circle-wrap
//- span.mode 源代码
//- span.size 1.74 MB
//- a.btn.btn-thirdary.btn-two(href="#{host}/#{ecWWWLang}/option-gl.html") 查看 GL 文档
//- a.btn.btn-thirdary.btn-two(href="#{host}/examples/#{ecWWWLang}/index.html#chart-type-globe") 查看 GL 实例
//- a.btn.btn-main.btn-thirdary.btn-two(href="#{host}/#{ecWWWLang}/option-gl.html") 查看 GL 文档
//- a.btn.btn-main.btn-thirdary.btn-two(href="#{host}/examples/#{ecWWWLang}/index.html#chart-type-globe") 查看 GL 实例
//- .d-section-theme.d-section
//- h2 主题
@@ -129,7 +129,7 @@ block content
//- a(href="asset/theme/dark.js" class="download-theme" download="dark.js" target="_blank")
//- img(src="asset/theme/thumb/dark.png")
//- p 深色主题
//- a.btn.btn-thirdary.more-btn(href="download-theme.html") 更多主题
//- a.btn.btn-main.btn-thirdary.more-btn(href="download-theme.html") 更多主题
//- .d-section-map.d-section
//- h2 地图数据
@@ -143,7 +143,7 @@ block content
//- a(href="asset/map/json/world.json" download="world.json" target="_blank")
//- img.hover-shadow(src="asset/map/thumb/world.png")
//- p 世界地图
//- a.btn.btn-thirdary.more-btn(href="download-map.html") 更多地图
//- a.btn.btn-main.btn-thirdary.more-btn(href="download-map.html") 更多地图
//- #download-extension-container.container
//- .d-section-extension.d-section.last-section
@@ -162,7 +162,7 @@ block content
//- a(href="https://github.com/ecomfe/echarts/tree/master/extension/bmap")
//- img.hover-shadow(src="images/extensions/bmap.jpg")
//- p 百度地图
//- a.btn.btn-thirdary.more-btn(href="download-extension.html") 更多插件
//- a.btn.btn-main.btn-thirdary.more-btn(href="download-extension.html") 更多插件
include ./footer

@@ -22,15 +22,14 @@ mixin nav(hostParam, cdnPayRootParam, cdnPayVersionParam)
a(href="#{hostParam}/zh/tutorial.html") 教程
li
a(href="#{hostParam}/zh/api.html") API
li
a(href="#{hostParam}/zh/cheat-sheet.html") 术语速查手册
span.new NEW
li
a(href="#{hostParam}/zh/option.html") 配置项手册
li
a(href="#{hostParam}/zh/option-gl.html") GL 配置项手册
//- li
//- a(href="#{hostParam}/zh/option-gl.html") GL 配置项手册
li
a(href="#{hostParam}/zh/changelog.html") 版本记录
li
a(href='#{hostParam}/zh/faq.html') 常见问题
li#nav-download.dropdown
a(href='#', class="dropdown-toggle", data-toggle="dropdown") 下载
b.caret
@@ -42,58 +41,60 @@ mixin nav(hostParam, cdnPayRootParam, cdnPayVersionParam)
li
a(href="#{hostParam}/zh/download-extension.html") 扩展下载
li#nav-examples
a(href='#', class="dropdown-toggle", data-toggle="dropdown") 实例
b.caret
ul.dropdown-menu
li
a(href='#{hostParam}/examples/zh/index.html') 官方实例
li
a(href='#{hostParam}/examples/zh/index.html#chart-type-globe') GL 实例
li#nav-community
a(href='#', class="dropdown-toggle", data-toggle="dropdown") 社区
b.caret
ul.dropdown-menu
li
a(href="https://gallery.echartsjs.com") Gallery
li#nav-tool
a(href='#', class="dropdown-toggle", data-toggle="dropdown") 工具
a(href='#{hostParam}/examples/zh/index.html') 实例
li#nav-resources
a(href='#', class="dropdown-toggle", data-toggle="dropdown") 资源
b.caret
ul.dropdown-menu
li
a(href="#{hostParam}/zh/spreadsheet.html") 表格工具
//- li
//- a(href="https://ecomfe.github.io/echarts-map-tool/") 地图数据在线工具
li
a(href="https://www.echartsjs.com/theme-builder/") 主题构建工具
a(href="#{hostParam}/zh/theme-builder.html") 主题构建工具
li
a(href="#{hostParam}/zh/cheat-sheet.html") 术语速查手册
li
a(href="#{hostParam}/zh/resources.html") 更多资源
li#nav-contribute
a.dropdown-toggle(href='#', data-toggle='dropdown')
| 贡献
| 社区
b.caret
ul.dropdown-menu
li
a(href='#{hostParam}/zh/contributing.html') 如何贡献
a(href='#{hostParam}/zh/committers.html') 贡献者列表
li
a(href='https://github.com/apache/incubator-echarts', target='_blank') 源码(GitHub)
a(href='#{hostParam}/zh/maillist.html') 邮件列表
li
a(href='https://github.com/apache/incubator-echarts/issues', target='_blank') Issues
a(href='#{hostParam}/zh/contributing.html') 如何贡献
li
a(href='#{hostParam}/zh/dependencies.html') 依赖项
li
a(href='#{hostParam}/zh/coding-standard.html') 代码规范
li#nav-about
a(href='#', class="dropdown-toggle", data-toggle="dropdown") 关于
li
a(href='https://github.com/apache/incubator-echarts', target='_blank') 源码(GitHub)
include ./svg/external-link
li
a(href='https://github.com/apache/incubator-echarts/issues', target='_blank') Issues(GitHub)
include ./svg/external-link
li#nav-others
a(href='#', class="dropdown-toggle", data-toggle="dropdown") 其他
b.caret
ul.dropdown-menu
li
a(href='#{hostParam}/zh/committers.html') 贡献者列表
a(href='https://www.apache.org/', target='_blank') Apache Software Foundation
include ./svg/external-link
li
a(href='https://www.apache.org/licenses/') 版权声明
a(href='#{hostParam}/zh/security.html') 安全
li
a(href='#{hostParam}/zh/maillist.html') 邮件列表
a(href='https://www.apache.org/licenses/', target='_blank') 版权
include ./svg/external-link
li
a(href='#{hostParam}/zh/dependencies.html') 依赖项
li
a(href='#{hostParam}/zh/security.html') 安全问题
a(href='https://www.apache.org/foundation/sponsorship.html', target='_blank') 捐赠
include ./svg/external-link
li
a(href='#{hostParam}/zh/faq.html') 常见问题
a(href='https://www.apache.org/foundation/thanks.html', target='_blank') 鸣谢
include ./svg/external-link

ul(class='nav navbar-nav navbar-right')
li#nav-homeen
@@ -0,0 +1,3 @@
svg.icon-external-link(width='15px', height='15px', viewbox='0 0 100 100', version='1.1', xmlns='http://www.w3.org/2000/svg', xmlns:xlink='http://www.w3.org/1999/xlink')
path(fill="currentColor", d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z")
polygon(fill="currentColor", points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9")
@@ -58,7 +58,7 @@ block content

block extra_js
script(type='text/javascript').
document.getElementById('nav-doc').className = 'active';
document.getElementById('nav-resources').className = 'active';

script(src='#{cdnThirdParty.echartsMinJS_4_8_0}')
script(src='#{cdnPayRoot}/#{ecWWWLang}/js/cheat-sheet-en.js?_v_=#{homeVersion}')
@@ -117,6 +117,13 @@ block content
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/plainheart.jpg')
h5.about-name Zhongxiang Wang
.about-desc Henan, China
.col-md-3.col-sm-4.col-xs-6
.about-person
a(href='https://github.com/wf123537200', target='_blank')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/zakwu.jpg?_v_=#{cdnPayVersion}')
h5.about-name Zak Wu
.about-desc Tencent
.about-desc Shenzhen, China



@@ -166,13 +173,6 @@ block content
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/chfw.jpg?_v_=#{cdnPayVersion}')
h5.about-name chfw
.about-desc UK
.col-md-3.col-sm-4.col-xs-6
.about-person
a(href='https://github.com/wf123537200', target='_blank')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/people/zakwu.jpg?_v_=#{cdnPayVersion}')
h5.about-name Zak Wu
.about-desc Tencent
.about-desc Shenzhen, China


h4.group.contributor Contributors
@@ -185,4 +185,4 @@ block content
block extra_js

script(type='text/javascript').
document.getElementById('nav-about').className = 'active';
document.getElementById('nav-contribute').className = 'active';
@@ -25,4 +25,4 @@ block content
block extra_js

script(type='text/javascript').
document.getElementById('nav-about').className = 'active';
document.getElementById('nav-contribute').className = 'active';
@@ -72,7 +72,7 @@ block content
h3 Submit your ECharts extension
p We will get in touch with you as soon as possible, and the extensions you make will be available to ECharts users on this page.
p Thank you again for your support and contribution to ECharts!
a.btn.btn-thirdary(href='mailto:dev@echarts.apache.com')
a.btn.btn-main.btn-thirdary(href='mailto:dev@echarts.apache.com')
img(src='#{cdnPayRoot}/#{ecWWWLang}/images/btn-email.png?_v_=#{cdnPayVersion}')
span Send Email

@@ -30,7 +30,7 @@ block content
section.section-bg#theme-configure-section
.container
#theme-builder
a.btn.btn-thirdary.more-btn(href="https://www.echartsjs.com/theme-builder/") Theme Builder
a.btn.btn-main.btn-thirdary.more-btn(href="#{host}/en/theme-builder.html") Theme Builder
p Make a custom theme and use it for your charts. Currently, this tool has Chinese version only.

section
@@ -63,7 +63,7 @@ block content
p <code>npm install echarts</code>

h3 Option 3: Custom Build
a.btn.btn-thirdary.more-btn(href="builder.html") Customize
a.btn.btn-main.btn-thirdary.more-btn(href="builder.html") Customize
p Choose the features you want and build the file online.

h3 After downloading...
@@ -128,5 +128,5 @@ block content
include ../components/inner-footer
block extra_js
script(type='text/javascript').
document.getElementById('nav-about').className = 'active';
document.getElementById('nav-doc').className = 'active';

@@ -40,4 +40,4 @@ block content
block extra_js

script(type='text/javascript').
document.getElementById('nav-about').className = 'active';
document.getElementById('nav-contribute').className = 'active';

0 comments on commit 6b46ab5

Please sign in to comment.