From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/mob/components/menubar/normal-menubar/menucomponent/index.jsx | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
index b09a66f..10225a8 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
@@ -147,10 +147,11 @@
fontSize: card.setting.iconFont || 20,
padding: card.setting.padding,
background: card.setting.background,
- color: card.setting.color
+ color: card.setting.color,
+ borderRadius: card.setting.borderRadius || '15%'
}} type={card.setting.icon}/>
</div> : <div className="menu-sign">
- <img style={{width: card.setting.imgWidth, height: card.setting.imgWidth}} src={card.setting.url} alt=""/>
+ <img style={{width: card.setting.imgWidth, height: card.setting.imgWidth, borderRadius: card.setting.borderRadius || '15%'}} src={card.setting.url} alt=""/>
</div>}
<div className="menu-name">{card.setting.name}</div>
</div>
--
Gitblit v1.8.0