Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

新增：头像尺寸3种更大样式 #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

新增：头像尺寸3种更大样式 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dist/avatar/index.wxss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.i-avatar{display:inline-block;text-align:center;background:#ccc;color:#fff;white-space:nowrap;position:relative;overflow:hidden;vertical-align:middle;width:32px;height:32px;line-height:32px;border-radius:16px;font-size:18px}.i-avatar .ivu-avatar-string{line-height:32px}.i-avatar-large{width:40px;height:40px;line-height:40px;border-radius:20px;font-size:24px}.i-avatar-large .ivu-avatar-string{line-height:40px}.i-avatar-small{width:24px;height:24px;line-height:24px;border-radius:12px;font-size:14px}.i-avatar-small .ivu-avatar-string{line-height:24px}.i-avatar-image{background:0 0}.i-avatar-square{border-radius:4px}.i-avatar>image{width:100%;height:100%}
.i-avatar{display:inline-block;text-align:center;background:#ccc;color:#fff;white-space:nowrap;position:relative;overflow:hidden;vertical-align:middle;width:32px;height:32px;line-height:32px;border-radius:16px;font-size:18px}.i-avatar .ivu-avatar-string{line-height:32px}.i-avatar-xxxlarge{width:140rpx;height:140rpx;line-height:140rpx;border-radius:70rpx;font-size:24px}.i-avatar-xxxlarge .ivu-avatar-string{line-height:140rpx}.i-avatar-xxlarge{width:120rpx;height:120rpx;line-height:120rpx;border-radius:60rpx;font-size:24px}.i-avatar-xxlarge .ivu-avatar-string{line-height:120rpx}.i-avatar-xlarge{width:100rpx;height:100rpx;line-height:100rpx;border-radius:50rpx;font-size:24px}.i-avatar-xlarge .ivu-avatar-string{line-height:100rpx}.i-avatar-large{width:40px;height:40px;line-height:40px;border-radius:20px;font-size:24px}.i-avatar-large .ivu-avatar-string{line-height:40px}.i-avatar-small{width:24px;height:24px;line-height:24px;border-radius:12px;font-size:14px}.i-avatar-small .ivu-avatar-string{line-height:24px}.i-avatar-image{background:0 0}.i-avatar-square{border-radius:4px}.i-avatar>image{width:100%;height:100%}
4 changes: 1 addition & 3 deletions examples/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
"pages/tab-bar/index",
"pages/tabs/index",
"pages/tag/index",
"pages/toast/index",
"pages/swipeout/index",
"pages/count-down/index"
"pages/toast/index"
],
"window": {
"navigationBarBackgroundColor": "#FAFAFA",
Expand Down
91 changes: 52 additions & 39 deletions examples/pages/avatar/index.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,71 @@
<i-panel title="圆形"></i-panel>
<i-row i-class="row-class">
<i-col span="8">
<i-avatar size="small">梁</i-avatar>
</i-col>
<i-col span="8">
<i-avatar>梁</i-avatar>
</i-col>
<i-col span="8">
<i-avatar size="large">梁</i-avatar>
</i-col>
<i-col span="8">
<i-avatar size="small">梁</i-avatar>
</i-col>
<i-col span="8">
<i-avatar>梁</i-avatar>
</i-col>
<i-col span="8">
<i-avatar size="large">梁</i-avatar>
</i-col>
</i-row>

<i-panel title="方形"></i-panel>

<i-row i-class="row-class">
<i-col span="8">
<i-avatar size="small" shape="square">A</i-avatar>
</i-col>
<i-col span="8">
<i-avatar shape="square">A</i-avatar>
</i-col>
<i-col span="8">
<i-avatar size="large" shape="square">A</i-avatar>
</i-col>
<i-col span="8">
<i-avatar size="small" shape="square">A</i-avatar>
</i-col>
<i-col span="8">
<i-avatar shape="square">A</i-avatar>
</i-col>
<i-col span="8">
<i-avatar size="large" shape="square">A</i-avatar>
</i-col>
</i-row>

<i-row i-class="row-class">
<i-col span="8"></i-col>
<i-col span="8"></i-col>
<i-col span="8"></i-col>
<i-col span="8"></i-col>
<i-col span="8"></i-col>
<i-col span="8"></i-col>
</i-row>

<i-panel title="图片"></i-panel>

<i-row i-class="row-class">
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="small"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="default"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="large"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="small"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="default"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="large"></i-avatar>
</i-col>
</i-row>

<i-row i-class="row-class">
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="small" shape="square"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="default" shape="square"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="large" shape="square"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="small" shape="square"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="default" shape="square"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="large" shape="square"></i-avatar>
</i-col>
</i-row>

<i-panel title="更大尺寸（圆形）"></i-panel>
<i-row i-class="row-class">
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="xlarge"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="xxlarge"></i-avatar>
</i-col>
<i-col span="8">
<i-avatar src="https://i.loli.net/2017/08/21/599a521472424.jpg" size="xxxlarge"></i-avatar>
</i-col>
</i-row>
2 changes: 0 additions & 2 deletions examples/pages/index/index.wxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<i-cell title="Modal 对话框" is-link url="/pages/modal/index"></i-cell>
<i-cell title="Message 全局提醒" is-link url="/pages/message/index"></i-cell>
<i-cell title="Spin 加载中" is-link url="/pages/spin/index"></i-cell>
<i-cell title="Swipeout 滑动菜单" is-link url="/pages/swipeout/index"></i-cell>
</i-cell-group>
</i-panel>
<i-panel title="视图">
Expand All @@ -44,7 +43,6 @@
<i-cell title="Tag 标签" is-link url="/pages/tag/index"></i-cell>
<i-cell title="Progress 进度条" is-link url="/pages/progress/index"></i-cell>
<i-cell title="Avatar 头像" is-link url="/pages/avatar/index"></i-cell>
<i-cell title="countDown 倒计时" is-link url="/pages/count-down/index"></i-cell>
</i-cell-group>
</i-panel>
<i-panel title="表单">
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions src/avatar/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@

.avatar-size(@avatar-size-base, @avatar-font-size-base);

&-xxxlarge {
.avatar-size(@avatar-size-xxxlg, @avatar-font-size-lg);
}

&-xxlarge {
.avatar-size(@avatar-size-xxlg, @avatar-font-size-lg);
}

&-xlarge {
.avatar-size(@avatar-size-xlg, @avatar-font-size-lg);
}

&-large {
.avatar-size(@avatar-size-lg, @avatar-font-size-lg);
}
Expand Down
3 changes: 3 additions & 0 deletions src/styles/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@
@avatar-bg: #ccc;
@avatar-color: #fff;
@avatar-size-base: 32px;
@avatar-size-xxxlg: 140rpx;
@avatar-size-xxlg: 120rpx;
@avatar-size-xlg: 100rpx;
@avatar-size-lg: 40px;
@avatar-size-sm: 24px;
@avatar-font-size-base: 18px;
Expand Down