From 1807d65caf1652aee104f994948d1fa9766375f5 Mon Sep 17 00:00:00 2001 From: yangpengfei Date: Sun, 24 Jun 2018 14:44:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E5=B0=BA=E5=AF=B83=E7=A7=8D=E6=9B=B4=E5=A4=A7=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/avatar/index.wxss | 2 +- examples/app.json | 4 +- examples/pages/avatar/index.wxml | 91 ++++++++++++++++++-------------- examples/pages/index/index.wxml | 2 - package-lock.json | 2 +- src/avatar/index.less | 12 +++++ src/styles/_base.less | 3 ++ 7 files changed, 70 insertions(+), 46 deletions(-) diff --git a/dist/avatar/index.wxss b/dist/avatar/index.wxss index 8f6e636..cde9041 100644 --- a/dist/avatar/index.wxss +++ b/dist/avatar/index.wxss @@ -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%} \ No newline at end of file +.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%} \ No newline at end of file diff --git a/examples/app.json b/examples/app.json index 29cbf9d..c5c5a4a 100644 --- a/examples/app.json +++ b/examples/app.json @@ -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", diff --git a/examples/pages/avatar/index.wxml b/examples/pages/avatar/index.wxml index 5d8f8e7..5184471 100644 --- a/examples/pages/avatar/index.wxml +++ b/examples/pages/avatar/index.wxml @@ -1,58 +1,71 @@ - - 梁 - - - 梁 - - - 梁 - + + 梁 + + + 梁 + + + 梁 + - - A - - - A - - - A - + + A + + + A + + + A + - - - + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/pages/index/index.wxml b/examples/pages/index/index.wxml index cd2f397..e71a234 100644 --- a/examples/pages/index/index.wxml +++ b/examples/pages/index/index.wxml @@ -34,7 +34,6 @@ - @@ -44,7 +43,6 @@ - diff --git a/package-lock.json b/package-lock.json index 7f1ca42..767c3ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iview-weapp", - "version": "0.0.1", + "version": "1.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/avatar/index.less b/src/avatar/index.less index 7625372..59c5a1b 100644 --- a/src/avatar/index.less +++ b/src/avatar/index.less @@ -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); } diff --git a/src/styles/_base.less b/src/styles/_base.less index 73b0b5e..df44406 100644 --- a/src/styles/_base.less +++ b/src/styles/_base.less @@ -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;