From 117dc4cec546f830bc941ea314dcbdb9b370b211 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 25 Jan 2022 14:43:11 +0800
Subject: [PATCH] 冲突
---
src/styles/entitys/text-entitys.scss | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/src/styles/entitys/text-entitys.scss b/src/styles/entitys/text-entitys.scss
index f5a3dc7..26fc62b 100644
--- a/src/styles/entitys/text-entitys.scss
+++ b/src/styles/entitys/text-entitys.scss
@@ -91,6 +91,7 @@
}
.way-entitys-box {
+
.way-title {
border: white 1px solid;
padding-left: 2px;
@@ -110,6 +111,7 @@
}
.park-entitys-box {
+
.park-title {
position: relative;
left: -8px;
@@ -130,7 +132,40 @@
}
}
-.scene-entitys-box,
.monitor-entitys-box {
height: 40px;
+}
+
+
+.scene-entitys-box {
+ text-align: center;
+
+ div {
+ line-height: 24px;
+ text-align: center;
+ font-weight: 700;
+ color: #009bff;
+ text-shadow: 0 0 2px #fff;
+ }
+
+ img {
+ height: 40px;
+ }
+}
+
+
+.monitor-entitys-box {
+ text-align: center;
+
+ div {
+ line-height: 24px;
+ text-align: center;
+ font-weight: 700;
+ color: #009bff;
+ text-shadow: 0 0 2px #fff;
+ }
+
+ img {
+ height: 40px;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3