Merge pull request #427 from yhl452493373/18.06

18.06 lede样式调整
jerrykuku · Jun 26, 2023 · 3fe7d00 · 3fe7d00
2 parents 0b928e1 + ff1271a
commit 3fe7d00
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 4 deletions.
diff --git a/htdocs/luci-static/argon/css/cascade.css b/htdocs/luci-static/argon/css/cascade.css
@@ -1042,10 +1042,12 @@ textarea {
   font-family: var(--font-family-monospace) !important;
   font-size: inherit;
   color: black;
-  box-shadow: inset 0 1px 3px rgb(124 124 124 / 30%);
   border-radius: 0.375rem !important;
   vertical-align: middle;
 }
+.cbi-value .cbi-value-field textarea {
+  margin: 0.25rem;
+}
 /* change */
 .uci-change-list {
   font-family: monospace;
@@ -2901,6 +2903,12 @@ input[name="nslookup"] {
 .node-system-flashops fieldset {
   margin-top: 0;
 }
+.node-system-flashops fieldset > ul {
+  padding: 1rem;
+}
+.node-system-flashops fieldset + .cbi-page-actions {
+  margin-top: 1rem;
+}
 .node-status-iptables .cbi-tabmenu,
 .node-system-packages .cbi-tabmenu,
 .node-system-flashops .cbi-tabmenu {
@@ -2979,6 +2987,17 @@ div.commandbox {
 .node-status-mwan .cbi-tabmenu {
   padding: 3rem 0.5rem 0 0.5rem;
 }
+/* luci-app-openclash */
+.node-services-openclash .cbi-tabmenu {
+  font-size: 0;
+}
+.node-services-openclash .cbi-tabmenu > li {
+  margin-right: 4px;
+}
+.node-services-openclash .cbi-tabmenu > li:last-child {
+  margin-right: 0;
+}
+
 @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
@@ -455,7 +455,6 @@ textarea {
   border: 1px solid #3c3c3c !important;
   background-color: #1e1e1e;
   color: #ccc;
-  box-shadow: inset 0 1px 3px rgb(0 0 0 / 30%);
 }
 
 .cbi-section-remove:nth-of-type(2n),

diff --git a/htdocs/luci-static/argon/less/cascade.less b/htdocs/luci-static/argon/less/cascade.less
@@ -1242,11 +1242,14 @@ textarea {
     font-family: var(--font-family-monospace) !important;
     font-size: inherit;
     color: black;
-    box-shadow: inset 0 1px 3px rgb(124 124 124 / 30%);
     border-radius: 0.375rem !important;
     vertical-align: middle;
 }
 
+.cbi-value .cbi-value-field textarea {
+    margin: 0.25rem;
+}
+
 /* change */
 .uci-change-list {
     font-family: monospace;
@@ -3556,6 +3559,14 @@ input[name="nslookup"] {
     margin-top: 0;
 }
 
+.node-system-flashops fieldset > ul {
+    padding: 1rem;
+}
+
+.node-system-flashops fieldset + .cbi-page-actions {
+    margin-top: 1rem;
+}
+
 .node-status-iptables .cbi-tabmenu,
 .node-system-packages .cbi-tabmenu,
 .node-system-flashops .cbi-tabmenu {
@@ -3656,6 +3667,17 @@ div.commandbox {
     padding: 3rem 0.5rem 0 0.5rem;
 }
 
+/* luci-app-openclash */
+.node-services-openclash .cbi-tabmenu {
+    font-size: 0;
+}
+.node-services-openclash .cbi-tabmenu > li {
+    margin-right: 4px;
+}
+.node-services-openclash .cbi-tabmenu > li:last-child {
+    margin-right: 0;
+}
+
 @media screen and (max-width: 1600px) {
 
     .main {

diff --git a/htdocs/luci-static/argon/less/dark.less b/htdocs/luci-static/argon/less/dark.less
@@ -524,7 +524,6 @@ textarea {
     border: 1px solid #3c3c3c !important;
     background-color: #1e1e1e;
     color: #ccc;
-    box-shadow: inset 0 1px 3px rgb(0 0 0 / 30%);
 }
 
 .cbi-section-remove:nth-of-type(2n),