Skip to content

Commit efff75a

Browse files
committed
04-25 更新
1 parent b253da9 commit efff75a

File tree

24 files changed

+183
-313
lines changed

24 files changed

+183
-313
lines changed

Colorui-UniApp/App.vue

+1-4
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
</script>
117117

118118
<style>
119-
@import "colorui/icon.css";
120119
@import "colorui/main.css";
120+
@import "colorui/icon.css";
121121
122122
.nav-list {
123123
display: flex;
@@ -247,7 +247,4 @@
247247
transform: translateY(0px);
248248
}
249249
}
250-
html{
251-
font-size: 18.75px !important;
252-
}
253250
</style>

Colorui-UniApp/README-GitHub.md

-158
This file was deleted.

Colorui-UniApp/Readme.md

+8
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ Vue.component('cu-custom',cuCustom)
103103

104104
## 更新日志
105105

106+
* 2019年4月25日 v2.1.5
107+
* 优化图片上传
108+
* 优化一些点击区域过小
109+
* 优化图标旋转
110+
* 优化demo显示
111+
* 优化阴影
112+
* 修复支付宝小程序编译出错
113+
106114
* 2019年4月14日 v2.1.4
107115
* 新增多种阴影
108116
* 修复一些var属性的错误

Colorui-UniApp/colorui/icon.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@keyframes icon-spin {
1+
@keyframes cuIcon-spin {
22
0% {
33
-webkit-transform: rotate(0);
44
transform: rotate(0);
@@ -11,14 +11,14 @@
1111
}
1212

1313
.iconfont-spin {
14-
-webkit-animation: icon-spin 2s infinite linear;
15-
animation: icon-spin 2s infinite linear;
14+
-webkit-animation: cuIcon-spin 2s infinite linear;
15+
animation: cuIcon-spin 2s infinite linear;
1616
display: inline-block;
1717
}
1818

1919
.iconfont-pulse {
20-
-webkit-animation: icon-spin 1s infinite steps(8);
21-
animation: icon-spin 1s infinite steps(8);
20+
-webkit-animation: cuIcon-spin 1s infinite steps(8);
21+
animation: cuIcon-spin 1s infinite steps(8);
2222
display: inline-block;
2323
}
2424

Colorui-UniApp/colorui/main.css

+29-25
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/*
2-
ColorUi for uniApp v2.1.4 | by 文晓港 2019年04月14日04:16:13
3-
仅供学习交流,如作它用所承受的法律责任一概与作者无关
4-
使用ColorUi开发扩展与插件时,请注明基于ColorUi开发
2+
ColorUi for uniApp v2.1.5 | by 文晓港 2019年4月25日18:57:19
3+
仅供学习交流,如作它用所承受的法律责任一概与作者无关
4+
5+
*使用ColorUi开发扩展与插件时,请注明基于ColorUi开发
56
67
(QQ交流群:240787041)
78
*/
@@ -602,7 +603,7 @@ switch.gray.checked .uni-switch-input,
602603
checkbox.gray.checked .uni-checkbox-input,
603604
radio.gray.checked .uni-radio-input {
604605
background-color: #f0f0f0 !important;
605-
color: var(--) !important;
606+
color: var(--black) !important;
606607
}
607608

608609
switch.black[checked] .wx-switch-input,
@@ -622,7 +623,7 @@ switch.white.checked .uni-switch-input,
622623
checkbox.white.checked .uni-checkbox-input,
623624
radio.white.checked .uni-radio-input {
624625
background-color: var(--white) !important;
625-
color: var(--) !important;
626+
color: var(--black) !important;
626627
}
627628

628629
/* ==================
@@ -741,7 +742,7 @@ radio.white.checked .uni-radio-input {
741742

742743
/* -- 阴影 -- */
743744

744-
.shadow {
745+
.shadow[class*='white'] {
745746
--ShadowSize: 0 1upx 6upx;
746747
}
747748

@@ -1152,7 +1153,7 @@ button.icon.lg {
11521153
align-items: center;
11531154
display: flex;
11541155
font-size: 20upx;
1155-
color: var(--);
1156+
color: var(--black);
11561157
text-indent: 10upx;
11571158
}
11581159

@@ -1805,7 +1806,7 @@ button.icon.lg {
18051806
line-height: 64upx;
18061807
height: 64upx;
18071808
font-size: 24upx;
1808-
color: var(--);
1809+
color: var(--black);
18091810
flex: 1;
18101811
display: flex;
18111812
align-items: center;
@@ -2216,7 +2217,7 @@ button.icon.lg {
22162217

22172218
.cu-timeline>.cu-item>.content:not([class*="bg-"]) {
22182219
background-color: var(--ghostWhite);
2219-
color: var(--);
2220+
color: var(--black);
22202221
}
22212222

22222223
.cu-timeline>.cu-item>.content+.content {
@@ -2269,7 +2270,7 @@ button.icon.lg {
22692270

22702271
.cu-chat .cu-item>.main .content:not([class*="bg-"]) {
22712272
background-color: var(--white);
2272-
color: var(--);
2273+
color: var(--black);
22732274
}
22742275

22752276
.cu-chat .cu-item .date {
@@ -2675,7 +2676,11 @@ button.icon.lg {
26752676
.cu-modal.drawer-modal.show .cu-dialog {
26762677
transform: translateX(0%);
26772678
}
2678-
2679+
.cu-modal .cu-dialog>.cu-bar:first-child .action{
2680+
min-width: 100rpx;
2681+
margin-right: 0;
2682+
min-height: 100rpx;
2683+
}
26792684
/* ==================
26802685
轮播
26812686
==================== */
@@ -3105,7 +3110,11 @@ scroll-view.cu-steps .cu-item {
31053110
position: relative;
31063111
overflow: hidden;
31073112
}
3108-
3113+
.grid.grid-square>view.bg-img image {
3114+
width: 100%;
3115+
height: 100%;
3116+
position: absolute;
3117+
}
31093118
.grid.col-1.grid-square>view {
31103119
padding-bottom: 100%;
31113120
height: 0;
@@ -3118,36 +3127,31 @@ scroll-view.cu-steps .cu-item {
31183127
width: calc((100% - 20upx)/2);
31193128
}
31203129

3121-
.grid.col-2.grid-square>view:nth-child(2n) {
3122-
margin-right: 0;
3123-
}
3124-
31253130
.grid.col-3.grid-square>view {
31263131
padding-bottom: calc((100% - 40upx)/3);
31273132
height: 0;
31283133
width: calc((100% - 40upx)/3);
31293134
}
31303135

3131-
.grid.col-3.grid-square>view:nth-child(3n) {
3132-
margin-right: 0;
3133-
}
3134-
31353136
.grid.col-4.grid-square>view {
31363137
padding-bottom: calc((100% - 60upx)/4);
31373138
height: 0;
31383139
width: calc((100% - 60upx)/4);
31393140
}
31403141

3141-
.grid.col-4.grid-square>view:nth-child(4n) {
3142-
margin-right: 0;
3143-
}
3144-
31453142
.grid.col-5.grid-square>view {
31463143
padding-bottom: calc((100% - 80upx)/5);
31473144
height: 0;
31483145
width: calc((100% - 80upx)/5);
31493146
}
31503147

3148+
.grid.col-2.grid-square>view:nth-child(2n),
3149+
.grid.col-3.grid-square>view:nth-child(3n),
3150+
.grid.col-4.grid-square>view:nth-child(4n),
3151+
.grid.col-5.grid-square>view:nth-child(5n) {
3152+
margin-right: 0;
3153+
}
3154+
31513155
.grid.col-1>view {
31523156
width: 100%;
31533157
}
@@ -3639,7 +3643,7 @@ scroll-view.cu-steps .cu-item {
36393643

36403644
.bg-gray {
36413645
background-color: #f0f0f0;
3642-
color: var(--);
3646+
color: var(--black);
36433647
}
36443648

36453649
.bg-black {

Colorui-UniApp/pages.json

-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
"navigationBarTitleText": ""
1414
}
1515
},
16-
{
17-
"path": "pages/basics/home",
18-
"style": {
19-
"navigationBarTitleText": ""
20-
}
21-
},
2216
{
2317
"path": "pages/basics/background",
2418
"style": {

Colorui-UniApp/pages/basics/button.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</view>
6262
</view>
6363
<view class="grid col-5 padding-sm">
64-
<view class="margin-tb-sm text-center" v-for="(item,index) in ColorList" :key="index">
64+
<view class="margin-tb-sm text-center" v-for="(item,index) in ColorList" :key="index" v-if="item.name!='white'">
6565
<button class="cu-btn round" :class="[bordersize?'lines-' + item.name:'line-' + item.name, shadow?'shadow':'']">{{item.title}}</button>
6666
</view>
6767
</view>

0 commit comments

Comments
 (0)