From 0b7382d7968c6e48b839bd69abea3b4679acc720 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 19 Jan 2026 17:31:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/styles/common/cockpit.scss | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/applications/drone-command/src/styles/common/cockpit.scss b/applications/drone-command/src/styles/common/cockpit.scss
index 4735e89..6b13bbc 100644
--- a/applications/drone-command/src/styles/common/cockpit.scss
+++ b/applications/drone-command/src/styles/common/cockpit.scss
@@ -605,6 +605,8 @@
}
.el-form.command-dialog-history-search {
+ margin-bottom: 20px;
+
.el-form-item {
margin-left: 20px;
}
@@ -667,21 +669,7 @@
}
}
}
-
- .history-search-actions {
- .el-button {
- width: 96px;
- background: transparent !important;
- border-radius: 4px 4px 4px 4px;
- border: 1px solid rgba(255, 255, 255, 0.3);
-
- .el-icon {
- font-size: 16px;
- color: #fff;
- }
- }
- }
-
+
.el-input {
width: 160px;
}
@@ -695,9 +683,17 @@
width: 160px;
}
}
+
+ .history-search-actions {
+ .search-btn {
+ background: #284FE3 !important;
+ }
+ }
}
.command-page-history-search {
+ margin-bottom: 20px;
+
.el-form-item__label {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
@@ -831,16 +827,30 @@
.history-search-actions {
.el-button {
margin-left: 20px;
+ width: 96px;
+ background: transparent !important;
+ border-radius: 4px 4px 4px 4px;
+ border: 1px solid rgba(255, 255, 255, 0.3);
+
+ .el-icon {
+ font-size: 16px;
+ color: #fff;
+ }
&:first-child {
margin-left: 0;
}
}
+
+ .search-btn {
+ background: #1C1C31 !important;
+ border: 1px solid rgba(227, 227, 236, 0.3) !important;
+ }
}
}
.command-table-toolbar {
- margin-top: 30px;
+ margin-bottom: 20px;
.el-button {
min-width: 88px;
@@ -855,8 +865,6 @@
}
.command-table-container {
- margin-top: 20px;
-
height: 0;
flex: 1;
display: flex;
@@ -1090,7 +1098,7 @@
padding: 0 10px;
.detail-title {
- margin-bottom: 20px;
+ line-height: 40px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
font-size: 16px;
@@ -1102,7 +1110,7 @@
.el-row {
.el-col {
- margin-bottom: 20px;
+ margin-bottom: 0;
display: flex;
align-items: center;
@@ -1405,7 +1413,7 @@
.detail-title {
- margin-bottom: 20px;
+ line-height: 40px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 500;
font-size: 16px;
--
Gitblit v1.9.3