diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css index 3514dcac..5d1997f8 100644 --- a/docs/assets/css/main.css +++ b/docs/assets/css/main.css @@ -9,7 +9,7 @@ a { .markdown-section { max-width: 80%; - margin-top: 50px; + margin-top: 25px; } .markdown-section a { @@ -77,7 +77,7 @@ body[data-page="en/uiflow/uiflow_home_page.md"] article.markdown-section { position: fixed; top:20%; right: 4%; - z-index: 9999; + z-index: 900; } @@ -169,6 +169,7 @@ body[data-page="en/uiflow/uiflow_home_page.md"] article.markdown-section { .dropdown{ display: inline-block; transition:all .25s ease; + color: #343a40; } .dropdown div{ @@ -179,18 +180,20 @@ body[data-page="en/uiflow/uiflow_home_page.md"] article.markdown-section { /* border: 1px solid rgba(0,0,0,.15); border-radius: .25rem; */ transition:all .25s ease; - left: -60px; + left: -44px; text-align: center; - top: 50px; + top: 40px; + z-index: 1001; + } .dropdown:hover { box-shadow: 0px 2px 0 0 #007bff; + color: #007bff; } .dropdown:hover div{ - min-width: 10rem; padding: .5rem 0; margin: .125rem 0 0; @@ -199,11 +202,16 @@ body[data-page="en/uiflow/uiflow_home_page.md"] article.markdown-section { list-style: none; background-clip: padding-box; height: max-content; + box-shadow: 0px 12px 11px 0px #888888; } .dropdown div a:hover{ - color:#007bff; + color:#007bff !important; +} + +.dropdown div a:active{ + background-color:#cccccc !important; } diff --git a/docs/assets/img/product_pics/core/minicore/m5stickc/m5stickc_05.jpg b/docs/assets/img/product_pics/core/minicore/m5stickc/m5stickc_05.jpg deleted file mode 100644 index 559182cf..00000000 Binary files a/docs/assets/img/product_pics/core/minicore/m5stickc/m5stickc_05.jpg and /dev/null differ diff --git a/docs/assets/img/product_pics/core/minicore/m5stickc/m5stickc_05.webp b/docs/assets/img/product_pics/core/minicore/m5stickc/m5stickc_05.webp new file mode 100644 index 00000000..8debc09e Binary files /dev/null and b/docs/assets/img/product_pics/core/minicore/m5stickc/m5stickc_05.webp differ diff --git a/docs/en/case.md b/docs/en/case.md index 78b5d0f1..8963631f 100644 --- a/docs/en/case.md +++ b/docs/en/case.md @@ -1,6 +1,6 @@ # M5Stack Cases {docsify-ignore-all} -## M5Stack Awesome +## M5Stack User Cases * [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/en/core/m5stickc.md b/docs/en/core/m5stickc.md index 72e4f907..e8b67345 100644 --- a/docs/en/core/m5stickc.md +++ b/docs/en/core/m5stickc.md @@ -95,7 +95,7 @@ There are two versions of IMU sensors (MPU6886 and SH200Q) currently available o Power structure block diagram - + **RED LED & IR Transmitter & BUTTON A & BUTTON B** diff --git a/docs/index.html b/docs/index.html index 5659ae97..d3274e4a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -23,8 +23,8 @@ //监听加载状态改变 document.onreadystatechange = completeLoading; //加载状态为complete时隐藏loading效果 - function completeLoading() {   - if (document.readyState == "complete") {     + function completeLoading() { + if (document.readyState == "complete") { var loadingMask = document.getElementById('loading');   loadingMask.style.display = 'none'; // loadingMask.parentNode.removeChild(loadingMask);   @@ -61,19 +61,26 @@
M5Stack Docs
- 中文 +
Github
 @@ -212,67 +219,83 @@ function change_title(language) { if (language == "en") { - $("#language").text("中文"); $("#product").text("Product"); $("#product").attr("href", "#"); - $("#arduino").text("Arduino API"); - $("#arduino").attr("href", "#/en/api"); + $("#arduino").text("Arduino"); + $("#arduino").attr("href", "#en/related_documents/Arduino_IDE"); $("#cases").text("Cases"); $("#cases").attr("href", "#/en/case"); - $("#related").text("Software Tutorial"); - $("#related").attr("href", "#/en/related_documents"); $("#faq").text("FAQ"); $("#faq").attr("href", "#/en/faq"); $("#uiflow").attr("href", "#/en/uiflow/uiflow_home_page"); - } else { - $("#language").text("EN"); + $("#platform span").text("Platform"); + $("#language span").text("Language"); + } + if(language == "zh_CN"){ $("#product").text("产品列表"); $("#product").attr("href", "#/zh_CN/"); - $("#arduino").text("Arduino API"); - $("#arduino").attr("href", "#/zh_CN/api"); - $("#cases").text("用户案例"); + $("#arduino").text("Arduino"); + $("#arduino").attr("href", "#/zh_CN/related_documents/Arduino_IDE"); + $("#cases").text("案例"); $("#cases").attr("href", "#/zh_CN/case"); - $("#related").text("软件教程"); - $("#related").attr("href", "#/zh_CN/related_documents"); $("#faq").text("常见问题"); $("#faq").attr("href", "#/zh_CN/faq"); $("#uiflow").attr("href", "#/zh_CN/uiflow/uiflow_home_page"); + $("#platform span").text("开发平台"); + $("#language span").text("切换语言"); + } + if(language == "ja"){ + $("#product").text("製品リスト"); + $("#product").attr("href", "#/ja/"); + $("#arduino").text("Arduino"); + $("#arduino").attr("href", "#/ja/related_documents/Arduino_IDE"); + $("#cases").text("事例"); + $("#cases").attr("href", "#/ja/case"); + $("#faq").text("問題"); + $("#faq").attr("href", "#/ja/faq"); + $("#uiflow").attr("href", "#/ja/uiflow/uiflow_home_page"); + $("#platform span").text("開発"); + $("#language span").text("言語選択"); } } - - function language() { + function language(language) { var test = window.location.href; - if ((test.indexOf(/en/) == -1) && (test.indexOf(/zh_CN/) == -1)) { - var test2 = test.concat("", "zh_CN/"); + if ((test.indexOf(/en/) == -1) && (test.indexOf(/zh_CN/) == -1) && (test.indexOf(/ja/) == -1)) { + var test2 = test.concat("", language+"/"); window.location.href = test2; - change_title('zh_CN'); + change_title(language); - } else if (test.indexOf(/en/) == -1) { - var test2 = test.replace(/zh_CN/, "en"); + } + if (test.indexOf(/en/) != -1) { + var test2 = test.replace(/en/, language); window.location.href = test2; - change_title('en'); + change_title(language); - } else { - var test2 = test.replace(/en/, "zh_CN"); + }else if(test.indexOf(/zh_CN/) != -1){ + var test2 = test.replace(/zh_CN/, language); window.location.href = test2; - change_title('zh_CN'); - + change_title(language); + }else if(test.indexOf(/ja/) != -1){ + var test2 = test.replace(/ja/, language); + window.location.href = test2; + change_title(language); } + } function page_loading() { var test = window.location.href; - if ((test.indexOf(/en/) == -1) && (test.indexOf(/zh_CN/) == -1)) { + if ((test.indexOf(/en/) == -1) && (test.indexOf(/zh_CN/) == -1)&& (test.indexOf(/ja/) == -1)) { change_title('en'); - - } else if (test.indexOf(/en/) == -1) { - var test2 = test.replace(/zh_CN/, "en"); + } + if(test.indexOf(/en/) != -1){ + change_title('en'); + } + if(test.indexOf(/zh_CN/) != -1){ change_title('zh_CN'); - - } else { - var test2 = test.replace(/en/, "zh_CN"); - change_title('en'); - + } + if(test.indexOf(/ja/) != -1){ + change_title('ja'); } } @@ -282,6 +305,7 @@ scrollTop: (t - 100) }, 500); } + window.onhashchange = page_loading page_loading(); @@ -301,7 +325,7 @@ - --> \ No newline at end of file diff --git a/docs/index.md b/docs/index.md index 45253081..5ccc42e1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -272,8 +272,8 @@ $(".product_page div:last-child").attr("id",product_class_name[i]); } - console.log(product_class[0][0].a); - console.log(product_class[0].length); + // console.log(product_class[0][0].a); + // console.log(product_class[0].length); for (var class_num=0; class_num + **红色 LED & 红外发射管 IR & 按键 BUTTON A & 按键 BUTTON B** @@ -110,7 +110,7 @@ M5StickC仅支持WIN10&Linux&MAC免驱，其余操作系统则需要用户自行 按键 BUTTON B 按键管脚 -**彩色TFT屏幕** +**彩色TFT屏幕** *驱动芯片：ST7735S*