panweitong 4 years ago
parent
commit
c6d9b7143e
4 changed files with 37 additions and 28 deletions
  1. 4 4
      index.html
  2. 3 2
      index.js
  3. 24 17
      python/index.html
  4. 6 5
      python/index.js

+ 4 - 4
index.html

@@ -236,11 +236,11 @@
                             style="position:relative;padding: 0 25px;">
                             <span class="translatable_connect">连接</span>
                         </a>
-                        <ul id='local_connect_select' class='dropdown-content' style="top:62px">
+                        <ul id='local_connect_select' class='dropdown-content' style="top:62px;overflow: visible;">
                             <li id="plugin_download" href="javaScript:(0)">
                                 <span class="translatable_download_uploader">下载安装程序</span>
                                 <ul id="plugin_mac_or_windows" class='dropdown-content'
-                                    style="display:none; position: fixed; left: 320px; top: 64px;">
+                                    style="display:none; position: absolute; left:139px; top: 0px;">
                                     <li id="Mac" onclick="openUrl('./LenovoBlockpy.pkg')">
                                         <span><img src="./icons/mac-icon.png">Mac</span>
                                     </li>
@@ -255,7 +255,7 @@
                             <li id="button_connection_type">
                                 <span class="translatable_connect_method">连接方式</span>
                                 <ul id="connect_method" class='dropdown-content'
-                                    style="display:none; position: fixed; left: 320px; top: 170px;">
+                                    style="display:none; position: absolute; left: 139px; top: 100px;">
                                     <li id="select_connecteds" style="text-align: center;"
                                         onclick="selectConnectMethods(0)">
                                         <span id="Wired" class="translatable_select_connecteds">有线上传</span>
@@ -278,7 +278,7 @@
                             <li id="local_help_ai">
                                 <span class="translatable_ai_kit">AI Kit</span>
                                 <ul id="local_help_ai_kit" class='dropdown-content'
-                                    style="display:none; position: absolute; left: 139px; top: 0px;">
+                                    style="display:none; position: absolute; left: 139px; top: 0px;overflow: hidden;white-space: nowrap;text-overflow:ellipsis;">
                                     <li id="ai_kit_0" onclick="openUrl('./lxhelp/#/aikit/AI_1')">
                                         <span class="translatable_ai_kit_0">Mac</span>
                                     </li>

+ 3 - 2
index.js

@@ -490,8 +490,9 @@ function styled() {
     // $("#Serial_Interaction").css("marginLeft", "15px");
     // $("#Serial_Display").css("marginLeft", "35px");
     $("#iot_modules").css("width", "170px");
-    $("#plugin_mac_or_windows").css("left", "390px");
-    $("#connect_method").css("left", "390px");
+    $("#plugin_mac_or_windows").css("left", "208px");
+    $("#connect_method").css("left", "208px");
+    $("#connect_method").css("minWidth","155px");
     $("#local_help").addClass("helpEnglish");
     $("#local_help_ai_kit").css("left", "242px");
     $("#help_extends").css("left", "242px");

+ 24 - 17
python/index.html

@@ -236,11 +236,11 @@
                             style="position:relative;padding: 0 25px;">
                             <span class="translatable_connect">连接</span>
                         </a>
-                        <ul id='local_connect_select' class='dropdown-content' style="top:62px">
+                        <ul id='local_connect_select' class='dropdown-content' style="top:62px;overflow: visible;">
                             <li id="plugin_download" href="javaScript:(0)">
                                 <span class="translatable_download_uploader">下载安装程序</span>
                                 <ul id="plugin_mac_or_windows" class='dropdown-content'
-                                    style="display:none; position: fixed; left: 320px; top: 64px;">
+                                    style="display:none; position: absolute; left: 139px; top: 0px;">
                                     <li id="Mac" onclick="openUrl('/blockpy/LenovoBlockpy.pkg')">
                                         <span><img src="./icons/mac-icon.png">Mac</span>
                                     </li>
@@ -255,7 +255,7 @@
                             <li id="button_connection_type">
                                 <span class="translatable_connect_method">连接方式</span>
                                 <ul id="connect_method" class='dropdown-content'
-                                    style="display:none; position: fixed; left: 320px; top: 170px;">
+                                    style="display:none; position: absolute; left: 139px; top: 100px;">
                                     <li id="select_connecteds" style="text-align: center;"
                                         onclick="selectConnectMethods(0)">
                                         <span id="Wired" class="translatable_select_connecteds">有线上传</span>
@@ -276,11 +276,11 @@
                             <span class="translatable_help_board">帮助</span>
 
                         </a>
-                        <ul id='local_help' class='dropdown-content' style="top:62px">
+                        <ul id='local_help' class='dropdown-content' style="top:62px; overflow: visible;">
                             <li id="local_help_ai">
                                 <span class="translatable_ai_kit">AI Kit</span>
                                 <ul id="local_help_ai_kit" class='dropdown-content'
-                                    style="display:none; position: fixed; left: 398px; top: 64px;">
+                                    style="display:none; position: absolute; left: 139px; top: 0px;overflow: hidden;white-space: nowrap;text-overflow:ellipsis;">
                                     <li id="ai_kit_0" onclick="openUrl('/blockpy/lxhelp/#/aikit/AI_1')">
                                         <span class="translatable_ai_kit_0">Mac</span>
                                     </li>
@@ -298,7 +298,7 @@
                             <li id="local_help_extends">
                                 <span class="translatable_extends">拓展转接模组</span>
                                 <ul id="help_extends" class='dropdown-content'
-                                    style="display:none; position: fixed; left: 398px; top: 120px;">
+                                    style="display:none; position: absolute; left: 139px; top: 50px;">
                                     <li id="extends_0" onclick="openUrl('/blockpy/lxhelp/#/extension/EX_01')">
                                         <span class="translatable_extends_0">Mac</span>
                                     </li>
@@ -322,7 +322,8 @@
                             <input type="text" value="A.I. Module" id="iot_modules" readonly
                                 class="selectMode_input browser-default"
                                 style="font-size: 0.9rem;border: none;width: 145px;">
-                            <i class="down" style="position: relative;top: -20px;float: right;"></i>
+                            <i id="down" class="down"
+                                style="position: relative;top: -20px;float: right;right: 9px;"></i>
                             <div class="downbox MouduleBox" id="downboxModule" style="top: 64px;">
                                 <div style="border: none;"><a href="javaScript:(0)" style="color: #424242 !important;"
                                         class="translatable_ai_module">A.I. Module</a></div>
@@ -889,7 +890,7 @@
                                     style='margin-left: 25px;'>Python
                                     Source Code</span> <span id="Serial_Interaction"
                                     class="header-text switch_box1">串口交互窗</span>
-                                    <!-- <i id="repl_delete"
+                                <!-- <i id="repl_delete"
                                     class="material-icons sketch_name_icon right"
                                     style="margin-left: 20px;cursor: pointer;position: absolute;top: 30px;left: 260px;display:none;">delete</i> -->
 
@@ -1026,7 +1027,8 @@
                                     </a>
                                 </div>
 
-                                <div class="card-content" style="padding:0 10px;width:100%;height: 183px;background: #FFFFFF;">
+                                <div class="card-content"
+                                    style="padding:0 10px;width:100%;height: 183px;background: #FFFFFF;">
                                     <div class="row" id="status" style="display: none;">
                                         <div class="col s12"><img id="error-btn" class="activator"
                                                 src="./icons/error.png">
@@ -1037,20 +1039,23 @@
                                     <div class="row" style="width: 100%;margin: 0;margin-top: 20px;">
                                         <div id="uploader-btns" class="col s6">
                                             <a onclick='sendfile();' id="send_file" class="waves-effect
-                                                    waves-light btn blue disabled"
-                                                style="margin-right:2.5rem;padding:0 0.5rem;border-radius: 3px;
+                                                    waves-light btn blue disabled" style="margin-right:2.5rem;padding:0 0.5rem;border-radius: 3px;
                                                 width: 90px;height: 36px;">
                                                 <!-- <i style="cursor: pointer;" class="fa fa-play-circle"
                                                     aria-hidden="true"></i> -->
-                                                <img src="./images/run.png" style="vertical-align: middle;cursor: pointer;margin-right: 5px;">
-                                                <span id="runCode" style="font-size: 14px;color: #FFFFFF;letter-spacing: 0;"></span>
+                                                <img src="./images/run.png"
+                                                    style="vertical-align: middle;cursor: pointer;margin-right: 5px;">
+                                                <span id="runCode"
+                                                    style="font-size: 14px;color: #FFFFFF;letter-spacing: 0;"></span>
                                             </a>
                                             <a onclick="uploadpyfile()" id="uploadpy" class="waves-effect
                                             waves-light btn blue disabled" style="padding:0 0.5rem;border-radius: 3px;
                                             width: 90px;height: 36px;">
                                                 <!-- <i style="cursor: pointer;" class="fa fa-upload" aria-hidden="true"></i> -->
-                                                <img src="./images/uploadCode.png" style="vertical-align: middle;cursor: pointer;margin-right: 5px;">
-                                                <span id="uploadFiles" style="font-size: 14px;color: #FFFFFF;letter-spacing: 0;"></span>
+                                                <img src="./images/uploadCode.png"
+                                                    style="vertical-align: middle;cursor: pointer;margin-right: 5px;">
+                                                <span id="uploadFiles"
+                                                    style="font-size: 14px;color: #FFFFFF;letter-spacing: 0;"></span>
                                             </a>
                                             <div style="float: right;">
                                                 <li style="display: none;">
@@ -1155,10 +1160,12 @@
                                             style="display:none"><span id="gettype">Upload
                                                 files</span></a>
                                     </div> -->
-                                    <div class="row" id="uploader_connect_status" style="margin-top: 16px;display: block;">
+                                    <div class="row" id="uploader_connect_status"
+                                        style="margin-top: 16px;display: block;">
                                         <div class="col s12">
                                             <div style="margin:7px 0;">
-                                                <span class="translatable_uploader_connect_status" style="font-size: 16px;color: #3D3D3D;letter-spacing: 0;">请到"连接"下载安装程序并连接硬件。</span>
+                                                <span class="translatable_uploader_connect_status"
+                                                    style="font-size: 16px;color: #3D3D3D;letter-spacing: 0;">请到"连接"下载安装程序并连接硬件。</span>
                                             </div>
                                         </div>
                                     </div>

+ 6 - 5
python/index.js

@@ -485,12 +485,13 @@ function styled() {
     $("#local_connect_select").addClass("fileEnglish");
     $("#Serial_Interaction").css("marginLeft", "15px");
     $("#Serial_Display").css("marginLeft", "35px");
-    $("#iot_modules").css("width", "120px");
-    $("#plugin_mac_or_windows").css("left", "390px");
-    $("#connect_method").css("left", "390px");
+    $("#iot_modules").css("width", "170px");
+    $("#plugin_mac_or_windows").css("left", "208px");
+    $("#connect_method").css("left", "208px");
+    $("#connect_method").css("minWidth","155px");
     $("#local_help").addClass("helpEnglish");
-    $("#local_help_ai_kit").css("left", "528px");
-    $("#help_extends").css("left", "528px");
+    $("#local_help_ai_kit").css("left", "242px");
+    $("#help_extends").css("left", "242px");
     $("body").css("font-family", "Arial");
     $("input").css("font-family", "Arial");
     $("#downloadbutton-li").css("right", "62px");