🐶 Sync 2026-10-20 22:40:23

This commit is contained in:
github-actions[bot] committed 2026-10-20 22:40:23 +08:00
1 parent e813f5cc54
commit 64cea2243a
216 files changed
+11913 -2968

No files matched your search

@@ -75,10 +75,9 @@
margin: clamp(1rem, 4vh, 2rem) auto;
padding: var(--field-gap) var(--section-inset);
gap: var(--field-gap);
border: 1px solid transparent;
border-inline-start: 3px solid var(--status-accent);
border: 1px solid var(--border-color);
border-radius: var(--radius-dialog) !important;
background-color: var(--surface-raised) !important;
background-color: color-mix(in srgb, var(--status-accent) 4%, var(--surface-raised)) !important;
color: var(--text-strong);
box-shadow: var(--section-shadow);
font-size: .875rem;
@@ -245,6 +245,33 @@
.cbi-input-file {
appearance: auto !important;
// File pickers include their own button. A text field's vertical padding
// leaves too little space for that button and clips its lower edge.
&[type="file"] {
padding: 0;
padding-inline-end: .75rem;
line-height: calc(2.5rem - 2px);
overflow: hidden;
cursor: pointer;
&::file-selector-button {
box-sizing: border-box;
height: 100%;
margin: 0;
margin-inline-end: var(--action-gap);
padding: 0 .75rem;
border: 0;
border-inline-end: 1px solid var(--control-border);
border-radius: 0;
font: inherit;
color: var(--control-text);
background-color: var(--surface-active);
vertical-align: top;
cursor: inherit;
appearance: none;
}
}
&::-webkit-file-upload-button {
display: inline-block !important;
}
@@ -234,8 +234,7 @@
width: auto;
margin: 0;
padding: .75rem 1rem;
border: 1px solid transparent;
border-inline-start: 3px solid var(--dialog-feedback-accent);
border: 1px solid var(--border-color);
border-radius: var(--radius-panel) !important;
background-color: color-mix(in srgb, var(--dialog-feedback-accent) 10%, var(--surface-color)) !important;
color: var(--text-strong);
@@ -68,6 +68,35 @@
display: none !important;
}
// Older Lua CBI forms omit the body inset supplied by modern tab containers.
// Page adapters opt in so headings, descriptions and fields share one rhythm.
.legacy-cbi-section-spacing() {
.cbi-section {
> .cbi-section-node:not(.cbi-section-node-tabbed):where(:has(> .cbi-value, > [id] > .cbi-value)) {
padding-block: var(--field-gap);
}
// Descriptions already inset the body, but a painted heading is a separate
// surface: its bottom padding cannot supply space below that surface.
> .cbi-section-descr:not(:empty) ~ .cbi-section-node:not(.cbi-section-node-tabbed) {
padding-block-start: 0;
}
> .cbi-value {
padding-block: var(--field-gap);
}
> .cbi-value ~ .cbi-value,
> .cbi-section-descr:not(:empty) ~ .cbi-value {
padding-block-start: 0;
}
> .cbi-section-create {
padding: var(--field-gap) var(--section-inset);
}
}
}
.cbi-map-descr+fieldset {
margin-top: 0;
}
@@ -1,6 +1,121 @@
// out: false
[data-page="admin-system-argon-config"] {
#argon-update [hidden] {
display: none !important;
}
.argon-update-content {
display: flex;
flex-direction: column;
gap: var(--field-gap);
padding: var(--field-gap) var(--section-inset);
> p {
margin: 0;
padding: 0;
line-height: 1.5;
}
}
.argon-update-versions {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(~"min(100%, 16rem)", 1fr));
gap: var(--field-gap);
margin: 0;
dt {
margin-bottom: var(--control-gap);
color: var(--muted-text);
font-size: .8125rem;
}
dd {
margin: 0;
color: var(--text-strong);
line-height: 1.5;
overflow-wrap: anywhere;
}
}
.argon-update-status {
display: flex;
align-items: center;
gap: var(--control-gap);
color: var(--text-strong);
&[data-state="current"],
&[data-state="complete"] {
font-weight: 600;
}
}
.argon-update-status-icon {
display: inline-flex;
flex: 0 0 1.25rem;
align-items: center;
justify-content: center;
width: 1.25rem;
height: 1.25rem;
border: 1px solid var(--success);
border-radius: 50%;
color: var(--success);
font-size: .8125rem;
line-height: 1;
}
.argon-update-actions {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: var(--control-gap);
> .cbi-button {
min-height: 2.5rem;
max-width: 100%;
height: auto;
white-space: normal;
overflow-wrap: anywhere;
}
}
#argon-update .argon-update-actions > .cbi-button-neutral {
color: var(--text-strong);
border: 1px solid var(--border-color);
background-color: var(--surface-muted);
}
.argon-update-checked {
color: var(--muted-text);
font-size: .8125rem;
}
.argon-update-details {
min-width: 0;
> summary {
cursor: pointer;
color: var(--text-strong);
line-height: 1.5;
}
}
.argon-update-notes {
max-height: 22rem;
margin: var(--control-gap) 0 0;
padding: var(--field-gap);
overflow: auto;
overscroll-behavior: contain;
border: 1px solid var(--border-color);
border-radius: var(--radius-panel);
background-color: var(--surface-muted);
color: var(--text-strong);
font: inherit;
line-height: 1.6;
white-space: pre-wrap;
overflow-wrap: anywhere;
}
.argon-color-picker {
display: flex;
align-items: center;
@@ -1,5 +1,134 @@
// out: false
// The overview's native firmware reminder is inserted outside #view.
// Match its upgrade link so the styling also applies through the homepage route.
#maincontent > .alert-message.notice:has(a[href$="/admin/system/attendedsysupgrade"]) {
display: grid !important;
grid-template-columns: minmax(0, 1fr) auto;
align-items: start;
gap: var(--action-gap) var(--field-gap);
padding: var(--field-gap) var(--section-inset);
border: 1px solid var(--border-color);
border-radius: var(--radius-card) !important;
background-color: var(--surface-raised) !important;
color: var(--text-color);
box-shadow: var(--section-shadow);
font-size: .875rem;
font-weight: 400;
line-height: 1.6;
// Keep LuCI's nodes and handlers; share the heading row with Dismiss.
> div:first-child {
display: contents;
> * {
grid-column: 1 / -1;
min-width: 0;
margin: 0;
+ * {
margin-top: 0;
}
}
> h4 {
grid-column: 1;
align-self: center;
padding: 0;
background: none;
color: var(--text-strong);
font-size: 1rem;
font-weight: 600;
line-height: 1.5;
overflow-wrap: anywhere;
}
> .btn {
justify-self: start;
}
}
> div:last-child {
grid-column: 2;
grid-row: 1;
align-self: center;
> .btn {
margin: 0 !important;
}
}
.btn {
min-height: 2.25rem;
padding: .375rem .75rem;
border: 1px solid var(--border-color);
background-color: var(--surface-muted);
color: var(--text-strong);
font-size: .8125rem;
font-weight: 500;
line-height: 1.5;
overflow-wrap: anywhere;
}
a {
color: color-mix(in srgb, var(--link-color) 75%, var(--text-strong));
text-decoration: underline;
text-underline-offset: .2em;
overflow-wrap: anywhere;
}
.table {
display: table;
width: 100%;
table-layout: fixed;
border-collapse: separate;
border-spacing: 0;
border: 1px solid var(--border-color);
border-radius: var(--radius-panel);
background-color: var(--surface-color);
overflow: hidden;
font-size: .8125rem;
font-variant-numeric: tabular-nums;
> :is(thead, tbody, tfoot) {
display: table-row-group;
}
.tr {
display: table-row;
background: none;
}
.th,
.td {
display: table-cell;
width: 33.333%;
padding: .625rem .75rem;
border-top: 1px solid var(--border-color);
color: var(--text-strong);
font-weight: 500;
line-height: 1.5;
text-align: start;
white-space: normal;
overflow-wrap: anywhere;
}
.th {
border-top: 0;
background-color: var(--surface-muted);
}
.td:first-child {
color: var(--muted-text);
font-weight: 400;
}
.td:last-child {
font-weight: 600;
}
}
}
// System - Attended Sysupgrade
[data-page="admin-system-attendedsysupgrade"],
[data-page="admin-system-attendedsysupgrade-overview"] {
+49 -1
View File
@@ -1,7 +1,10 @@
// out: false
// System - File Transfer
[data-page="admin-system-filetransfer"] {
[data-page="admin-system-filetransfer"],
[data-page="admin-system-fileassistant"] {
.legacy-cbi-section-spacing();
#cbi-upload {
margin-top: 0;
}
@@ -9,4 +12,49 @@
.cbi-section-table {
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.03);
}
// Legacy upload/download templates use a row class on their labels and
// fixed inline widths. Keep each label, field and action in one form row.
.cbi-value:has(> :is(#ulfile, #dlfile)) {
display: grid;
grid-template-columns: fit-content(var(--form-label-width)) minmax(0, 25rem) auto;
align-items: center;
justify-content: start;
gap: var(--control-gap) var(--action-gap);
> label.cbi-value {
display: block !important;
width: auto !important;
min-width: 0;
padding: 0;
line-height: 1.5;
overflow-wrap: anywhere;
}
> .cbi-input-file {
width: 100% !important;
min-width: 0;
max-width: 100%;
}
> .cbi-button {
justify-self: start;
max-width: 100%;
}
}
}
// Keep the page selectors explicit inside container queries: Less 4 does not
// retain an enclosing selector when bubbling a nested @container rule.
@container (max-width: 40rem) {
[data-page="admin-system-filetransfer"],
[data-page="admin-system-fileassistant"] {
.cbi-value:has(> :is(#ulfile, #dlfile)) {
grid-template-columns: minmax(0, 1fr) auto;
> label.cbi-value {
grid-column: 1 / -1;
}
}
}
}
+19 -9
View File
@@ -75,19 +75,24 @@
gap: 0 !important;
}
// Native port status uses a 70px grid. Keep the counters readable and wrap
// whole cards when multiple physical ports are present.
div[style*="display:grid;grid-template-columns:repeat"] {
display: flex !important;
justify-content: space-evenly !important;
flex-wrap: wrap;
// Match native port cards by their icons, independently of inline CSS formatting.
#view div:has(> .ifacebox > .ifacebox-body > img[src*="/icons/port_"]) {
display: grid !important;
grid-template-columns: repeat(auto-fit, minmax(~"min(100%, 8.5rem)", 1fr)) !important;
gap: var(--field-gap);
margin: 0 !important;
padding: var(--field-gap) var(--section-inset);
.ifacebox {
flex: 0 1 8.5rem;
min-width: 8rem !important;
> .ifacebox {
min-width: 0 !important;
max-width: 100% !important;
margin: 0 !important;
text-align: center;
> .ifacebox-head:first-child {
overflow-wrap: anywhere;
}
.ifacebox-body {
font-size: .75rem;
padding: .75rem .5rem;
@@ -103,6 +108,11 @@
}
}
> .ifacebox-body:nth-child(2) {
flex-grow: 1;
overflow-wrap: anywhere;
}
> .ifacebox-body:last-child {
padding: .5rem .625rem;
}
+238
View File
@@ -4,3 +4,241 @@
[data-page="admin-vpn-passwall"] h4 {
background: transparent;
}
[data-page="admin-vpn-passwall"],
[data-page^="admin-vpn-passwall-"],
[data-page="admin-services-passwall"],
[data-page^="admin-services-passwall-"] {
.legacy-cbi-section-spacing();
.lv-dropdown-container {
display: inline-flex;
flex-wrap: wrap;
align-items: center;
gap: var(--control-gap);
min-width: 0;
max-width: 100%;
vertical-align: middle;
white-space: normal;
> .node-actions {
margin: 0 !important;
}
}
// Passwall snapshots select styles into per-ID rules, including the native
// arrow's padding and resolved colors. Keep the custom control responsive
// and its colors live when Argon's appearance changes.
.lv-dropdown-display {
display: inline-flex;
flex: 0 1 var(--form-control-min-width);
align-items: center;
gap: var(--control-gap);
width: var(--form-control-min-width) !important;
min-width: 0 !important;
max-width: 100%;
height: 2.5rem !important;
min-height: 2.5rem !important;
margin: 0 !important;
padding: .5rem .75rem !important;
line-height: 1.5rem !important;
border: 1px solid var(--control-border) !important;
border-radius: var(--radius-control) !important;
background-color: var(--select-bg) !important;
color: var(--control-text) !important;
&:focus {
--control-border: var(--control-focus);
outline: 0;
box-shadow: var(--control-focus-shadow);
}
}
.lv-dropdown-label {
flex: 1 1 auto;
width: auto;
min-width: 0;
text-align: start;
text-overflow: ellipsis;
}
.lv-arrow-down,
.lv-arrow-down-small,
.lv-arrow-right {
flex: 0 0 1rem;
width: 1rem;
height: 1rem;
margin: 0;
border: 0;
background-color: currentColor;
-webkit-mask: var(--dropdown-arrow-icon) center / contain no-repeat;
mask: var(--dropdown-arrow-icon) center / contain no-repeat;
}
.lv-arrow-right {
rotate: -90deg;
}
// The plugin moves opened menus to body, outside the form container.
.lv-dropdown-panel {
max-height: ~"min(50vh, 18rem)" !important;
line-height: 1.5 !important;
border: 1px solid var(--border-color) !important;
border-radius: var(--radius-panel) !important;
background-color: var(--surface-panel) !important;
color: var(--dropdown-text) !important;
box-shadow: var(--dropdown-shadow);
> div:first-child {
border-color: var(--border-color) !important;
}
.lv-dropdown-search {
padding: .5rem .75rem;
border: 1px solid var(--control-border);
border-radius: var(--radius-control);
}
&.cbi-listvalue-panel li[data-key] {
min-height: 2.5rem;
padding: .5rem .75rem;
border-radius: var(--radius-small);
background-color: transparent;
color: inherit;
text-align: start !important;
white-space: normal;
overflow-wrap: anywhere;
transition: none;
&.is-selected,
&.is-selected:hover {
background-color: var(--dropdown-selected-bg) !important;
color: var(--dropdown-selected-text) !important;
font-weight: 500 !important;
}
@media (hover: hover) {
&:not(.is-selected):hover {
background-color: var(--dropdown-hover-bg);
}
}
}
.lv-item-label {
margin: 0 !important;
}
.lv-group-title {
gap: var(--control-gap);
padding: .5rem .75rem;
border-radius: var(--radius-small);
line-height: 1.5;
white-space: normal;
overflow-wrap: anywhere;
> b,
> span {
margin: 0 !important;
}
> span[id^="group-count-"] {
margin-inline-start: auto !important;
color: var(--muted-text) !important;
}
}
.lv-group-list {
margin: var(--control-gap) 0 0;
padding-inline-start: var(--control-gap);
}
}
// Match the ID specificity of the plugin's !important group-title color,
// including after the menu has been moved outside #maincontent.
&:has(#maincontent) .lv-dropdown-panel .lv-group-title {
background-color: var(--surface-active) !important;
}
// The section body supplies the toolbar's vertical inset.
.cbi-value-field > .share-toolbar {
padding-block: 0;
}
#_passwall_status_fieldset {
padding-block: var(--control-gap);
.status .block {
margin-block: var(--control-gap);
}
}
#_log_fieldset {
display: flex;
flex-direction: column;
gap: var(--field-gap);
padding: var(--field-gap) var(--section-inset);
> .cbi-button {
align-self: flex-start;
}
> textarea {
display: block;
max-width: 100%;
margin: 0 !important;
}
}
#app_version {
display: flex;
flex-direction: column;
gap: var(--field-gap);
> .cbi-value > .cbi-value-field {
display: grid;
grid-template-columns: minmax(0, 10rem) auto;
align-items: center;
justify-content: start;
gap: var(--control-gap) var(--action-gap);
> span:first-child {
grid-column: 1;
grid-row: 1;
min-width: 0;
line-height: 1.5;
overflow-wrap: anywhere;
unicode-bidi: plaintext;
}
> input[data-update-app] {
grid-column: 2;
justify-self: start;
max-width: 100%;
}
> span[id$="-detail"] {
grid-column: 1 / -1;
min-width: 0;
line-height: 1.5;
overflow-wrap: anywhere;
&:empty {
display: none;
}
}
}
}
}
@container (max-width: 40rem) {
[data-page="admin-vpn-passwall"],
[data-page^="admin-vpn-passwall-"],
[data-page="admin-services-passwall"],
[data-page^="admin-services-passwall-"] {
// Its label is an ideographic space in the native template; when
// fields stack, it otherwise leaves a blank line above the actions.
.cbi-value:has(> .cbi-value-field > .share-toolbar) > .cbi-value-title {
display: none;
}
}
}
+2 -2
View File
@@ -131,9 +131,9 @@
.errorbox {
padding: .75rem 1rem;
overflow-wrap: anywhere;
border-inline-start: 3px solid var(--warning);
border: 1px solid var(--border-color);
border-radius: var(--radius-control);
background: var(--surface-color);
background: color-mix(in srgb, var(--warning) 6%, var(--surface-color));
color: var(--text-strong);
line-height: 1.5;
text-align: start;