Fix macro panel overload UI on some resolutions

Add GRBL as fixed languages list for PR for GRBL_ESP32 as reference
luc-github · Sep 26, 2020 · 67f51ab · 67f51ab
1 parent e1f9a49
commit 67f51ab
Show file tree

Hide file tree

Showing 19 changed files with 13 additions and 3 deletions.
diff --git a/buildLanguagePacks.bat b/buildLanguagePacks.bat
@@ -37,6 +37,9 @@ copy index.html.gz languages\zh_CN
 mkdir languages\uk
 cmd.exe /c gulp package --lang uk
 copy index.html.gz languages\uk
+mkdir languages\grbl
+cmd.exe /c gulp package --lang uk
+copy index.html.gz languages\grbl
 cmd.exe /c gulp package
 mkdir languages\multi
 copy index.html.gz languages\multi

diff --git a/index.html.gz b/index.html.gz
diff --git a/languages/de/index.html.gz b/languages/de/index.html.gz
diff --git a/languages/en/index.html.gz b/languages/en/index.html.gz
diff --git a/languages/es/index.html.gz b/languages/es/index.html.gz
diff --git a/languages/fr/index.html.gz b/languages/fr/index.html.gz
diff --git a/languages/grbl/index.html.gz b/languages/grbl/index.html.gz
diff --git a/languages/hu/index.html.gz b/languages/hu/index.html.gz
diff --git a/languages/it/index.html.gz b/languages/it/index.html.gz
diff --git a/languages/multi/index.html.gz b/languages/multi/index.html.gz
diff --git a/languages/pl/index.html.gz b/languages/pl/index.html.gz
diff --git a/languages/ptbr/index.html.gz b/languages/ptbr/index.html.gz
diff --git a/languages/ru/index.html.gz b/languages/ru/index.html.gz
diff --git a/languages/tr/index.html.gz b/languages/tr/index.html.gz
diff --git a/languages/uk/index.html.gz b/languages/uk/index.html.gz
diff --git a/languages/zh_CN/index.html.gz b/languages/zh_CN/index.html.gz
diff --git a/www/css/style.css b/www/css/style.css
@@ -361,7 +361,8 @@ w25 {
     }
 }
 
-@media (min-width: 1200px) and (max-width: 1350px){
+
+@media (min-width: 800px) and (max-width: 1350px){
     .fixedbutton {
         width: 6em !important;
     }
@@ -391,6 +392,12 @@ w25 {
     }
 }
 
+@media (min-width: 1600px) {
+    .fixedbutton {
+        width: 6em !important;
+    }
+}
+
 @media (min-width: 641px) {
     .container-fluid {
         min-width: 350px;

diff --git a/www/index.html b/www/index.html
@@ -10,7 +10,7 @@
         var target_firmware = "";
     </script>
     <script>
-        var web_ui_version = "2.1b65";
+        var web_ui_version = "2.1b66";
     </script>
     <script>
         var direct_sd = false;

diff --git a/www/sub/controlspanel.html b/www/sub/controlspanel.html
@@ -33,7 +33,7 @@
     </div>
     <div id="control-body" class="panel-body panel-flex-main">
         <div class="row">
-            <div id="JogUI" class="col col-lg-6">
+            <div id="JogUI" class="col col-md-7 col-lg-7">
                 <!-- replaceSVG --><object data="images/jogdial.svg" type="image/svg+xml"></object><!-- /replaceSVG -->
             </div>
             <div class="col col-lg-4 " >