Merge remote-tracking branch 'upstream/master'

2020-08-21 10:53:45 +08:00 · 2020-08-21 10:53:45 +08:00 · 9174f97ee0
parent b836720428 fdc4bf546a
commit 9174f97ee0
2 changed files with 3 additions and 2 deletions
--- a/examples/components/Page/Form.jsx
+++ b/examples/components/Page/Form.jsx
@ -4,8 +4,6 @@ export default {
  body: {
    type: 'form',
    mode: 'horizontal',
-    title: '',
-    debug: true,
    api: '/api/mock2/form/saveForm',
    controls: [
      {
--- a/scss/components/_table.scss
+++ b/scss/components/_table.scss
@ -795,6 +795,9 @@
  > .#{$ns}Button,
  > .#{$ns}Button--disabled-wrap > .#{$ns}Button {
    margin: px2rem(3px);
+  }
+
+  > .#{$ns}Button--disabled-wrap > .#{$ns}Button {
    padding: 0;
  }