From 855381362a582d7bb5df8b2998cef91b4127d254 Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Mon, 28 Oct 2019 15:20:15 +0800 Subject: [PATCH 1/6] change demo-board quickstart link --- docs/assets/css/main.css | 5 ----- docs/en/app/demo-board.md | 8 ++------ docs/index.html | 13 +++++++++++++ docs/zh_CN/app/demo-board.md | 8 +------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css index acc900de..51a01022 100644 --- a/docs/assets/css/main.css +++ b/docs/assets/css/main.css @@ -475,11 +475,6 @@ body[data-page="zh_CN/README.md"] .search { margin-right: 0px; width: 130px; } - .back_top { - position: fixed; - right: 10px; - bottom: 150px; - } .item { width: 130px; margin-right: 10px; diff --git a/docs/en/app/demo-board.md b/docs/en/app/demo-board.md index 574152fb..f36a17b8 100644 --- a/docs/en/app/demo-board.md +++ b/docs/en/app/demo-board.md @@ -4,7 +4,7 @@ *** -:memo:**[Description](#Description)**    :electric_plug:**[Schematic](#Schematic)**    :bulb:**[Quick Start](#Quick-Start)**    :octocat:**[Example](#Example)**    🛒**[Purchase](https://m5stack.com/collections/m5-application/products/iot-learning-kit)**       +:memo:**[Description](#Description)**    :electric_plug:**[Schematic](#Schematic)**    :bulb:**[Manual](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/Demo-Board_en.pdf)**    :octocat:**[Example](#Example)**    🛒**[Purchase](https://m5stack.com/collections/m5-application/products/iot-learning-kit)**       @@ -28,7 +28,7 @@ - step motor with four-phase five-wire - Radio frequency identification Reader - RS-458，RS232 series communication - + ## Include @@ -43,10 +43,6 @@ - -

Quick-Start

- - ## EasyLoader diff --git a/docs/index.html b/docs/index.html index e9555460..d582a419 100644 --- a/docs/index.html +++ b/docs/index.html @@ -300,4 +300,17 @@ gtag('config', 'UA-138139529-2'); + + + + \ No newline at end of file diff --git a/docs/zh_CN/app/demo-board.md b/docs/zh_CN/app/demo-board.md index 2b1446f5..6aa5f08b 100644 --- a/docs/zh_CN/app/demo-board.md +++ b/docs/zh_CN/app/demo-board.md @@ -4,7 +4,7 @@ * * * -:memo:**[描述](#描述)**   :electric_plug:**[原理图](#原理图)**   :bulb:**[上手指南](#上手指南)**   :octocat:**[例程](#例程)**   🛒**[购买链接](https://m5stack.com/collections/m5-application/products/iot-learning-kit)**       +:memo:**[描述](#描述)**   :electric_plug:**[原理图](#原理图)**   :bulb:**[上手指南](https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/Demo-Board_cn.pdf)**   :octocat:**[例程](#例程)**   🛒**[购买链接](https://m5stack.com/collections/m5-application/products/iot-learning-kit)**       ## 描述 @@ -48,12 +48,6 @@ - - -

上手指南

- ## EasyLoader From b1dac075d1afdf48777658fdbc796ea79374f6b2 Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Mon, 28 Oct 2019 15:48:24 +0800 Subject: [PATCH 2/6] add Hotjar --- docs/assets/css/main.css | 5 +++++ docs/index.html | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css index 51a01022..d8418cfa 100644 --- a/docs/assets/css/main.css +++ b/docs/assets/css/main.css @@ -776,4 +776,9 @@ body[data-page="zh_CN/README.md"] .search { mark { background-color: #007bff; color:white; +} + + +._hj-f5b2a1eb-9b07_feedback_minimized{ + display: none; } \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index d582a419..22373256 100644 --- a/docs/index.html +++ b/docs/index.html @@ -312,5 +312,4 @@ })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv='); - \ No newline at end of file From 1c5a23fa31fe9e57f3174c0d8dcf58e78de48b44 Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Mon, 28 Oct 2019 15:49:49 +0800 Subject: [PATCH 3/6] change css file --- docs/assets/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css index d8418cfa..32add8a9 100644 --- a/docs/assets/css/main.css +++ b/docs/assets/css/main.css @@ -779,6 +779,6 @@ mark { } -._hj-f5b2a1eb-9b07_feedback_minimized{ +#_hj-f5b2a1eb-9b07_feedback_minimized{ display: none; } \ No newline at end of file From 81fecaa4f4d4a48b9b55d0a3042ee59ad715a2e8 Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Mon, 28 Oct 2019 16:31:54 +0800 Subject: [PATCH 4/6] change css file --- docs/assets/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css index 32add8a9..c8c7315b 100644 --- a/docs/assets/css/main.css +++ b/docs/assets/css/main.css @@ -779,6 +779,6 @@ mark { } -#_hj-f5b2a1eb-9b07_feedback_minimized{ +#_hj_feedback_container{ display: none; } \ No newline at end of file From d18c7554b3d73d14433b3ba88b273c7b8ad19818 Mon Sep 17 00:00:00 2001 From: shaoxiang <1026025056@qq.com> Date: Tue, 29 Oct 2019 12:04:41 +0800 Subject: [PATCH 5/6] change Core screen information --- docs/en/core/basic.md | 4 ++-- docs/en/core/fire.md | 4 ++-- docs/en/core/gray.md | 4 ++-- docs/en/core/m5go.md | 4 ++-- docs/en/core/m5go_lite.md | 4 ++-- docs/zh_CN/case.md | 2 -- docs/zh_CN/core/basic.md | 4 ++-- docs/zh_CN/core/fire.md | 4 ++-- docs/zh_CN/core/gray.md | 4 ++-- docs/zh_CN/core/m5go.md | 4 ++-- docs/zh_CN/core/m5go_lite.md | 4 ++-- 11 files changed, 20 insertions(+), 22 deletions(-) diff --git a/docs/en/core/basic.md b/docs/en/core/basic.md index 5ed2a82b..7cd31379 100644 --- a/docs/en/core/basic.md +++ b/docs/en/core/basic.md @@ -165,8 +165,8 @@ The newly-produced M5Core replaces the screen with better display performance an TypeC x 1, GROVE(I2C+I/0+UART) x 1 - LCD Screen - 2 inch, 320x240 Colorful TFT LCD, ILI9341 + IPS Screen + 2 inch, 320x240 Colorful TFT LCD, ILI9342C Speaker diff --git a/docs/en/core/fire.md b/docs/en/core/fire.md index 940cf9ab..5709ae85 100644 --- a/docs/en/core/fire.md +++ b/docs/en/core/fire.md @@ -213,8 +213,8 @@ The GPIO 16 / 17 in Fire is connected to the PSRAM by default, so when you conne TypeC x 1, GROVE(I2C+I/0+UART) x 1 - LCD Screen - 2 inch, 320x240 Colorful TFT LCD, ILI9341 + IPS Screen + 2 inch, 320x240 Colorful TFT LCD, ILI9342C Speaker diff --git a/docs/en/core/gray.md b/docs/en/core/gray.md index 2aa488d2..85d8cf70 100644 --- a/docs/en/core/gray.md +++ b/docs/en/core/gray.md @@ -204,8 +204,8 @@ The newly-produced M5Core replaces the screen with better display performance an TypeC x 1, GROVE(I2C+I/0+UART) x 1 - LCD Screen - 2 inch, 320x240 Colorful TFT LCD, ILI9341 + IPS Screen + 2 inch, 320x240 Colorful TFT LCD, ILI9342C Speaker diff --git a/docs/en/core/m5go.md b/docs/en/core/m5go.md index 53fd4e6d..600bdce5 100644 --- a/docs/en/core/m5go.md +++ b/docs/en/core/m5go.md @@ -199,8 +199,8 @@ The newly-produced M5Core replaces the screen with better display performance an TypeC x 1, GROVE(I2C+I/0+UART) x 1 - LCD Screen - 2 inch, 320x240 Colorful TFT LCD, ILI9341 + IPS Screen + 2 inch, 320x240 Colorful TFT LCD, ILI9342C Speaker diff --git a/docs/en/core/m5go_lite.md b/docs/en/core/m5go_lite.md index ff698c3c..99b1b8a7 100644 --- a/docs/en/core/m5go_lite.md +++ b/docs/en/core/m5go_lite.md @@ -196,8 +196,8 @@ The newly-produced M5Core replaces the screen with better display performance an TypeC x 1, GROVE(I2C+I/0+UART) x 1 - LCD Screen - 2 inch, 320x240 Colorful TFT LCD, ILI9341 + IPS Screen + 2 inch, 320x240 Colorful TFT LCD, ILI9342C Speaker diff --git a/docs/zh_CN/case.md b/docs/zh_CN/case.md index cf6e1086..94aef2b3 100644 --- a/docs/zh_CN/case.md +++ b/docs/zh_CN/case.md @@ -1,7 +1,5 @@ # M5Stack案例 {docsify-ignore-all} -## STEM Education案例 - ## M5Stack优秀作品 * [M5Stack-SD-Updater](https://github.com/tobozo/M5Stack-SD-Updater) - Customizable menu system for M5Stack - loads apps from the Micro SD card diff --git a/docs/zh_CN/core/basic.md b/docs/zh_CN/core/basic.md index 797e10ba..aba9b2c6 100644 --- a/docs/zh_CN/core/basic.md +++ b/docs/zh_CN/core/basic.md @@ -163,8 +163,8 @@ M5Stack Basic 由两个可分离部分堆叠组成. 顶部放置了电路板， TypeC x 1, GROVE(I2C+I/0+UART) x 1 - LCD屏幕 - 2 inch, 320x240 Colorful TFT LCD, ILI9341 + IPS屏幕 + 2 inch, 320x240 Colorful TFT LCD, ILI9342C 喇叭 diff --git a/docs/zh_CN/core/fire.md b/docs/zh_CN/core/fire.md index 084109f1..bd0c354a 100644 --- a/docs/zh_CN/core/fire.md +++ b/docs/zh_CN/core/fire.md @@ -210,8 +210,8 @@ Fire 中的 GPIO 16 / 17 默认与PSRAM连接，因此当你在连接或是堆 TypeC x 1, GROVE(I2C+I/0+UART) x 1 - LCD屏幕 - 2 inch, 320x240 Colorful TFT LCD, ILI9341 + IPS屏幕 + 2 inch, 320x240 Colorful TFT LCD, ILI9342C 喇叭 diff --git a/docs/zh_CN/core/gray.md b/docs/zh_CN/core/gray.md index 9bba1270..63842db4 100644 --- a/docs/zh_CN/core/gray.md +++ b/docs/zh_CN/core/gray.md @@ -195,8 +195,8 @@ TypeC x 1, GROVE(I2C+I/0+UART) x 1 - LCD屏幕 - 2 inch, 320x240 Colorful TFT LCD, ILI9341 + IPS屏幕 + 2 inch, 320x240 Colorful TFT LCD, ILI9342C 喇叭 diff --git a/docs/zh_CN/core/m5go.md b/docs/zh_CN/core/m5go.md index 7e98da2b..b86c79cc 100644 --- a/docs/zh_CN/core/m5go.md +++ b/docs/zh_CN/core/m5go.md @@ -194,8 +194,8 @@ TypeC x 1, GROVE(I2C+I/0+UART) x 1 - LCD屏幕 - 2 inch, 320x240 Colorful TFT LCD, ILI9341 + IPS屏幕 + 2 inch, 320x240 Colorful TFT LCD, ILI9342C 喇叭 diff --git a/docs/zh_CN/core/m5go_lite.md b/docs/zh_CN/core/m5go_lite.md index 74ffaa1d..f17e90b5 100644 --- a/docs/zh_CN/core/m5go_lite.md +++ b/docs/zh_CN/core/m5go_lite.md @@ -197,8 +197,8 @@ TypeC x 1, GROVE(I2C+I/0+UART) x 1 - LCD屏幕 - 2 inch, 320x240 Colorful TFT LCD, ILI9341 + IPS屏幕 + 2 inch, 320x240 Colorful TFT LCD, ILI9342C 喇叭 From 52bde32d5fdf170af7aacf10647bed7d6dd06169 Mon Sep 17 00:00:00 2001 From: Sean <1026025056@qq.com> Date: Tue, 29 Oct 2019 16:58:52 +0800 Subject: [PATCH 6/6] change related nav position --- docs/assets/css/main.css | 2 +- docs/en/case.md | 4 ---- docs/index.html | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css index c8c7315b..6b8752ae 100644 --- a/docs/assets/css/main.css +++ b/docs/assets/css/main.css @@ -90,7 +90,7 @@ body[data-page="en/uiflow/uiflow_home_page.md"] article.markdown-section { position: fixed; top:20%; - right: 100px; + right: 4%; z-index: 9999; } diff --git a/docs/en/case.md b/docs/en/case.md index f90d9a85..78b5d0f1 100644 --- a/docs/en/case.md +++ b/docs/en/case.md @@ -1,9 +1,5 @@ # M5Stack Cases {docsify-ignore-all} - - -## STEM Education Cases - ## M5Stack Awesome * [M5Stack-SD-Updater](https://github.com/tobozo/M5Stack-SD-Updater) - Customizable menu system for M5Stack - loads apps from the Micro SD card diff --git a/docs/index.html b/docs/index.html index 22373256..5659ae97 100644 --- a/docs/index.html +++ b/docs/index.html @@ -68,7 +68,7 @@ MicroPython API - M5Stack Cases + Cases UIFlow Software Tutorial FAQ @@ -217,7 +217,7 @@ $("#product").attr("href", "#"); $("#arduino").text("Arduino API"); $("#arduino").attr("href", "#/en/api"); - $("#cases").text("M5Stack Cases"); + $("#cases").text("Cases"); $("#cases").attr("href", "#/en/case"); $("#related").text("Software Tutorial"); $("#related").attr("href", "#/en/related_documents");