2023-04-20T16:12:19

ObcbO · Apr 20, 2023 · 74b5d2c · 74b5d2c
1 parent 22b4cd1
commit 74b5d2c
Show file tree

Hide file tree

Showing 9 changed files with 952 additions and 884 deletions.
diff --git a/luci-theme-argon/Makefile b/luci-theme-argon/Makefile
@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Argon Theme
 LUCI_DEPENDS:=+curl +jsonfilter
-PKG_VERSION:=2.3
-PKG_RELEASE:=20230403
+PKG_VERSION:=2.3.1
+PKG_RELEASE:=20230420
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

diff --git a/luci-theme-argon/README.md b/luci-theme-argon/README.md
@@ -81,7 +81,7 @@ The table below will provide a detailed introduction:
 
 ## Version History
 
-The latest version is v2.3. [Click here][en-us-release-log] to view the full version history record.
+The latest version is v2.3.1 [Click here][en-us-release-log] to view the full version history record.
 
 ## Getting started
 

diff --git a/luci-theme-argon/README_ZH.md b/luci-theme-argon/README_ZH.md
@@ -81,7 +81,7 @@ Argon 是**一款干净整洁的 OpenWrt LuCI 主题**，
 
 ## 版本历史
 
-当前最新的版本为 v2.3. [点击这里][zh-cn-release-log]查看完整的版本历史日志.
+当前最新的版本为 v2.3.1 [点击这里][zh-cn-release-log]查看完整的版本历史日志.
 
 ## 快速开始
 

diff --git a/luci-theme-argon/RELEASE.md b/luci-theme-argon/RELEASE.md
@@ -1,5 +1,13 @@
 # Update log for master branch
 
+## v2.3.1 [ 2023.04.20 ]
+
+- Fixed the issue where the dropdown menu was being clipped.
+- Fixed the problem where the exit icon was replaced with the app store icon.
+- Fixed the issue where some colors were out of control in dark mode.
+- Fixed the problem where the local startup script textarea could not be scrolled in the startup item.
+- Fixed the problem where the Passwall node list button was misaligned.
+
 ## v2.3 [ 2023.04.03 ]
 
 - Updated the style of Loading.

diff --git a/luci-theme-argon/RELEASE_ZH.md b/luci-theme-argon/RELEASE_ZH.md
@@ -1,5 +1,13 @@
 # Master 分支的更新日志
 
+## v2.3.1 [ 2023.04.20 ]
+
+- 修复了下拉菜单被裁切的问题
+- 修复了退出图标变成了应用商店图标的问题
+- 修复了暗色模式下个别颜色不受控制的问题
+- 修复了启动项--本地启动脚本文本框不能滑动的问题
+- 修复了Passwall节点列表按钮错位的问题
+
 ## v2.3 [ 2023.04.03 ]
 
 - 更新了 Loading 的样式

diff --git a/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css b/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css
diff --git a/luci-theme-argon/htdocs/luci-static/argon/css/dark.css b/luci-theme-argon/htdocs/luci-static/argon/css/dark.css
diff --git a/luci-theme-argon/less/cascade.less b/luci-theme-argon/less/cascade.less
@@ -118,6 +118,11 @@ body {
 
 textarea {
     padding: 0.2rem;
+
+    &:focus-visible {
+        outline: none;
+        border: 1px solid var(--primary);
+    }
 }
 
 ::selection {
@@ -527,12 +532,13 @@ h5 {
                 display: flex;
                 -webkit-box-align: center;
                 align-items: center;
-                margin: 50px auto 100px 50px;
+                margin: 50px 50px 100px 50px;
                 color: #525461;
                 color: var(--default);
+                justify-content: center;
 
                 .icon {
-                    width: 50px;
+                    width: 180px;
                     height: auto;
                     margin-right: 25px;
                 }
@@ -753,14 +759,20 @@ small {
         text-align: center;
 
         .brand {
+            display: block;
             font-size: 1.8rem;
             color: #5e72e4;
             color: var(--primary);
             font-family: "TypoGraphica";
             text-decoration: none;
             text-align: center;
             cursor: default;
-            vertical-align: text-bottom;
+            margin: 0 2rem;
+
+            .logo {
+                max-width: 100%;
+                height: auto;
+            }
         }
     }
 
@@ -950,6 +962,8 @@ div[style="width:100%;height:300px;border:1px solid #000;background:#fff"] {
 .alert-message {
     font-weight: bold;
     margin-bottom: 1.25rem;
+    margin-left: 1.25rem;
+    margin-right: 1.25rem;
     padding: 1rem 1.25rem;
     border: 0;
     border-radius: 0.375rem !important;
@@ -987,6 +1001,8 @@ div[style="width:100%;height:300px;border:1px solid #000;background:#fff"] {
 
 .container .alert,
 .container .alert-message {
+    margin-left: 0;
+    margin-right: 0;
     margin-top: 0rem;
 }
 
@@ -1299,10 +1315,14 @@ div[style="width:100%;height:300px;border:1px solid #000;background:#fff"] {
                     color: #fb6340;
                 }
 
-                .food[data-title=Logout]:before {
-                    content: "\e907";
-                    color: #adb5bd;
+                a[data-title=Logout],
+                .food[data-title=Logout] {
+                    &::before {
+                        content: "\e907";
+                        color: #adb5bd;
+                    }
                 }
+
             }
         }
     }
@@ -1381,7 +1401,6 @@ body[class*="node-"]>.main>.main-left>.nav>.slide>.menu.active::before {
     border-radius: 0.375rem;
     background-color: #fff;
     box-shadow: 0 0 1rem 0 rgba(136, 152, 170, .15);
-    overflow: hidden;
 
     &:last-child {
         margin: 0;
@@ -1660,16 +1679,13 @@ td>table>tbody>tr>td,
     vertical-align: middle;
     white-space: nowrap;
     text-decoration: none;
-    text-transform: uppercase;
     border: 0;
     border-radius: .2rem;
     background-color: #f0f0f0;
     background-image: none;
     appearance: none;
     -ms-touch-action: manipulation;
     touch-action: manipulation;
-
-
 }
 
 .btn,
@@ -1705,7 +1721,7 @@ td>table>tbody>tr>td,
 }
 
 .cbi-button:not(select) {
-    -webkit-appearance: none !important;
+    appearance: none !important;
 }
 
 
@@ -1866,7 +1882,7 @@ td>table>tbody>tr>td,
 .cbi-value-field .cbi-button-add {
     font-weight: bold;
     padding: 1px 6px;
-    display: flex;
+    display: inline-block;
     align-items: center;
 }
 
@@ -2875,7 +2891,7 @@ td>.ifacebadge,
 .ifacebadge>em,
 .ifacebadge>img {
     display: inline-block;
-    align-self: flex-start;
+    margin: 0 0.75rem;
 }
 
 .ifacebadge>img+img {
@@ -2918,8 +2934,6 @@ td>.ifacebadge,
             background-color: #fff;
 
             >span {
-                height: 100%;
-                align-self: flex-start;
                 white-space: nowrap;
                 overflow: hidden;
                 text-overflow: ellipsis;
@@ -2936,6 +2950,7 @@ td>.ifacebadge,
     min-height: 14rem;
     padding: .8rem;
     color: #000;
+    border-radius: 0.375rem;
 }
 
 #content_syslog {
@@ -3141,7 +3156,7 @@ td>.ifacebadge,
     padding: .5rem 1rem;
 }
 
-.cbi-section-create>* {}
+
 
 .cbi-section-remove {
     padding: .5rem 1rem;
@@ -3440,14 +3455,20 @@ input[name="nslookup"] {
 
     textarea {
         line-height: 1.25;
-        overflow-y: hidden;
+        overflow-y: auto;
         width: 100%;
         min-height: 15rem;
         padding: 1rem;
         resize: none;
         color: #242424;
         border-radius: 0.375rem;
         background-color: #ffffff;
+
+        &:focus-visible {
+            outline: none;
+            box-shadow: none;
+            border: 1px solid var(--primary);
+        }
     }
 }