Skip to content

Commit

Permalink
fix: 修复msg组件英文词间断行、picker组件适配darkmode、toast组件的旧版loading图标大小问题
Browse files Browse the repository at this point in the history
  • Loading branch information
uxsi committed Nov 25, 2020
1 parent b6d6652 commit e61a08f
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 22 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### v2.4.2 (2020-11-25)

#### Bugfixes
* fix: 修复picker组件darkmode下的背景色适配问题
* fix: 修复toast组件的旧版loading图标大小
* fix: 修复msg组件英文文本词间断行问题


### v2.4.1 (2020-11-05)

#### Features
Expand Down
21 changes: 10 additions & 11 deletions dist/style/weui.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/style/weui.min.css

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ var browserSync = require('browser-sync');
var childProcess = require('child_process');
var pkg = require('./package.json');
var convertCssVar = require('gulp-convert-css-var');
var exec = require('child_process').exec;

var yargs = require('yargs').options({
w: {
Expand Down Expand Up @@ -199,6 +200,11 @@ gulp.task('server', function() {
});
});

gulp.task('tag', function() {
const tag = `v${pkg.version}`;
exec(`git tag ${tag}`);
});

// 参数说明
// -w: 实时监听
// -s: 启动服务器
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "weui",
"version": "2.4.1",
"version": "2.4.2",
"description": "A UI library by WeChat official design team, includes the most useful widgets/modules in mobile web applications.",
"keywords": [
"weui",
Expand All @@ -18,8 +18,7 @@
"test": "gulp build",
"changelog": "picklog -l -w CHANGELOG.md",
"build": "gulp build",
"version": "git add -A .",
"postversion": "git push && git push --tags",
"release": "gulp tag && git add -A . && git push && git push --tags",
"lint": "stylelint src",
"lint:fix": "stylelint src --fix"
},
Expand Down
6 changes: 0 additions & 6 deletions src/style/widget/weui-page/weui-msg.less
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,15 @@
font-weight: 700;
font-size: 22px;
color: @weuiTextColorTitle;
word-wrap: break-word;
word-break: break-all;
}
.weui-msg__desc {
font-size: 17px;
color: @weuiTextColorTitle;
word-wrap: break-word;
word-break: break-all;
margin-bottom: 16px;
}
.weui-msg__desc-primary {
font-size: 14px;
color: @weuiTextColorDesc;
word-wrap: break-word;
word-break: break-all;
margin-bottom: 16px;
}
.weui-msg__opr-area {
Expand Down
2 changes: 1 addition & 1 deletion src/style/widget/weui-picker/weui-picker.less
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
z-index: 3;
background-image: linear-gradient(180deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6)), linear-gradient(0deg, rgba(255, 255, 255, 0.95), rgba(255, 255, 255, 0.6));
.dark({
background-image: linear-gradient(180deg, rgba(35, 35, 35, 0.95), rgba(35, 35, 35, 0.6)), linear-gradient(0deg, rgba(35, 35, 35, 0.95), rgba(35, 35, 35, 0.6));
background-image: linear-gradient(180deg, rgba(25, 25, 25, 0.95), rgba(25, 25, 25, 0.6)), linear-gradient(0deg, rgba(25, 25, 25, 0.95), rgba(25, 25, 25, 0.6));
});

background-position: top, bottom;
Expand Down
4 changes: 4 additions & 0 deletions src/style/widget/weui-tips/weui-toast.less
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@
&.weui-icon-warn {
color: rgba(255, 255, 255, 0.9);
}
&.weui-loading {
width:36px;
height:36px;
}
&.weui-primary-loading {
.setWeuiPrimaryLoading(36px);
}
Expand Down

0 comments on commit e61a08f

Please sign in to comment.