From fc08466bbe495a363ac840f93511d970715c504e Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期一, 21 二月 2022 13:17:23 +0800
Subject: [PATCH] #css 修改176
---
src/main/webapp/views/crn.html | 1 +
src/main/webapp/static/css/crn.css | 12 ++++++++----
src/main/webapp/static/css/pipeline.css | 10 ++++++++--
src/main/webapp/static/css/console.css | 6 ++++++
src/main/webapp/views/pipeline.html | 1 +
src/main/webapp/static/css/index.css | 8 +++++---
6 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index b6180d2..d5c2be9 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -220,25 +220,31 @@
}
/* 鑷姩+鏈夌墿+ID */
.site-auto-run-id {
+ border: 1px solid rgb(108,167,168);
padding: 0 25px;
background-color: rgb(252,48,48);
}
/* 鑷姩+鏈夌墿 */
.site-auto-run {
+ border: 1px solid rgb(108,167,168);
padding: 0 25px;
background-color: rgb(250,81,246);
}
/* 鑷姩+ID */
.site-auto-id {
+ border: 1px solid rgb(108,167,168);
padding: 0 10px;
background-color: rgb(196,196,0);
}
+ /* 鑷姩 */
.site-auto {
+ border: 1px solid rgb(108,167,168);
padding: 0 10px;
background-color: rgb(120,255,129);
}
/* 闈炶嚜鍔�/鎵嬪姩 */
.site-unauto {
+ border: 1px solid rgb(108,167,168);
padding: 0 10px;
background-color: rgb(184,184,184);
}
diff --git a/src/main/webapp/static/css/crn.css b/src/main/webapp/static/css/crn.css
index 43289ac..4ff0c57 100644
--- a/src/main/webapp/static/css/crn.css
+++ b/src/main/webapp/static/css/crn.css
@@ -2,7 +2,11 @@
padding: 10px;
background-color: #f1f1f1;
}
-
+.button-window {
+ float: left;
+ width: 5%;
+ height: 100%;
+}
/* -------------------- 绗竴妯″潡 -------------------- */
.log-board {
background-color: #fff;
@@ -15,7 +19,7 @@
.command-log {
float: left;
height: 100%;
- width: 20%;
+ width: 19%;
text-align: center;
}
.command-log h2 {
@@ -47,7 +51,7 @@
.crn-state {
float: left;
height: 100%;
- width: 80%;
+ width: 76%;
overflow: auto;
}
/* 鍫嗗灈鏈虹姸鎬佽〃 */
@@ -75,7 +79,7 @@
/* -------------------- 绗簩妯″潡 -------------------- */
.crn-msg {
- overflow: auto;
+ /*overflow: auto;*/
margin-top: 10px;
height: 23%;
background-color: #fff;
diff --git a/src/main/webapp/static/css/index.css b/src/main/webapp/static/css/index.css
index 4416c24..7c63c5f 100644
--- a/src/main/webapp/static/css/index.css
+++ b/src/main/webapp/static/css/index.css
@@ -36,16 +36,18 @@
position: fixed;
top: 50%;
transform: translateY(-50%);
+
}
.sidebar ul {
font-size: 20px;
- font-weight: 500;
+ font-weight: 700;
padding-left: 15%;
+
}
.sidebar a {
text-decoration: none;
- /* color: #fff; */
+ /*color: #cbcbcb;*/
}
.sidebar a:hover {
@@ -55,7 +57,7 @@
.nav-unselect {
- color: #fff;
+ color: #5D7677;
}
.nav-select {
color: rgb(87,214,201);
diff --git a/src/main/webapp/static/css/pipeline.css b/src/main/webapp/static/css/pipeline.css
index 6b47392..3ab1456 100644
--- a/src/main/webapp/static/css/pipeline.css
+++ b/src/main/webapp/static/css/pipeline.css
@@ -9,9 +9,15 @@
box-shadow: 0 0 3px rgba(0,0,0,.3);
margin-bottom: 8px;
}
-.main-board {
+.button-window {
float: left;
- width: 50%;
+ width: 5%;
+ height: 100%;
+}
+.main-board {
+ padding-left: 1%;
+ float: left;
+ width: 47.5%;
height: 100%;
overflow: auto;
}
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index e4db383..46a1ef1 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -41,6 +41,7 @@
</style>
</head>
<body>
+<div class="button-window"></div>
<!-- 鏃ュ織鐩戞帶鏉� -->
<div class="log-board">
<!-- 鎵ц鍛戒护 -->
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index 9dd0be1..e89b964 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -18,6 +18,7 @@
</head>
<body>
<main>
+ <div class="button-window"></div>
<!-- plc寮傚父鏃ュ織鐩戞帶鐗� -->
<div id="plc-error" class="main-board" style="padding-left: 10px">
<!-- 澶撮儴 -->
--
Gitblit v1.9.1