Merge remote-tracking branch 'upstream/master'

This commit is contained in:
rickcole 2020-08-21 10:53:45 +08:00
commit 9174f97ee0
2 changed files with 3 additions and 2 deletions

View File

@ -4,8 +4,6 @@ export default {
body: { body: {
type: 'form', type: 'form',
mode: 'horizontal', mode: 'horizontal',
title: '',
debug: true,
api: '/api/mock2/form/saveForm', api: '/api/mock2/form/saveForm',
controls: [ controls: [
{ {

View File

@ -795,6 +795,9 @@
> .#{$ns}Button, > .#{$ns}Button,
> .#{$ns}Button--disabled-wrap > .#{$ns}Button { > .#{$ns}Button--disabled-wrap > .#{$ns}Button {
margin: px2rem(3px); margin: px2rem(3px);
}
> .#{$ns}Button--disabled-wrap > .#{$ns}Button {
padding: 0; padding: 0;
} }