Skip to content

fix(ui): 修复 ModbusMaster 浅色主题混用深色样式 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Karl-Dai merged 1 commit into from
Oct 10, 2026
Merged

fix(ui): 修复 ModbusMaster 浅色主题混用深色样式 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions master-frontend/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ html, body, #app {

body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif;
background: #11111b;
color: #cdd6f4;
background: var(--c-crust);
color: var(--c-text);
}

.app-layout {
Expand All @@ -186,34 +186,34 @@ body {

.toolbar-area {
grid-area: toolbar;
background: #1e1e2e;
border-bottom: 1px solid #313244;
background: var(--c-base);
border-bottom: 1px solid var(--c-surface0);
}

.tree-area {
grid-area: tree;
background: #181825;
border-right: 1px solid #313244;
background: var(--c-mantle);
border-right: 1px solid var(--c-surface0);
overflow-y: auto;
}

.content-area {
grid-area: content;
background: #11111b;
background: var(--c-crust);
overflow: hidden;
}

.panel-area {
grid-area: panel;
background: #181825;
border-left: 1px solid #313244;
background: var(--c-mantle);
border-left: 1px solid var(--c-surface0);
overflow-y: auto;
}

.log-area {
grid-area: log;
background: #1e1e2e;
border-top: 1px solid #313244;
background: var(--c-base);
border-top: 1px solid var(--c-surface0);
overflow: hidden;
}
</style>
12 changes: 6 additions & 6 deletions master-frontend/src/components/CommunicationSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ const { t } = useI18n()
</template>

<style scoped>
.communication-settings { border-top: 1px solid #45475a; padding-top: 12px; }
summary { color: #cdd6f4; font-size: 13px; cursor: pointer; }
.communication-settings { border-top: 1px solid var(--c-surface1); padding-top: 12px; }
summary { color: var(--c-text); font-size: 13px; cursor: pointer; }
.settings-body { display: flex; flex-direction: column; gap: 12px; margin-top: 12px; }
label { display: flex; flex-direction: column; gap: 4px; color: #a6adc8; font-size: 12px; }
input[type="number"] { min-width: 0; padding: 6px 10px; background: #313244; border: 1px solid #45475a; border-radius: 4px; color: #cdd6f4; font-size: 13px; }
input:focus-visible, summary:focus-visible { outline: 2px solid #89b4fa; outline-offset: 2px; }
label { display: flex; flex-direction: column; gap: 4px; color: var(--c-subtext0); font-size: 12px; }
input[type="number"] { min-width: 0; padding: 6px 10px; background: var(--c-control-bg); border: 1px solid var(--c-surface1); border-radius: 4px; color: var(--c-text); font-size: 13px; }
input:focus-visible, summary:focus-visible { outline: 2px solid var(--c-blue); outline-offset: 2px; }
.checkbox-label { flex-direction: row; align-items: center; }
p { margin: -6px 0 0; color: #a6adc8; font-size: 12px; line-height: 1.5; }
p { margin: -6px 0 0; color: var(--c-subtext0); font-size: 12px; line-height: 1.5; }
</style>
42 changes: 21 additions & 21 deletions master-frontend/src/components/ConnectionTree.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,13 @@ function fcLabel(fn: string): string {
padding: 8px 12px;
font-size: 11px;
text-transform: uppercase;
color: #6c7086;
color: var(--c-subtext0);
letter-spacing: 0.5px;
}

.tree-empty {
padding: 24px 12px;
color: #6c7086;
color: var(--c-subtext0);
text-align: center;
}

Expand All @@ -216,18 +216,18 @@ function fcLabel(fn: string): string {
}

.tree-node:hover {
background: #1e1e2e;
background: var(--c-hover-bg);
}

.tree-node.selected {
background: #89b4fa;
color: #1e1e2e;
background: var(--c-selection-bg);
color: var(--c-selection-text);
}

.tree-node.selected .node-meta,
.tree-node.selected .node-slave {
color: #1e1e2e;
opacity: 0.7;
color: var(--c-selection-text);
opacity: 1;
}

.tree-child {
Expand All @@ -238,7 +238,7 @@ function fcLabel(fn: string): string {
font-size: 8px;
width: 12px;
text-align: center;
color: #6c7086;
color: var(--c-subtext0);
}

.node-status {
Expand All @@ -248,11 +248,11 @@ function fcLabel(fn: string): string {
flex-shrink: 0;
}

.node-status.connected { background: #a6e3a1; }
.node-status.disconnected { background: #f38ba8; }
.node-status.error { background: #fab387; }
.node-status.connected { background: var(--c-green); }
.node-status.disconnected { background: var(--c-red); }
.node-status.error { background: var(--c-peach); }
.node-status.reconnecting {
background: #f9e2af;
background: var(--c-yellow);
animation: reconnecting-pulse 1s ease-in-out infinite;
}

Expand All @@ -266,12 +266,12 @@ function fcLabel(fn: string): string {
height: 6px;
border-radius: 50%;
flex-shrink: 0;
background: #45475a;
background: var(--c-surface1);
}

.poll-indicator.active {
background: #a6e3a1;
box-shadow: 0 0 4px #a6e3a1;
background: var(--c-green);
box-shadow: 0 0 4px var(--c-green);
}

.node-label {
Expand All @@ -283,20 +283,20 @@ function fcLabel(fn: string): string {

.node-slave {
font-size: 10px;
color: #6c7086;
color: var(--c-subtext0);
}

.node-meta {
font-size: 10px;
color: #6c7086;
color: var(--c-subtext0);
font-family: monospace;
}

/* Context Menu */
.context-menu {
position: fixed;
background: #1e1e2e;
border: 1px solid #45475a;
background: var(--c-base);
border: 1px solid var(--c-surface1);
border-radius: 6px;
padding: 4px 0;
z-index: 999;
Expand All @@ -311,10 +311,10 @@ function fcLabel(fn: string): string {
}

.ctx-item:hover {
background: #313244;
background: var(--c-control-bg);
}

.ctx-item.danger {
color: #f38ba8;
color: var(--c-red);
}
</style>
Loading
Loading