-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #174 from Tencent/develop
feat: weui 2.5.0
- Loading branch information
Showing
477 changed files
with
5,139 additions
and
2,417 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| /*! | ||
| * WeUI v2.4.4 (https://github.com/weui/weui-wxss) | ||
| * WeUI v2.5.0 (https://github.com/weui/weui-wxss) | ||
| * Copyright 2021 Tencent, Inc. | ||
| * Licensed under the MIT license | ||
| */ | ||
| image{height:100rpx}.demo_badge_cells .weui-cell__hd{position:relative;margin-right:20rpx}.demo_badge_cells .weui-cell__hd image{width:100rpx;display:block}.demo_badge_cells .weui-cell__hd .weui-badge{position:absolute;top:-.4em;right:-.4em}.demo_badge_cells .weui-cell__bd .demo_badge_title{vertical-align:middle}.demo_badge_cells .weui-cell__bd .demo_badge_title+.weui-badge{margin-left:10rpx}.demo_badge_cells .weui-cell__bd .demo_badge_desc{font-size:26rpx;color:#888} | ||
| image{height:100rpx}.weui-cells .demo_badge_tips{font-size:34rpx;vertical-align:middle}.weui-cells .demo_badge_tips+.weui-badge{margin-left:10rpx;margin-right:10rpx}.demo_badge_cells .weui-cell__hd{position:relative;margin-right:20rpx}.demo_badge_cells .weui-cell__hd image{width:100rpx;display:block}.demo_badge_cells .weui-cell__hd .weui-badge{position:absolute;top:-.4em;right:-.4em}.demo_badge_cells .weui-cell__bd .demo_badge_title{vertical-align:middle}.demo_badge_cells .weui-cell__bd .demo_badge_title+.weui-badge{margin-left:10rpx}.demo_badge_cells .weui-cell__bd .demo_badge_desc{font-size:26rpx;color:#888} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,13 @@ | ||
| Page({ | ||
| mixins: [require('../../mixin/themeChanged')], | ||
| }); | ||
| openDefault: function () { | ||
| wx.navigateTo({ | ||
| url: 'button_default' | ||
| }) | ||
| }, | ||
| openBottomfixed: function () { | ||
| wx.navigateTo({ | ||
| url: 'button_bottom_fixed' | ||
| }) | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,15 @@ | ||
| <page-meta root-font-size="system"/> | ||
| <view class="page" data-weui-theme="{{theme}}"> | ||
| <view class="page__hd"> | ||
| <view class="page__title">Button</view> | ||
| <view class="page__desc">按钮</view> | ||
| </view> | ||
| <view class="page__bd"> | ||
| <view class="button-sp-area"> | ||
| <a class="weui-btn weui-btn_primary">页面主操作</a> | ||
| <a class="weui-btn weui-btn_primary weui-btn_loading"><text class="weui-primary-loading weui-primary-loading_transparent"><i class="weui-primary-loading__dot"></i></text>页面主操作</a> | ||
| <a class="weui-btn weui-btn_disabled weui-btn_primary">页面主操作</a> | ||
| <a class="weui-btn weui-btn_default">页面次要操作</a> | ||
| <a class="weui-btn weui-btn_default weui-btn_loading"><text class="weui-primary-loading"><i class="weui-primary-loading__dot"></i></text>页面次操作</a> | ||
| <a class="weui-btn weui-btn_disabled weui-btn_default">页面次要操作</a> | ||
| <a class="weui-btn weui-btn_warn">警告类操作</a> | ||
| <a class="weui-btn weui-btn_warn weui-btn_loading"><text class="weui-primary-loading"><i class="weui-primary-loading__dot"></i></text>警告类操作</a> | ||
| <a class="weui-btn weui-btn_disabled weui-btn_warn">警告类操作</a> | ||
| </view> | ||
| <view class="button-sp-area cell"> | ||
| <a class="weui-btn_cell weui-btn_cell-default">普通行按钮</a> | ||
| <a class="weui-btn_cell weui-btn_cell-primary">强调行按钮</a> | ||
| <a class="weui-btn_cell weui-btn_cell-primary"> | ||
| <image class="weui-btn_cell__icon" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAuCAMAAABgZ9sFAAAAVFBMVEXx8fHMzMzr6+vn5+fv7+/t7e3d3d2+vr7W1tbHx8eysrKdnZ3p6enk5OTR0dG7u7u3t7ejo6PY2Njh4eHf39/T09PExMSvr6+goKCqqqqnp6e4uLgcLY/OAAAAnklEQVRIx+3RSRLDIAxE0QYhAbGZPNu5/z0zrXHiqiz5W72FqhqtVuuXAl3iOV7iPV/iSsAqZa9BS7YOmMXnNNX4TWGxRMn3R6SxRNgy0bzXOW8EBO8SAClsPdB3psqlvG+Lw7ONXg/pTld52BjgSSkA3PV2OOemjIDcZQWgVvONw60q7sIpR38EnHPSMDQ4MjDjLPozhAkGrVbr/z0ANjAF4AcbXmYAAAAASUVORK5CYII="></image> | ||
| 强调行按钮 | ||
| </a> | ||
| <a class="weui-btn_cell weui-btn_cell-warn">警告行按钮</a> | ||
| </view> | ||
| <view class="button-sp-area"> | ||
| <a class="weui-btn weui-btn_mini weui-btn_primary">按钮</a> | ||
| <a class="weui-btn weui-btn_mini weui-btn_default">按钮</a> | ||
| <a class="weui-btn weui-btn_mini weui-btn_warn">按钮</a> | ||
| </view> | ||
| </view> | ||
| <view class="page__hd"> | ||
| <view class="page__title">Button</view> | ||
| <view class="page__desc">按钮</view> | ||
| </view> | ||
| <view class="page__bd"> | ||
| <view class="weui-btn-area"> | ||
| <view aria-role="button" class="weui-btn weui-btn_default" bindtap="openDefault">普通按钮</view> | ||
| <view aria-role="button" class="weui-btn weui-btn_default" bindtap="openBottomfixed">底部悬浮按钮</view> | ||
| </view> | ||
| </view> | ||
| </view> | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| /*! | ||
| * WeUI v2.4.4 (https://github.com/weui/weui-wxss) | ||
| * WeUI v2.5.0 (https://github.com/weui/weui-wxss) | ||
| * Copyright 2021 Tencent, Inc. | ||
| * Licensed under the MIT license | ||
| */ | ||
| .button-sp-area{padding-top:30rpx;text-align:center}.weui-btn_mini{margin-right:8rpx} | ||
| .page{background:var(--weui-BG-2)}.button-sp-area{padding-top:30rpx;text-align:center}.weui-btn_mini{margin-right:8rpx} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| Page({ | ||
| mixins: [require('../../mixin/themeChanged')], | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <page-meta root-font-size="system"/> | ||
| <view class="page" data-weui-theme="{{theme}}"> | ||
| <view class="weui-bottom-fixed-opr-page"> | ||
| <view class="weui-bottom-fixed-opr-page__content"> | ||
| <view class="weui-bottom-fixed-opr-demo">Dolor tempora dolore aperiam fuga necessitatibus? Odio atque tempora deleniti voluptates voluptatem. Dolorem earum voluptas blanditiis labore quisquam? Quibusdam nesciunt consequatur aliquam ea corrupti animi, itaque consequatur neque? At porroSit nemo aliquid quas error doloremque Reiciendis ratione repellendus quae sit commodi amet architecto? Aut officiis aliquam fugit nulla at necessitatibus Optio totam quibusdam laboriosam aperiam libero! Officiis reiciendis Elit quaerat sed vero perferendis architecto consequatur. Consequuntur ad illum dolore ut accusamus. Cum possimus odit sequi quaerat beatae, eveniet. Rerum dolore ipsam quia consectetur iste Veniam mollitia dolores tempore? Dolor tempora dolore aperiam fuga necessitatibus? Odio atque tempora deleniti voluptates voluptatem. Dolorem earum voluptas blanditiis labore quisquam? Quibusdam nesciunt consequatur aliquam ea corrupti animi, itaque consequatur neque? At porroSit nemo aliquid quas error doloremque Reiciendis ratione repellendus quae sit commodi amet architecto? Aut officiis aliquam fugit nulla at necessitatibus Optio totam quibusdam laboriosam aperiam libero! Officiis reiciendis Elit quaerat sed vero perferendis architecto consequatur. Consequuntur ad illum dolore ut accusamus. Cum possimus odit sequi quaerat beatae, eveniet. Rerum dolore ipsam quia consectetur iste Veniam mollitia dolores tempore? </view> | ||
| </view> | ||
| <view class="weui-bottom-fixed-opr"> | ||
| <navigator class="weui-btn weui-btn_primary" aria-role="button" url="javascript:;">完成</navigator> | ||
| </view> | ||
| </view> | ||
| </view> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| /*! | ||
| * WeUI v2.5.0 (https://github.com/weui/weui-wxss) | ||
| * Copyright 2021 Tencent, Inc. | ||
| * Licensed under the MIT license | ||
| */ | ||
| .page{height:100%;background:var(--weui-BG-2)}.weui-bottom-fixed-opr-demo{padding:64rpx 64rpx 0} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| Page({ | ||
| mixins: [require('../../mixin/themeChanged')], | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| <page-meta root-font-size="system"/> | ||
| <view class="page" data-weui-theme="{{theme}}"> | ||
| <view class="page__hd"> | ||
| <view class="page__title">Button</view> | ||
| <view class="page__desc">按钮</view> | ||
| </view> | ||
| <view class="page__bd"> | ||
| <view class="button-sp-area"> | ||
| <navigator class="weui-btn weui-btn_primary" aria-role="button" url="javascript:">主要操作</navigator> | ||
| <navigator title="等待中" class="weui-btn weui-btn_primary weui-btn_loading" aria-role="button" url="javascript:"><text class="weui-primary-loading weui-primary-loading_transparent"><text class="weui-primary-loading__dot"></text></text>主要操作</navigator> | ||
| <navigator aria-disabled="true" disabled class="weui-btn weui-btn_disabled weui-btn_primary" aria-role="button" url="javascript:">主要操作</navigator> | ||
| <navigator class="weui-btn weui-btn_default" aria-role="button" url="javascript:">次要操作</navigator> | ||
| <navigator title="等待中" class="weui-btn weui-btn_default weui-btn_loading" aria-role="button" url="javascript:"><text class="weui-primary-loading"><text class="weui-primary-loading__dot"></text></text>次要操作</navigator> | ||
| <navigator aria-disabled="true" disabled class="weui-btn weui-btn_disabled weui-btn_default" aria-role="button" url="javascript:">次要操作</navigator> | ||
| <navigator class="weui-btn weui-btn_warn" aria-role="button" url="javascript:">警示操作</navigator> | ||
| <navigator title="等待中" class="weui-btn weui-btn_warn weui-btn_loading" aria-role="button" url="javascript:"><text class="weui-primary-loading"><text class="weui-primary-loading__dot"></text></text>警示操作</navigator> | ||
| <navigator aria-disabled="true" disabled class="weui-btn weui-btn_disabled weui-btn_warn" aria-role="button" url="javascript:">警示操作</navigator> | ||
| </view> | ||
| <view class="button-sp-area cell"> | ||
| <navigator class="weui-btn_cell weui-btn_cell-default" aria-role="button" url="javascript:">普通行按钮</navigator> | ||
| <navigator class="weui-btn_cell weui-btn_cell-primary" aria-role="button" url="javascript:">强调行按钮</navigator> | ||
| <navigator class="weui-btn_cell weui-btn_cell-primary" aria-role="button" url="javascript:"> | ||
| <image alt="icon" class="weui-btn_cell__icon" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAuCAMAAABgZ9sFAAAAVFBMVEXx8fHMzMzr6+vn5+fv7+/t7e3d3d2+vr7W1tbHx8eysrKdnZ3p6enk5OTR0dG7u7u3t7ejo6PY2Njh4eHf39/T09PExMSvr6+goKCqqqqnp6e4uLgcLY/OAAAAnklEQVRIx+3RSRLDIAxE0QYhAbGZPNu5/z0zrXHiqiz5W72FqhqtVuuXAl3iOV7iPV/iSsAqZa9BS7YOmMXnNNX4TWGxRMn3R6SxRNgy0bzXOW8EBO8SAClsPdB3psqlvG+Lw7ONXg/pTld52BjgSSkA3PV2OOemjIDcZQWgVvONw60q7sIpR38EnHPSMDQ4MjDjLPozhAkGrVbr/z0ANjAF4AcbXmYAAAAASUVORK5CYII="></image> | ||
| 强调行按钮 | ||
| </navigator> | ||
| <navigator class="weui-btn_cell weui-btn_cell-warn" aria-role="button" url="javascript:">警示行按钮</navigator> | ||
| </view> | ||
| <view class="button-sp-area"> | ||
| <navigator class="weui-btn weui-btn_mini weui-btn_primary weui-wa-hotarea" aria-role="button" url="javascript:">按钮</navigator> | ||
| <navigator class="weui-btn weui-btn_mini weui-btn_default weui-wa-hotarea" aria-role="button" url="javascript:">按钮</navigator> | ||
| <navigator class="weui-btn weui-btn_mini weui-btn_warn weui-wa-hotarea" aria-role="button" url="javascript:">按钮</navigator> | ||
| </view> | ||
| </view> | ||
| </view> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| /*! | ||
| * WeUI v2.5.0 (https://github.com/weui/weui-wxss) | ||
| * Copyright 2021 Tencent, Inc. | ||
| * Licensed under the MIT license | ||
| */ | ||
| .button-sp-area{padding-top:30rpx;text-align:center}.weui-btn_mini{margin-right:8rpx} |
Oops, something went wrong.