Merge branch 'master' into antd-3.0

7 years ago · 81fc6d613c
3 changed files with 6 additions and 1 deletions
--- a/components/progress/style/index.less
+++ b/components/progress/style/index.less
@ -54,6 +54,7 @@
  }

  &-text {
+    word-break: normal;
    width: 2em;
    text-align: left;
    font-size: 1em;
--- a/components/table/style/index.less
+++ b/components/table/style/index.less
@ -451,7 +451,7 @@
    }
  }

-  &-pagination {
+  &-pagination.@{ant-prefix}-pagination {
    margin: 16px 0;
    float: right;
  }
--- a/scripts/generateColorLess.js
+++ b/scripts/generateColorLess.js
@ -21,6 +21,10 @@ const COLOR_MAP = {

 const reducePlugin = postcss.plugin('reducePlugin', () => {
  const cleanRule = (rule) => {
+    if (rule.selector.startsWith('.main-color .palatte-')) {
+      rule.remove();
+      return;
+    }
    let removeRule = true;
    rule.walkDecls((decl) => {
      if (