DataType
/
omi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat(card): hoverable:always

This commit is contained in:
ringosix 2021-08-02 17:01:18 +08:00
parent cdaa1de4f7
commit 0f8b2c2039
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/card/demos/js-demo/index.html
View File

@ -27,11 +27,8 @@
<div style="display: flex; margin: 2% 10%; justify-content: space-around; flex-wrap: wrap">
<o-card title="Default size card" hoverable="true">
<o-card title="Default size card" hoverable="always">
<o-link underline='0' type="primary" target="_blank" href="https://tencent.github.io/omi/" slot="extra">More</o-link>
<!-- <div slot="cover">
<img alt="example" src="https://gw.alipayobjects.com/zos/rmsportal/JiqGstEfoWAOHiTxclqi.png" />
</div> -->
<p>Card content</p>
<p>Card content</p>
<p>Card content</p>
@ -47,7 +44,7 @@
</o-card>
<!-- 若需实现底部栏按钮，id,actions为必选参数 -->
<o-card title="Action card" size="medium" id="myAction" actions="[{icon: 'add-a-photo-rounded'},{icon: 'add-ic-call-rounded'},{icon: 'add-comment-rounded'}]">
<o-card title="Action card" size="medium" id="myAction" actions="[{icon: 'add-a-photo-rounded'},{icon: 'add-ic-call-rounded'},{icon: 'add-comment-rounded'}]" >
<o-link underline='0' type="primary" target="_blank" href="https://tencent.github.io/omi/" slot="extra">More</o-link>
<p>Card content</p>
<p>Card content</p>
@ -61,12 +58,12 @@
<p>...</p>
</o-card>
<o-card title="Action card" size="medium" id="myAction" actions="[{icon: 'add-ic-call-rounded'},{icon: 'add-comment-rounded'}]">
<o-card title="Action card" size="small" id="myAction" actions="[{icon: 'add-ic-call-rounded'},{icon: 'add-comment-rounded'}]" hoverable="true">
<o-image slot="cover" src="https://tencent.github.io/omi/packages/admin/dist/assets/logo.a690a1ac.svg"></o-image>
<div style="float: left;">
<o-avatar src="https://material-ui.com/static/images/avatar/1.jpg"></o-avatar>
</div>
<div style="float: right; margin-right: 35px;">
<div style="float: right; margin-right: 20px;">
<p>Card title</p>
<p>This is the description</p>
</div>

10
components/card/src/index.scss
View File

@ -102,21 +102,21 @@
}
.o-card-body {
margin: 0 24px;
margin: 12px 24px;
font-weight: 200;
font-size: 14px;
line-height: 1.5;
line-height: 1.6;
}
.o-card-body-medium {
margin: 0 22px;
margin: 11px 22px;
font-weight: 200;
font-size: 13px;
line-height: 1.2;
line-height: 1.4;
}
.o-card-body-small {
margin: 0 20px;
margin: 10px 20px;
font-weight: 200;
font-size: 12px;
line-height: 1.2;

3
packages/admin/package.json
View File

@ -26,6 +26,7 @@
"@omiu/icon": "^0.0.3",
"@omiu/input": "^0.0.8",
"@omiu/loading": "0.0.2",
"@omiu/link": "^0.0.4",
"@omiu/pagination": "^0.0.5",
"@omiu/popconfirm": "^0.0.2",
"@omiu/popover": "^0.0.12",
@ -35,7 +36,7 @@
"@omiu/table": "^0.0.14",
"@omiu/tabs": "^0.0.19",
"@omiu/toast": "^0.0.8",
"@omiu/card": "^0.0.1",
"@omiu/card": "0.0.1",
"@omiu/tooltip": "0.0.1",
"@omiu/transition": "^0.0.12",
"@omiu/tree": "^0.0.18",