From cd411e7b3ade23951e8935924252f7059cc096d5 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 03 Jun 2021 11:23:05 +0800
Subject: [PATCH] 合并冲突
---
widgets/Tool/css/style.css | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/widgets/Tool/css/style.css b/widgets/Tool/css/style.css
index a50b31e..14c794a 100644
--- a/widgets/Tool/css/style.css
+++ b/widgets/Tool/css/style.css
@@ -104,13 +104,16 @@
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(6) i {
- background: url(../../../images/toolbox.png ) no-repeat 0 -32px;
+ background: url(../../../images/toolbox.png ) no-repeat 0 -126px;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(7) i {
background: url(../../../images/toolbox.png ) no-repeat 0 -173px;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(8) i {
+ background: url(../../../images/toolbox.png ) no-repeat 0 -16px;
+}
+.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(9) i {
background: url(../../../images/toolbox.png ) no-repeat 0 -159px;
}
--
Gitblit v1.9.3