m5/m5-docs
0
0
Fork 0
mirror of https://github.com/m5stack/m5-docs.git synced 2026-05-20 10:23:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/m5stack/m5-docs

Browse Source
This commit is contained in:
vany5921
2019-10-12 17:48:43 +08:00
parent 7c6a5fce94 d027762193
commit 0cbe3ab65e
4 changed files with 108 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/main.css
+9 -3
View File
@@ -285,16 +285,22 @@ div.card-img-overlay:hover {
.pc-navigation {
position:fixed;
top:20%;
left:5%;
left:4%;
}
.pc-navigation button {
font-weight: bold;
height: 53px;
}
.mb-navigation {
display: none;
}
.product_page {
margin-left:125px;
margin-top:55px;
margin-left:110px;
margin-top:100px;
}
.search{
docs/index.html
+1 -1
View File
@@ -273,7 +273,7 @@
function page_move(divId) {
var t = $("#" + divId).offset().top;
$('html, body').animate({
scrollTop: (t - 50)
scrollTop: (t - 100)
}, 500);
}
page_loading();
docs/index.md
+50 -46
View File
@@ -1,5 +1,5 @@
<div class="pc-navigation">
<div class="btn-group-vertical" style="width: 160px;">
<div class="btn-group-vertical" style="width: 200px;">
<div class="btn-group">
<button id="core-btn" type="button" class="btn btn-primary" onclick="select(this)">Core</button>
</div>
@@ -25,7 +25,7 @@
<hr>
<div class="btn-group-vertical" style="width: 160px;">
<div class="btn-group-vertical" style="width: 200px;">
<a class="btn btn btn-primary" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/I2C_Address.pdf" role="button" style="color:white;text-decoration:none" target="view_window">I2C Address Table</a>
<a class="btn btn btn-primary" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/Product_compared.pdf" role="button" style="color:white;text-decoration:none" target="view_window">Product Comparison</a>
</div>
@@ -80,7 +80,7 @@
<div id="core">
**M5Core**
**M5Core/Kit**
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Core QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Core_I2C">I2C AddressTable</a>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -108,43 +108,6 @@
</a>
</div>
**M5Stick**
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5stick/m5stick_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Stick QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickc/m5stickc_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickC QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickv/m5stickv_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickV QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Stick_Compare">M5Stick comparison »</a> -->
<div class="item">
<a href="/#/en/core/m5stick">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/core_m5stick_01.png">
<p class="item-title">M5Stick</p>
</a>
</div>
<div class="item">
<a href="/#/en/core/m5stickc">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/core_m5stickc_01.png">
<p class="item-title">M5StickC</p>
</a>
</div>
<div class="item">
<a href="/#/en/core/m5stickv">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/m5stickv_01.jpg">
<p class="item-title">M5StickV</p>
</a>
</div>
**M5GO/FACES Kit**
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5GO QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">FACES-kit QuickStart »</a> -->
<div class="item">
<a href="/#/en/core/m5go_lite">
@@ -167,6 +130,46 @@
</a>
</div>
**M5Stick**
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5stick/m5stick_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Stick QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickc/m5stickc_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickC QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickv/m5stickv_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickV QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Stick_Compare">M5Stick comparison »</a> -->
<div class="item">
<a href="/#/en/core/m5stick">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/core_m5stick_01.png" height="150px">
<p class="item-title">M5Stick</p>
</a>
</div>
<div class="item">
<a href="/#/en/core/m5stickc">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/core_m5stickc_01.png">
<p class="item-title">M5StickC</p>
</a>
</div>
<div class="item">
<a href="/#/en/core/m5stickv">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/m5stickv_01.jpg">
<p class="item-title">M5StickV</p>
</a>
</div>
<!-- **M5GO/FACES Kit** -->
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5GO QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">FACES-kit QuickStart »</a> -->
</div>
@@ -999,7 +1002,7 @@
<div class="item">
<a href="/#/en/1515/6060-push">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/1515/6060_push_01.jpg">
<p class="item-title"> 6060-PUSH</p>
<p class="item-title">6060-PUSH</p>
</a>
</div>
@@ -1163,14 +1166,14 @@
<div class="item">
<a href="/#/en/1515/connectors">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/1515/ap_30_01.jpg">
<p class="item-title"> Connector</p>
<p class="item-title">Connector</p>
</a>
</div>
<div class="item">
<a href="/#/en/1515/ap">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/1515/ap_ap_01.jpg">
<p class="item-title"> Aluminium-Profile</p>
<p class="item-title">Aluminium-Profile</p>
</a>
</div>
</div>
@@ -1190,10 +1193,11 @@
$("#core div.item a").append(mask_html);
$("#unit div.item a:lt(4)").append(mask_html);
$("#core .mask a").attr("href", "#en/quick_start/m5core/m5stack_core_quick_start");
$("#core .mask a").eq(3).attr("href", "#en/quick_start/m5stick/m5stick_quick_start");
$("#core .mask a").eq(4).attr("href", "#en/quick_start/m5stickc/m5stickc_quick_start");
$("#core .mask a").eq(5).attr("href", "#en/quick_start/m5stickv/m5stickv_quick_start");
$("#core .mask a").eq(6).attr("href", "#en/quick_start/m5stick/m5stick_quick_start");
$("#core .mask a").eq(7).attr("href", "#en/quick_start/m5stickc/m5stickc_quick_start");
$("#core .mask a").eq(8).attr("href", "#en/quick_start/m5stickv/m5stickv_quick_start");
$("#unit .mask a").attr("href", "#en/quick_start/m5camera/m5camera_quick_start");
$(".product_page strong").parent('p').css("margin-bottom","0px");
});
docs/zh_CN/README.md
+48 -47
View File
@@ -1,5 +1,5 @@
<div class="pc-navigation">
<div class="btn-group-vertical" style="width: 160px;">
<div class="btn-group-vertical" style="width: 200px;">
<div class="btn-group">
<button id="core-btn" type="button" class="btn btn-primary" onclick="select(this)">Core</button>
</div>
@@ -23,7 +23,7 @@
</div>
</div>
<hr>
<div class="btn-group-vertical" style="width: 160px;">
<div class="btn-group-vertical" style="width: 200px;">
<a class="btn btn btn-primary" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/I2C_Address.pdf" role="button" style="color:white;text-decoration:none" target="view_window">I2C地址表格</a>
<a class="btn btn btn-primary" href="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_table/Product_compared.pdf" role="button" style="color:white;text-decoration:none" target="view_window">产品参数表格</a>
</div>
@@ -84,7 +84,7 @@
<div id="core">
**M5Core**
**M5Core/Kit**
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Core QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Core_I2C">I2C AddressTable</a>&nbsp;&nbsp;&nbsp;&nbsp;
@@ -112,43 +112,6 @@
</a>
</div>
**M5Stick**
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5stick/m5stick_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Stick QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickc/m5stickc_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickC QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickv/m5stickv_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickV QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Stick_Compare">M5Stick comparison »</a> -->
<div class="item">
<a href="/#/zh_CN/core/m5stick">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/core_m5stick_01.png">
<p class="item-title">M5Stick</p>
</a>
</div>
<div class="item">
<a href="/#/zh_CN/core/m5stickc">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/core_m5stickc_01.png">
<p class="item-title">M5StickC</p>
</a>
</div>
<div class="item">
<a href="/#/zh_CN/core/m5stickv">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/m5stickv_01.jpg">
<p class="item-title">M5StickV</p>
</a>
</div>
**M5GO/FACES Kit**
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5GO QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">FACES-kit QuickStart »</a> -->
<div class="item">
<a href="/#/zh_CN/core/m5go_lite">
@@ -171,6 +134,43 @@
</a>
</div>
**M5Stick**
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5stick/m5stick_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5Stick QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickc/m5stickc_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickC QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5stickv/m5stickv_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5StickV QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="https://shimo.im/sheets/GWkjHV3XyCCgwDpQ" role="button" style="color:white;margin-top:10px;text-decoration:none" data-toggle="modal" data-target="#Stick_Compare">M5Stick comparison »</a> -->
<div class="item">
<a href="/#/zh_CN/core/m5stick">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/core_m5stick_01.png" height="150px">
<p class="item-title">M5Stick</p>
</a>
</div>
<div class="item">
<a href="/#/zh_CN/core/m5stickc">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/core_m5stickc_01.png">
<p class="item-title">M5StickC</p>
</a>
</div>
<div class="item">
<a href="/#/zh_CN/core/m5stickv">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/core/m5stickv_01.jpg">
<p class="item-title">M5StickV</p>
</a>
</div>
<!-- **M5GO/FACES Kit** -->
<!-- <a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">M5GO QuickStart</a>&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn btn-primary" href="#en/quick_start/m5core/m5stack_core_quick_start" role="button" style="color:white;margin-top:10px;text-decoration:none">FACES-kit QuickStart »</a> -->
</div>
@@ -1002,7 +1002,7 @@
<div class="item">
<a href="/#/zh_CN/1515/6060-push">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/1515/6060_push_01.jpg">
<p class="item-title"> 6060-PUSH</p>
<p class="item-title">6060-PUSH</p>
</a>
</div>
@@ -1147,7 +1147,7 @@
<div id="aluminium">
**Aluminium Profil**
**Aluminium-Profil**
<div class="item">
<a href="/#/zh_CN/1515/corner">
@@ -1166,14 +1166,14 @@
<div class="item">
<a href="/#/zh_CN/1515/connectors">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/1515/ap_30_01.jpg">
<p class="item-title"> Connector</p>
<p class="item-title">Connector</p>
</a>
</div>
<div class="item">
<a href="/#/zh_CN/1515/ap">
<img src="https://m5stack.oss-cn-shenzhen.aliyuncs.com/image/m5-docs_homepage/1515/ap_ap_01.jpg">
<p class="item-title"> Aluminium-Profile</p>
<p class="item-title">Aluminium-Profile</p>
</a>
</div>
</div>
@@ -1194,10 +1194,11 @@
$("#core div.item a").append(mask_html);
$("#unit div.item a:lt(4)").append(mask_html);
$("#core .mask a").attr("href", "#zh_CN/quick_start/m5core/m5stack_core_quick_start");
$("#core .mask a").eq(3).attr("href", "#zh_CN/quick_start/m5stick/m5stick_quick_start");
$("#core .mask a").eq(4).attr("href", "#zh_CN/quick_start/m5stickc/m5stickc_quick_start");
$("#core .mask a").eq(5).attr("href", "#zh_CN/quick_start/m5stickv/m5stickv_quick_start");
$("#core .mask a").eq(6).attr("href", "#zh_CN/quick_start/m5stick/m5stick_quick_start");
$("#core .mask a").eq(7).attr("href", "#zh_CN/quick_start/m5stickc/m5stickc_quick_start");
$("#core .mask a").eq(8).attr("href", "#zh_CN/quick_start/m5stickv/m5stickv_quick_start");
$("#unit .mask a").attr("href", "#zh_CN/quick_start/m5camera/m5camera_quick_start");
$(".product_page strong").parent('p').css("margin-bottom","0px");
});