From c37b1e842562dcd44112907e631f4d4b2e7a8d51 Mon Sep 17 00:00:00 2001 From: Wei Zhu Date: Mon, 20 Nov 2017 12:25:45 +0800 Subject: [PATCH 1/3] site: exclude palatte color fix #8161 --- scripts/generateColorLess.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/generateColorLess.js b/scripts/generateColorLess.js index 98870d3acc..67a493ad07 100644 --- 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 ( From 814f9a72debf8b46d2ef4e4ad8f0001f96f089ea Mon Sep 17 00:00:00 2001 From: Wei Zhu Date: Mon, 20 Nov 2017 14:59:13 +0800 Subject: [PATCH 2/3] Set work-break explicitly form progress text --- components/progress/style/index.less | 1 + 1 file changed, 1 insertion(+) diff --git a/components/progress/style/index.less b/components/progress/style/index.less index 87d0f54db0..641951326f 100644 --- a/components/progress/style/index.less +++ b/components/progress/style/index.less @@ -48,6 +48,7 @@ } &-text { + word-break: normal; width: 2em; text-align: left; font-size: 1em; From 9dd858cc62f9cac5f2a0332d7c4f2d7f0d6db225 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 21 Nov 2017 10:19:11 +0800 Subject: [PATCH 3/3] Fix selector priority, close #8245 --- components/table/style/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/table/style/index.less b/components/table/style/index.less index dd09984c94..ce909d1cde 100644 --- a/components/table/style/index.less +++ b/components/table/style/index.less @@ -441,7 +441,7 @@ } } - &-pagination { + &-pagination.@{ant-prefix}-pagination { margin: 16px 0; float: right; }