Merge branch 'main' into ben-main

Makefile

@@ -8,8 +8,10 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Argon Theme
 LUCI_DEPENDS:=+curl +jsonfilter
-PKG_VERSION:=2.3.1
-PKG_RELEASE:=20230420
+PKG_VERSION:=2.3.2
+PKG_RELEASE:=20231129
+
+CONFIG_LUCI_CSSTIDY:=
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

less/cascade.less

@@ -810,6 +810,41 @@ small {
             margin: 0 1.25rem 1rem 1.25rem;
             flex-grow: 1;
         }
+        .Dashboard {
+            color: var(--gray-dark) !important;
+    
+            h3 {
+                color: var(--gray-dark);
+            }
+    
+            p {
+                margin-bottom: 3px;
+                margin-top: 3px;
+            }
+    
+            hr {
+                border-top: 1px solid rgba(0, 0, 0, 1);
+            }
+    
+            .dashboard-bg {
+                background-color: #fff;
+            }
+    
+            .settings-info {
+                padding-top: 1em;
+                padding-bottom: 1em;
+
+                p span:nth-child(2) {
+                    max-height: 18.5px;
+                    top: 4px;
+                }
+    
+                .label {
+                    font-size: .7rem;
+                    padding: 0.2rem 0.6rem;
+                }
+            }
+        }
     }
 }
 

less/dark.less

@@ -891,3 +891,36 @@ input,
 
 
 }
+[data-page="admin-dashboard"] {
+    .main-right > #maincontent {
+        .Dashboard {
+            color: #ccc !important;
+
+            h3 {
+                color: #ccc;
+            }
+
+            hr {
+                border-top: 1px solid rgba(255, 255, 255, 1);
+            }
+
+            .dashboard-bg {
+                background-color: #333333;
+            }
+        }
+
+        .router-status-info .title img,
+        .lan-info .title img,
+        .wifi-info .title img {
+            filter: invert(90%);
+        }
+
+        tr {
+            border-top: thin solid #4d4d4d;
+
+            &:last-child {
+                border-bottom: thin solid #4d4d4d;
+            }
+        }
+    }
+}