Merge remote-tracking branch 'upstream/master'

* upstream/master:
  tree 样式优化
  Bump tinymce from 5.2.2 to 5.4.1
This commit is contained in:
wuduoyi 2020-08-12 14:00:14 +08:00
commit 5019dd9f41
2 changed files with 1 additions and 2 deletions

View File

@ -71,7 +71,7 @@
"redux": "^3.7.2",
"setimmediate": "1.0.5",
"sortablejs": "1.10.0",
"tinymce": "5.2.2",
"tinymce": "5.4.1",
"tslib": "^1.10.0",
"uncontrollable": "7.0.2",
"video-react": "0.9.4"

View File

@ -220,7 +220,6 @@
> .#{$ns}Checkbox {
line-height: 1;
display: inline-block;
padding-top: $Form-label-paddingTop - px2rem(1px);
}
}