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/07/05 06:29:30 UTC

[echarts-www] 02/02: Merge branch 'master' into feat-bar-racing

This is an automated email from the ASF dual-hosted git repository.

ovilia pushed a commit to branch feat-bar-racing
in repository https://gitbox.apache.org/repos/asf/echarts-www.git

commit 033f5949be60ff52306bb2c86333db87ddcc0721
Merge: 98003c6 d4b97d5
Author: Ovilia <zw...@gmail.com>
AuthorDate: Thu Jul 1 16:15:34 2021 +0800

    Merge branch 'master' into feat-bar-racing

 .gitignore                                         |     4 +-
 README.md                                          |    16 +-
 _jade/components/download.jade                     |    22 +-
 _jade/components/footer.jade                       |    19 +-
 _jade/components/inner-footer.jade                 |     3 +-
 _jade/components/nav-mixin.jade                    |    25 +-
 _jade/components/nav.jade                          |     2 +-
 _jade/components/svg/github.jade                   |     6 +
 _jade/components/svg/index-example.jade            |     2 +
 _jade/components/svg/index-learn.jade              |     2 +
 _jade/components/svg/twitter.jade                  |     5 +
 _jade/components/svg/wechart.jade                  |     6 +
 _jade/components/svg/weibo.jade                    |     9 +
 _jade/en/changelog.jade                            |     6 +-
 _jade/en/cheat-sheet.jade                          |     8 +-
 _jade/en/coding-standard.jade                      |     4 +-
 _jade/en/committers.jade                           |   160 +-
 _jade/en/contributing.jade                         |    24 +-
 _jade/en/dependencies.jade                         |     4 +-
 _jade/en/download-extension.jade                   |     8 +-
 _jade/en/download-map.jade                         |     4 +-
 _jade/en/download-theme.jade                       |     4 +-
 _jade/en/download.jade                             |    24 +-
 _jade/en/events.jade                               |    39 +
 _jade/en/events/2021-05-13-iscas.jade              |   131 +
 _jade/en/faq.jade                                  |    22 +-
 _jade/en/feature.jade                              |    23 +-
 _jade/en/footer.jade                               |    17 +-
 _jade/en/index.jade                                |   275 +-
 _jade/en/maillist.jade                             |     8 +-
 _jade/en/nav-mixin.jade                            |    16 +-
 _jade/en/nav.jade                                  |     2 +-
 _jade/en/resources.jade                            |     6 +-
 _jade/en/security.jade                             |     6 +-
 _jade/en/spreadsheet.jade                          |     4 +-
 _jade/en/theme-builder.jade                        |     2 +-
 _jade/events.jade                                  |     4 +
 _jade/{next => }/examples/editor.jade              |     2 +-
 _jade/{next => }/examples/en/_variablesLang.jade   |     0
 _jade/{next => }/examples/en/editor.jade           |     2 +-
 _jade/{next => }/examples/en/index.jade            |     2 +-
 _jade/{next => }/examples/en/view.jade             |     2 +-
 _jade/{next => }/examples/index.jade               |     2 +-
 _jade/{next => }/examples/view.jade                |     2 +-
 _jade/{next => }/examples/zh/editor.jade           |     2 +-
 _jade/{next => }/examples/zh/index.jade            |     2 +-
 _jade/{next => }/examples/zh/view.jade             |     2 +-
 _jade/layouts/basic.jade                           |    12 +-
 _jade/layouts/doc-old.jade                         |     6 +-
 _jade/layouts/doc.jade                             |    34 +-
 .../{next-redirect.jade => example-redirect.jade}  |     2 +-
 ...ext-example-simple.jade => example-simple.jade} |     8 +-
 _jade/layouts/{next-example.jade => example.jade}  |    20 +-
 _jade/layouts/next-doc.jade                        |    42 -
 _jade/layouts/next-example-redirect.jade           |    15 -
 _jade/layouts/redirect.jade                        |    14 +-
 _jade/layouts/tool-spa.jade                        |    12 +
 _jade/manually-redirect.jade                       |     5 +-
 _jade/next/api.jade                                |     4 -
 _jade/next/en/api.jade                             |    16 -
 _jade/next/en/option-gl.jade                       |    16 -
 _jade/next/en/option.jade                          |    16 -
 _jade/next/en/tutorial.jade                        |    16 -
 _jade/next/option-gl.jade                          |     4 -
 _jade/next/option.jade                             |     4 -
 _jade/next/tutorial.jade                           |     4 -
 _jade/next/zh/api.jade                             |    13 -
 _jade/next/zh/option-gl.jade                       |    13 -
 _jade/next/zh/option.jade                          |    13 -
 _jade/next/zh/tutorial.jade                        |    13 -
 _jade/zh/changelog.jade                            |     4 +-
 _jade/zh/cheat-sheet.jade                          |     6 +-
 _jade/zh/coding-standard.jade                      |     4 +-
 _jade/zh/committers.jade                           |   159 +-
 _jade/zh/contributing.jade                         |    24 +-
 _jade/zh/demo.jade                                 |     6 +-
 _jade/zh/dependencies.jade                         |     6 +-
 _jade/zh/download-extension.jade                   |     4 +-
 _jade/zh/download-map.jade                         |     4 +-
 _jade/zh/download-theme.jade                       |     4 +-
 _jade/zh/download.jade                             |     4 -
 _jade/zh/events.jade                               |    43 +
 _jade/zh/events/2021-05-13-iscas.jade              |   131 +
 _jade/zh/examples.jade                             |    38 -
 _jade/zh/faq.jade                                  |    20 +-
 _jade/zh/feature.jade                              |    11 +-
 _jade/zh/index.jade                                |   279 +-
 _jade/zh/maillist.jade                             |     8 +-
 _jade/zh/resources.jade                            |     6 +-
 _jade/zh/security.jade                             |     6 +-
 _jade/zh/spreadsheet.jade                          |     2 +-
 _jade/zh/theme-builder.jade                        |     2 +-
 _scss/_components.footer.scss                      |    36 +-
 _scss/_components.nav.scss                         |   178 +-
 _scss/_components.page.scss                        |    30 +-
 _scss/_pages.about.scss                            |    13 +-
 _scss/_pages.doc.scss                              |    12 +
 _scss/_pages.events.scss                           |    31 +
 _scss/_pages.examples.charts.scss                  |   132 -
 _scss/_pages.examples.nav.scss                     |   153 -
 _scss/_pages.examples.next.scss                    |     4 -
 _scss/_pages.examples.scss                         |     4 +
 _scss/_pages.index.scss                            |   845 +-
 _scss/_pages.spa.scss                              |     8 +
 _scss/_settings.colors.scss                        |    38 +-
 _scss/main.scss                                    |    47 +-
 asset/font/OpenSans-Bold.ttf                       |   Bin 0 -> 104120 bytes
 asset/font/OpenSans-Regular.ttf                    |   Bin 0 -> 96932 bytes
 asset/font/Open_Sans/LICENSE.txt                   |   202 +
 asset/font/Open_Sans/OpenSans-BoldItalic.ttf       |   Bin 0 -> 92628 bytes
 asset/font/Open_Sans/OpenSans-ExtraBold.ttf        |   Bin 0 -> 102076 bytes
 asset/font/Open_Sans/OpenSans-ExtraBoldItalic.ttf  |   Bin 0 -> 92772 bytes
 asset/font/Open_Sans/OpenSans-Italic.ttf           |   Bin 0 -> 92240 bytes
 asset/font/Open_Sans/OpenSans-Light.ttf            |   Bin 0 -> 101696 bytes
 asset/font/Open_Sans/OpenSans-LightItalic.ttf      |   Bin 0 -> 92488 bytes
 asset/font/Open_Sans/OpenSans-SemiBold.ttf         |   Bin 0 -> 100820 bytes
 asset/font/Open_Sans/OpenSans-SemiBoldItalic.ttf   |   Bin 0 -> 92180 bytes
 asset/lottie/json/analysis.json                    |     1 +
 asset/lottie/json/bg_01.json                       |     1 +
 asset/lottie/json/bg_02.json                       |     1 +
 asset/lottie/json/bg_03.json                       |     1 +
 asset/lottie/json/bg_04.json                       |     1 +
 asset/lottie/json/bg_05.json                       |     1 +
 asset/lottie/json/bg_06.json                       |     1 +
 asset/lottie/json/chart.json                       |     1 +
 asset/lottie/json/compatible.json                  |     1 +
 asset/lottie/json/end_line.json                    |     1 +
 asset/lottie/json/fly.json                         |     1 +
 asset/lottie/json/grown.json                       |     1 +
 asset/lottie/json/images/img_0.png                 |   Bin 0 -> 13403 bytes
 asset/lottie/json/images/img_1.png                 |   Bin 0 -> 3018 bytes
 asset/lottie/json/images/img_2.png                 |   Bin 0 -> 10336 bytes
 asset/lottie/json/images/img_3.png                 |   Bin 0 -> 7371 bytes
 asset/lottie/json/paper.json                       |     1 +
 asset/lottie/json/simple.json                      |     1 +
 asset/lottie/json/start_line.json                  |     1 +
 bin/asset/template/page-en.jade                    |     8 +
 bin/asset/template/page-redirect.jade              |     4 +
 bin/asset/template/page-zh.jade                    |     8 +
 bin/build.js                                       |   127 +-
 bin/createPage.js                                  |    93 +
 bin/release.sh                                     |    77 +-
 bin/releasePages.js                                |    23 +
 bin/uploadBOS.js                                   |    84 -
 builder/build.js                                   |    27 +-
 config/common.js                                   |    12 +-
 config/env.asf.js                                  |     9 +-
 config/env.dev.js                                  |     9 +-
 config/env.localsite.js                            |    11 +-
 config/spa-pages.json                              |     1 +
 ecop-public/asf-email/tpl/announce-release.tpl     |     8 +-
 .../asf-email/tpl/vote-dev-release-result.tpl      |    20 +-
 ecop-public/asf-email/tpl/vote-dev-release.tpl     |    13 +-
 .../asf-email/tpl/vote-general-release-result.tpl  |     4 +-
 ecop-public/asf-email/tpl/vote-urge.tpl            |     2 +-
 images/asf_logo.png                                |   Bin 0 -> 5999 bytes
 images/ercode.jpg                                  |   Bin 0 -> 65663 bytes
 images/event/20200128-apache-echarts-5.png         |   Bin 0 -> 195856 bytes
 images/event/20200128-apache-echarts-5.webp        |   Bin 0 -> 54748 bytes
 images/event/20210513-iscas-en.jpeg                |   Bin 0 -> 139672 bytes
 images/event/20210513-iscas-en.webp                |   Bin 0 -> 49484 bytes
 images/event/20210513-iscas.jpeg                   |   Bin 0 -> 154555 bytes
 images/event/20210513-iscas.webp                   |   Bin 0 -> 55542 bytes
 images/extensions/amap.jpg                         |   Bin 0 -> 70708 bytes
 images/index-home-example.svg                      |    15 +
 images/index-home-learn.svg                        |    15 +
 images/index-home-pie.png                          |   Bin 0 -> 11269 bytes
 images/logo.png                                    |   Bin 3707 -> 21943 bytes
 images/people/qiansheng.jpg                        |   Bin 0 -> 29370 bytes
 "images/people/\346\236\227\345\263\260.jpg"       |   Bin 11455 -> 31340 bytes
 js/download.js                                     |    44 +-
 js/index.js                                        |   153 +-
 legacy/css/font/OpenSans-Bold.ttf                  |   Bin 0 -> 104120 bytes
 legacy/css/font/OpenSans-Regular.ttf               |   Bin 0 -> 96932 bytes
 package.json                                       |     6 +-
 vendors/echarts/echarts-20190709.min.js            |    22 -
 vendors/echarts/echarts-all-2.2.7.js               |    35 -
 vendors/echarts/echarts-all-3.0.0.js               | 50286 -------------------
 vendors/echarts/echarts.simple.min.js              |     7 -
 vendors/echarts/map/js/china.js                    |    27 -
 vendors/echarts/map/js/province/anhui.js           |    27 -
 vendors/echarts/map/js/province/fujian.js          |    27 -
 vendors/echarts/map/js/province/gansu.js           |    27 -
 vendors/echarts/map/js/province/guangdong.js       |    27 -
 vendors/echarts/map/js/province/guangxi.js         |    27 -
 vendors/echarts/map/js/province/guizhou.js         |    27 -
 vendors/echarts/map/js/province/hainan.js          |    27 -
 vendors/echarts/map/js/province/hebei.js           |    27 -
 vendors/echarts/map/js/province/heilongjiang.js    |    27 -
 vendors/echarts/map/js/province/henan.js           |    27 -
 vendors/echarts/map/js/province/hubei.js           |    27 -
 vendors/echarts/map/js/province/hunan.js           |    27 -
 vendors/echarts/map/js/province/jiangsu.js         |    27 -
 vendors/echarts/map/js/province/jiangxi.js         |    27 -
 vendors/echarts/map/js/province/jilin.js           |    27 -
 vendors/echarts/map/js/province/liaoning.js        |    27 -
 vendors/echarts/map/js/province/neimenggu.js       |    27 -
 vendors/echarts/map/js/province/ningxia.js         |    27 -
 vendors/echarts/map/js/province/qinghai.js         |    27 -
 vendors/echarts/map/js/province/shandong.js        |    27 -
 vendors/echarts/map/js/province/shanxi.js          |    27 -
 vendors/echarts/map/js/province/sichuan.js         |    27 -
 vendors/echarts/map/js/province/xicang.js          |    27 -
 vendors/echarts/map/js/province/xinjiang.js        |    27 -
 vendors/echarts/map/js/province/yunnan.js          |    27 -
 vendors/echarts/map/js/province/zhejiang.js        |    27 -
 vendors/echarts/map/js/world.js                    |    27 -
 vendors/echarts/map/json/china.json                |     1 -
 vendors/echarts/map/json/province/anhui.json       |     1 -
 vendors/echarts/map/json/province/fujian.json      |     1 -
 vendors/echarts/map/json/province/gansu.json       |     1 -
 vendors/echarts/map/json/province/guangdong.json   |     1 -
 vendors/echarts/map/json/province/guangxi.json     |     1 -
 vendors/echarts/map/json/province/guizhou.json     |     1 -
 vendors/echarts/map/json/province/hainan.json      |     1 -
 vendors/echarts/map/json/province/hebei.json       |     1 -
 .../echarts/map/json/province/heilongjiang.json    |     1 -
 vendors/echarts/map/json/province/henan.json       |     1 -
 vendors/echarts/map/json/province/hubei.json       |     1 -
 vendors/echarts/map/json/province/hunan.json       |     1 -
 vendors/echarts/map/json/province/jiangsu.json     |     1 -
 vendors/echarts/map/json/province/jiangxi.json     |     1 -
 vendors/echarts/map/json/province/jilin.json       |     1 -
 vendors/echarts/map/json/province/liaoning.json    |     1 -
 vendors/echarts/map/json/province/neimenggu.json   |     1 -
 vendors/echarts/map/json/province/ningxia.json     |     1 -
 vendors/echarts/map/json/province/qinghai.json     |     1 -
 vendors/echarts/map/json/province/shandong.json    |     1 -
 vendors/echarts/map/json/province/shanxi.json      |     1 -
 vendors/echarts/map/json/province/sichuan.json     |     1 -
 vendors/echarts/map/json/province/xicang.json      |     1 -
 vendors/echarts/map/json/province/xinjiang.json    |     1 -
 vendors/echarts/map/json/province/yunnan.json      |     1 -
 vendors/echarts/map/json/province/zhejiang.json    |     1 -
 vendors/echarts/map/json/world.json                |     1 -
 vendors/scrollreveal.js                            |  1546 +
 236 files changed, 3919 insertions(+), 53295 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org