Merge branch 'master' of https://github.com/baidu/amis

scss/components/_button-group.scss

@@ -60,6 +60,16 @@
         margin-left: 0;
     }
 
+    // cxd的ButtonGroup的is-active和:active样式不一样，这里做个兼容
+    .#{$ns}Button--primary:not(:disabled):not(.is-disabled).is-active{
+        @if variable-exists("ButtonGroup--primary-isActive-color") {
+            color: $ButtonGroup--primary-isActive-color;
+        }
+        @if variable-exists("ButtonGroup--primary-isActive-bg") {
+            background-color: $ButtonGroup--primary-isActive-bg;
+        }
+    }
+
     @if $Button-borderWidth>0 {
         > .#{$ns}Button:not(:last-child),
         > .#{$ns}ButtonGroup:not(:last-child) > .#{$ns}Button {

scss/layout/_layout.scss

@@ -417,7 +417,8 @@ body {
 
 @include media-breakpoint-down(sm) {
     .#{$ns}Layout {
-        overflow-x: hidden;
+        // Layout 层没有出现滚动条件，导致移动端无法响应固定顶部/底部效果
+        // overflow-x: hidden;
     }
 
     .#{$ns}Layout-content {

scss/themes/cxd.scss

@@ -202,9 +202,9 @@ $Button--primary-border: $primary;
 $Button--primary-onHover-bg: #209bfd;
 $Button--primary-onHover-border: $primary;
 $Button--primary-onHover-color: $white;
-$Button--primary-onActive-bg: $white;
+$Button--primary-onActive-bg: #047bdb;
 $Button--primary-onActive-border: $primary;
-$Button--primary-onActive-color: $primary;
+$Button--primary-onActive-color: $white;
 
 $Button--danger-bg: #ea2e2e;
 $Button--danger-onHover-bg: #f64545;
@@ -212,6 +212,8 @@ $Button--danger-onActive-bg: #d72b2b;
 
 $ButtonGroup-divider-width: px2rem(1px);
 $ButtonGroup-divider-color: #fff;
+$ButtonGroup--primary-isActive-color: $primary;
+$ButtonGroup--primary-isActive-bg: $white;
 
 $Button--link-color: $primary;
 $Button--link-onHover-color: #209bfd;

src/components/Tabs.tsx

@@ -70,13 +70,7 @@ export class Tabs extends React.Component<TabsProps> {
                 key={index}
                 onClick={() => disabled ? '' : this.handleSelect(eventKey)}
             >
-                {icon ? (
-                    <div>
-                        <i className={icon} /><a>{title}</a>
-                    </div>
-                ) : (
-                    <a>{title}</a>
-                )}
+                <a>{icon ? <i className={icon} /> : null} {title}</a>
             </li>
         );
     }
@@ -122,7 +116,7 @@ export class Tabs extends React.Component<TabsProps> {
                     className
                 )}
             >
-                <ul className={cx('Tabs-links')}>
+                <ul className={cx('Tabs-links')} role="tablist">
                     {children.map((tab, index) => (
                         this.renderNav(tab, index)
                     ))}