Merge pull request #16 from domoticz/beta

V1.15.5
domoticz · Jul 3, 2020 · 3f2fdc7 · 3f2fdc7
2 parents 73386b3 + 4a3005e
commit 3f2fdc7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/css/dashboard_mobile.css b/css/dashboard_mobile.css
@@ -115,6 +115,7 @@ body.dashMobile table.mobileitem td.name a:after {
     color: inherit;
     font-size: 12px;
     text-align: center;
+    width: 18px;
 }
 
 body.dashMobile table.mobileitem td#status,

diff --git a/custom.css b/custom.css
@@ -118,7 +118,7 @@ h4,
 #logdata,
 #logdata_status,
 #logdata_error {
-    background: var(--main-item-bg-color);
+    background: var(--main-navbar-bg-color);
 }
 
 .lognorm {
@@ -1175,7 +1175,7 @@ button.savebtn:disabled {
 
 .display .ui-widget-content {
     background: transparent;
-    color: black;
+    color: var(--main-text-color);
     border: none;
     border-bottom: 1px solid var(--main-blue-color);
 }
@@ -1216,7 +1216,10 @@ table.dataTable thead th {
 .dataTables_wrapper tr.even {
     height: 45px;
     color: var(--main-text-color) !important;
-    background-color: transparent;
+}
+
+.dataTables_wrapper tr.odd {
+    background-color: var(--main-disabled-color);
 }
 
 .dataTables_wrapper tr.even {
@@ -1406,8 +1409,13 @@ input#AcceptNewHardware:checked ~ button {
     border-radius: 0;
     border: none;
     border-bottom: 1px solid var(--main-blue-color);
+    color: var(--main-text-color);
     font-family: main-font;
 }
+select.ui-corner-all option {
+    background: var(--main-navbar-bg-color);
+}
+
 /* =Setup */
 /* Footer */
 /* =Footer */

diff --git a/custom.js b/custom.js
@@ -129,6 +129,7 @@ function init_theme() {
             mutations.forEach(function(mutation) {
                 $("#main-view").children("div.container").removeClass("container").addClass("container-fluid");
                 removeRowDivider();
+                setCorrectDashboardLinksforMobile();
             });
         });
         var targetNode = document.getElementById("holder");

diff --git a/js/devices.js b/js/devices.js
@@ -11,6 +11,14 @@ function setDevicesNativeSelectorForMobile() {
     });
 }
 
+function setCorrectDashboardLinksforMobile() {
+    if (!isMobile) return;
+    $("table.mobileitem td#name > img").each(function() {
+        var script = $(this).attr("onclick");
+        $(this).wrap('<a onclick="' + script + '"></a>');
+    });
+}
+
 function setAllDevicesFeatures() {
     switchState = {
         on: $.t("On"),

diff --git a/theme.json b/theme.json
@@ -3,7 +3,7 @@
     "name": "Machinon",
     "description": "Machinon custom theme, simple and light",
     "license": "GNU General Public License v3.0",
-    "version":"1.15.4",
+    "version":"1.15.5",
     "author": "EdddieN",
     "homepage": "https://www.machinon.com",
     "wiki": "https://www.domoticz.com/wiki/Machinon_Theme",