改进防火墙[firewall] 显示布局

jerrykuku · Dec 21, 2024 · 0fbfeec · 0fbfeec
1 parent cbad1c9
commit 0fbfeec
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/htdocs/luci-static/argon/css/cascade.css b/htdocs/luci-static/argon/css/cascade.css
@@ -1252,7 +1252,6 @@ ul li .cbi-input-checkbox {
 }
 .cbi-section-create {
   margin: 0;
-  padding-left: 0.5rem;
   align-items: center;
 }
 .cbi-section-create > * {
@@ -1626,20 +1625,25 @@ td > table > tbody > tr > td,
   top: 0;
   display: none;
 }
-#cbi-firewall-redirect table *,
-#cbi-network-switch_vlan table *,
-#cbi-firewall-zone table * {
+#cbi-firewall-redirect table *:not([type="button"]),
+#cbi-firewall-rule table *:not([type="button"]),
+#cbi-network-switch_vlan table *:not([type="button"]),
+#cbi-firewall-zone table *:not([type="button"]) {
   font-size: small;
 }
 #cbi-firewall-redirect table input[type="text"],
 #cbi-network-switch_vlan table input[type="text"],
-#cbi-firewall-zone table input[type="text"] {
-  width: 5rem;
+#cbi-firewall-zone table input[type="text"],
+#cbi-firewall-rule table input[type="text"] {
+  width: inherit !important;
+  text-align: center;
 }
 #cbi-firewall-redirect table select,
 #cbi-network-switch_vlan table select,
 #cbi-firewall-zone table select {
   min-width: 3.5rem;
+  text-align: center;
+  text-align-last: center;
 }
 #cbi-network-switch_vlan .th,
 #cbi-network-switch_vlan .td {
@@ -2133,7 +2137,7 @@ table > thead > tr > th {
   padding-left: 1.5rem;
   color: #8898aa;
   background-color: #f6f9fc;
-  font-size: 0.65rem;
+  font-size: 0.75rem;
   padding-top: 0.75rem;
   padding-bottom: 0.75rem;
   letter-spacing: 1px;
@@ -2756,7 +2760,7 @@ td > .ifacebadge,
   min-width: 7rem;
 }
 .cbi-section-create > .cbi-button-add {
-  margin: 0.75rem 0.75rem 0.75rem 0.25rem;
+  margin: 0.75rem 0.75rem 0.75rem 0.75rem;
 }
 .cbi-section-remove {
   padding: 0.5rem;
@@ -3221,8 +3225,7 @@ div.commandbox {
   }
   select,
   input {
-    width: 100% !important;
-    min-width: auto;
+    min-width: max-content;
     margin: 0.25rem 0;
   }
   input {

diff --git a/htdocs/luci-static/argon/less/cascade.less b/htdocs/luci-static/argon/less/cascade.less
@@ -1490,7 +1490,6 @@ ul li .cbi-input-checkbox {
 
 .cbi-section-create {
     margin: 0;
-    padding-left: 0.5rem;
     align-items: center;
 
 }
@@ -1951,22 +1950,27 @@ td>table>tbody>tr>td,
 }
 
 
-#cbi-firewall-redirect table *,
-#cbi-network-switch_vlan table *,
-#cbi-firewall-zone table * {
+#cbi-firewall-redirect table *:not([type="button"]),
+#cbi-firewall-rule table *:not([type="button"]),
+#cbi-network-switch_vlan table *:not([type="button"]),
+#cbi-firewall-zone table *:not([type="button"]) {
     font-size: small;
 }
 
 #cbi-firewall-redirect table input[type="text"],
 #cbi-network-switch_vlan table input[type="text"],
-#cbi-firewall-zone table input[type="text"] {
-    width: 5rem;
+#cbi-firewall-zone table input[type="text"],
+#cbi-firewall-rule table input[type="text"] {
+    width: inherit !important;
+    text-align: center;
 }
 
 #cbi-firewall-redirect table select,
 #cbi-network-switch_vlan table select,
 #cbi-firewall-zone table select {
     min-width: 3.5rem;
+    text-align: center;
+    text-align-last: center;
 }
 
 #cbi-network-switch_vlan .th,
@@ -2568,12 +2572,11 @@ table>thead>tr>td {
 table>tbody>tr>th,
 table>tfoot>tr>th,
 table>thead>tr>th {
-
     padding-right: 1.5rem;
     padding-left: 1.5rem;
     color: #8898aa;
     background-color: #f6f9fc;
-    font-size: .65rem;
+    font-size: .75rem;
     padding-top: .75rem;
     padding-bottom: .75rem;
     letter-spacing: 1px;
@@ -3360,7 +3363,7 @@ td>.ifacebadge,
 }
 
 .cbi-section-create>.cbi-button-add {
-    margin: 0.75rem 0.75rem 0.75rem 0.25rem;
+    margin: 0.75rem 0.75rem 0.75rem 0.75rem;
 }
 
 .cbi-section-remove {
@@ -3979,8 +3982,7 @@ div.commandbox {
 
     select,
     input {
-        width: 100% !important;
-        min-width: auto;
+        min-width: max-content;
         margin: 0.25rem 0;
     }