From 25ce610f6ecca7325e7a743dc032c4a76559c63d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 02 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/Tool/css/style.css | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/widgets/Tool/css/style.css b/widgets/Tool/css/style.css
index 8fb3236..5733e7c 100644
--- a/widgets/Tool/css/style.css
+++ b/widgets/Tool/css/style.css
@@ -2,33 +2,36 @@
position: relative;
font-size: 14px;
height: 36px;
- line-height: 36px;
width: 100%;
/* 240px */
background: rgb(254, 254, 254);
color: #838383;
- border-right: 1px solid #DDDDDD;
- border-radius: 6px 0 0 6px;
+ /* border-radius: 6px 0 0 6px; */
text-align: center;
cursor: pointer;
- z-index: 10 !important;
+ z-index: 14 !important
}
.jimu-widget-Tool .tool-bar {
width: 100%;
+ height: 24px;
+ line-height: 24px;
+ margin-top: 6px;
+ border-right: 1px solid #DDDDDD;
}
.jimu-widget-Tool .tool-bar .tool-btn {
+ display: flex;
align-items: center;
- justify-content: space-around;
+ justify-content: center;
}
.jimu-widget-Tool .tool-bar .tool-btn i {
- display: inline-block;
- width: 22px;
- height: 22px;
- background: url(../../../images/gongju.png) no-repeat;
- background-size: 22px;
+ width: 14px;
+ height: 14px;
+ margin-right: 4px;
+ background: url(../../../images/工具.png) no-repeat;
+ background-size: 100% 100%;
vertical-align: middle;
}
@@ -37,10 +40,10 @@
}
.jimu-widget-Tool .tool-bar .tool-btn del {
- display: inline-block;
+ margin-left: 4px;
width: 10px;
height: 6px;
- background: url(../../../images/toolbottom1.png) no-repeat;
+ background: url(../../../images/展开.png) no-repeat;
background-size: 10px 6px;
/* vertical-align: / */
}
@@ -79,13 +82,18 @@
background: #3F9CFC;
}
+.jimu-widget-Tool .tool-bar .tool-y-box li:hover i {
+ filter: grayscale(100%) brightness(200%);
+}
+
+
.jimu-widget-Tool .tool-bar .tool-y-box li i {
margin-top: -2px;
display: inline-block;
width: 16px;
height: 16px;
- background-size: 100%;
vertical-align: middle;
+ background-size: 100% 100% !important;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(1) {
@@ -93,45 +101,50 @@
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(1) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 0;
+ background: url(../../../images/图上测量.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(2) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -141px;
+ background: url(../../../images/卷帘对比.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(3) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -63px;
+ background: url(../../../images/分屏对比.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(4) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -110px;
+ background: url(../../../images/我的标记.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(5) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -32px;
+ background: url(../../../images/坐标定位.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(6) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -126px;
+ background: url(../../../images/场景快照.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(7) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -173px;
+ background: url(../../../images/可视分析.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(8) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -16px;
+ background: url(../../../images/剖面分析.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(9) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -156px;
+ background: url(../../../images/坡度坡向.png ) no-repeat;
}
-.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(9) {
+/* .jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(9) i {
+ background: url(../../../images/toolbox1.png ) no-repeat 0 -156px;
+} */
+
+.jimu-widget-Tool .tool-bar .tool-y-box li:last-child {
border-radius: 0 0 5px 5px;
}
+
/* .jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(2) i {
background: url(../../../images/toolbox.png ) no-repeat 0 -16px;
} */
--
Gitblit v1.9.3