重做:改进本主题对 [luci-app-passwall] 的兼容性

jerrykuku · May 18, 2023 · 2f80831 · 2f80831
1 parent 7c9b29a
commit 2f80831
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 29 deletions.
diff --git a/htdocs/luci-static/argon/css/cascade.css b/htdocs/luci-static/argon/css/cascade.css
@@ -1648,10 +1648,6 @@ th h5, td h5,
 th h6, td h6 {
   background: var(--lighter);
 }
-/* OCD: Change the background color of the "now in use" node in PassWall  */
-.cbi-section-table > tbody > ._now_use {
-  background: #5e72e473 !important;
-}
 /* language fix */
 body.lang_pl.node-main-login .cbi-value-title {
   width: 12rem;
@@ -2915,6 +2911,20 @@ input[name="nslookup"] {
 .node-nas-usb_printer em {
   display: block;
 }
+/* PassWall */
+#cbi-passwall #add_link_div,
+#cbi-passwall #set_node_div {
+  background: #fffffff0;
+}
+#cbi-passwall #add_link_div #nodes_link {
+  background: var(--lighter);
+}
+#cbi-passwall #add_link_div .cbi-value-title {
+  vertical-align: middle;
+}
+#cbi-passwall .cbi-section-table tbody ._now_use {
+  background: #5e72e473 !important;
+}
 @media screen and (max-width: 1600px) {
   .main .main-left {
     width: calc(0% + 13rem);

diff --git a/htdocs/luci-static/argon/css/dark.css b/htdocs/luci-static/argon/css/dark.css
@@ -339,16 +339,6 @@ th h6, td h6 {
   background-color: #00ff0a45 !important;
 }
 
-/* OCD: Compatible the background color of the "Add the node via the link" & "USE(node)" pop-up window in PassWall (dark mode only) */
-#add_link_div,
-#set_node_div {
-  background-color: #333333f0 !important;
-  box-shadow: #00000094 10px 10px 30px 5px !important;
-}
-#add_link_div>.cbi-value>.cbi-value-field>#nodes_link {
-  background: #ccc;
-}
-
 #content_syslog {
   box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35);
 }
@@ -680,6 +670,16 @@ fieldset[id^="cbi-apply-"] {
   color: #ccc !important;
 }
 
+/* PassWall */
+#cbi-passwall #add_link_div,
+#cbi-passwall #set_node_div {
+  background: #333333f0 !important;
+  box-shadow: #00000094 10px 10px 30px 5px !important;
+}
+#cbi-passwall #add_link_div #nodes_link {
+  background: #3c3c3c  !important;
+}
+
 @supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) {
   .login-page .login-container .login-form {
     -webkit-backdrop-filter: blur(var(--blur-radius-dark));

diff --git a/htdocs/luci-static/argon/less/cascade.less b/htdocs/luci-static/argon/less/cascade.less
@@ -1974,11 +1974,6 @@ th h6, td h6 {
     background: var(--lighter);
 }
 
-/* OCD: Change the background color of the "now in use" node in PassWall  */
-.cbi-section-table>tbody>._now_use {
-    background: #5e72e473 !important;
-}
-
 /* language fix */
 body.lang_pl.node-main-login .cbi-value-title {
     width: 12rem;
@@ -3575,6 +3570,20 @@ input[name="nslookup"] {
     display: block;
 }
 
+/* PassWall */
+#cbi-passwall #add_link_div,
+#cbi-passwall #set_node_div {
+    background: #fffffff0;
+}
+#cbi-passwall #add_link_div #nodes_link {
+    background: var(--lighter);
+}
+#cbi-passwall #add_link_div .cbi-value-title {
+    vertical-align: middle;
+}
+#cbi-passwall .cbi-section-table tbody ._now_use {
+    background: #5e72e473 !important;
+}
 
 @media screen and (max-width: 1600px) {
 

diff --git a/htdocs/luci-static/argon/less/dark.less b/htdocs/luci-static/argon/less/dark.less
@@ -409,16 +409,6 @@ th h6, td h6 {
     background-color: #00ff0a45 !important;
 }
 
-/* OCD: Compatible the background color of the "Add the node via the link" & "USE(node)" pop-up window in PassWall (dark mode only) */
-#add_link_div,
-#set_node_div {
-    background-color: #333333f0 !important;
-    box-shadow: #00000094 10px 10px 30px 5px !important;
-}
-#add_link_div>.cbi-value>.cbi-value-field>#nodes_link {
-    background: #ccc;
-}
-
 #content_syslog {
     box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35)
 }
@@ -753,6 +743,16 @@ fieldset[id^="cbi-apply-"] {
     color: #ccc !important;
 }
 
+/* PassWall */
+#cbi-passwall #add_link_div,
+#cbi-passwall #set_node_div {
+    background: #333333f0 !important;
+    box-shadow: #00000094 10px 10px 30px 5px !important;
+}
+#cbi-passwall #add_link_div #nodes_link {
+    background: #3c3c3c  !important;
+}
+
 @supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) {
     .login-page .login-container .login-form {
         -webkit-backdrop-filter: blur(var(--blur-radius-dark));