From bf38a6cb851cacf94503ac3b7890929d53cff858 Mon Sep 17 00:00:00 2001
From: jerrykuku <jerrykuku@qq.com>
Date: Sat, 4 Jan 2020 20:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E8=83=BD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=9C=AA=E4=BF=9D=E5=AD=98=E9=85=8D=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?bug=20=E5=90=8C=E6=97=B6=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=B0=8F=E7=9A=84=E6=98=BE=E7=A4=BABug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile                               | 4 ++--
 htdocs/luci-static/argon/css/style.css | 7 +++++--
 luasrc/view/themes/argon/header.htm    | 7 +++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index e7b235b..fdb59b7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Argon Theme
 LUCI_DEPENDS:=
-PKG_VERSION:=1.3
-PKG_RELEASE:=01-20191111
+PKG_VERSION:=1.4
+PKG_RELEASE:=01-20200101
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/htdocs/luci-static/argon/css/style.css b/htdocs/luci-static/argon/css/style.css
index 990adf7..f1d11f5 100644
--- a/htdocs/luci-static/argon/css/style.css
+++ b/htdocs/luci-static/argon/css/style.css
@@ -1429,6 +1429,9 @@ footer > a {
     position: fixed;
     z-index: 100;
 }
+.main-left::-webkit-scrollbar {width: 5px;height: 1px;}
+.main-left::-webkit-scrollbar-thumb {background-color:  #f6f9fc}
+.main-left::-webkit-scrollbar-track {background-color:#fff ;}
 
 
 .main-right {
@@ -1493,6 +1496,7 @@ table > tbody > tr > td, table > tbody > tr > th, table > tfoot > tr > td, table
 
 .cbi-section-table {
     border: none;
+    margin: 0 !important;
 }
 
 
@@ -2350,8 +2354,7 @@ select[multiple="multiple"] {
     overflow-y: visible;
 }
 #cbi-network .cbi-section , #cbi-network .cbi-section .cbi-section-node{
-    overflow-x:auto;
-    overflow-y: visible;
+    
 }
 .cbi-section-node .cbi-value{
     padding: 0.3rem 0rem 0.3rem 1rem;
diff --git a/luasrc/view/themes/argon/header.htm b/luasrc/view/themes/argon/header.htm
index e6efcff..3d6c0ea 100644
--- a/luasrc/view/themes/argon/header.htm
+++ b/luasrc/view/themes/argon/header.htm
@@ -174,9 +174,12 @@
 		-- calculate the number of unsaved changes
 		if tree.nodes[category] and tree.nodes[category].ucidata then
 			local ucichanges = 0
-			local i, j
 			for i, j in pairs(require("luci.model.uci").cursor():changes()) do
-				ucichanges = ucichanges + #j
+				for k, l in pairs(j) do
+					for m, n in pairs(l) do
+						ucichanges = ucichanges + 1;
+					end
+				end
 			end
 
 			if ucichanges > 0 then