Merge branch 'master' into feature

* master: 🔥 update less code style ⬆️ upgrade react-dnd version update Remove unused dependencies 3.10.7 changelog 🐛 Fix typo, #12978 update changelog ✨ Release 3.10.6 🚑 Fix Button[href] 1px align bug in another way tweak style 💄 tweak button style
2024-11-30 11:08:45 +08:00 · 2018-11-12 12:06:24 +08:00 · 2018-11-12 12:06:24 +08:00 · cdafee70f2
commit cdafee70f2
parent 02cedda1e9 a616f89a1b
25 changed files with 75 additions and 56 deletions
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@ -15,6 +15,18 @@ timeline: true

 ---

+# 3.10.7
+
+`2018-11-11`
+
+- 🐞 Fix a button `line-height` typo. [74aeace](https://github.com/ant-design/ant-design/commit/74aeaceaa88034b8cb669efb8aa3b6de41ff6f9d)
+
+## 3.10.6
+
+`2018-11-11`
+
+- 🐞 Reverted [adee2f3](https://github.com/ant-design/ant-design/commit/adee2f33294b9223bda959e6ae27b4d7dadcec49) for fixing link button broken style, and changed another way to resolve [#12978](https://github.com/ant-design/ant-design/issues/12978).
+
 ## 3.10.5

 `2018-11-09`
@ -22,16 +34,16 @@ timeline: true
 - 🎉 [Landing Templates](https://landing.ant.design) released!
 - 📖 Published the new [sketch resource](https://github.com/ant-design/ant-design/releases/download/resource/Ant.Design.Components.Beta.3.10.5.sketch) of Ant Design.
 - Button
-	- 🐞 Fix the style of vertical align in small `Button.Group`. [#12972](https://github.com/ant-design/ant-design/issues/12972)
-	- 🐞 Fix the style of vertical align with `href` prop. [#12978](https://github.com/ant-design/ant-design/issues/12978)
+  - 🐞 Fix the style of vertical align in small `Button.Group`. [#12972](https://github.com/ant-design/ant-design/issues/12972)
+  - 🐞 Fix the style of vertical align with `href` prop. [#12978](https://github.com/ant-design/ant-design/issues/12978)
 - 🐞 Fix the incompatibility for `Cascader[filedNames]` after `3.7.0` version. [#12970](https://github.com/ant-design/ant-design/issues/12970)
 - 🐞 Fix that the show date in pop-up layer should be reset when date value is not modified successfully for `DatePicker`. [#12929](https://github.com/ant-design/ant-design/issues/12929)
 - 🐞 Fix the lose of type `cross` for Icon. [#12970](https://github.com/ant-design/ant-design/issues/12970)
 - 🐞 Fix the incorrect `mode` for collapsed Menu. [#2782](https://github.com/ant-design/ant-design-pro/issues/2782) [#2783](https://github.com/ant-design/ant-design-pro/issues/2783) [#2786](https://github.com/ant-design/ant-design-pro/issues/2786)
 - 🐞 Fix the unnecessary `reflow` to avoid weird wave animation for Popover and Tooltip. [#12942](https://github.com/ant-design/ant-design/issues/12942)
 - Table
-	- 🐞 Fix the style of overflow when nested in other components. [#13025](https://github.com/ant-design/ant-design/issues/13025)
-	- 🐞 Fix the style of overlap between the overlong head content and sort icon. [#12552](https://github.com/ant-design/ant-design/issues/12552) [#12650](https://github.com/ant-design/ant-design/issues/12650)
+  - 🐞 Fix the style of overflow when nested in other components. [#13025](https://github.com/ant-design/ant-design/issues/13025)
+  - 🐞 Fix the style of overlap between the overlong head content and sort icon. [#12552](https://github.com/ant-design/ant-design/issues/12552) [#12650](https://github.com/ant-design/ant-design/issues/12650)
 - 🐞 Fix the disappearance when nested in Popover and Popconfirm for Tooltip whose children is `disabled`. [#13001](https://github.com/ant-design/ant-design/issues/13001)
 - 🐞 Fix the stuck problem when upload non-image file for Upload. [#12948](https://github.com/ant-design/ant-design/issues/12948)
 - 🐞 Fix that `DOM Object` doesn't support property or method `removeAttribute` in `IE` and `Edge`. [#2423](https://github.com/ant-design/ant-design-pro/issues/2423)
@ -48,7 +60,7 @@ timeline: true
 - 🐞 Fixed Divider expands Popover card width under Chrome. [#10914](https://github.com/ant-design/ant-design/issues/10914)
 - 🐞 Fixed Avatar content not aligned in Popover. [#10917](https://github.com/ant-design/ant-design/issues/#10917)
 - Button
-  - 🐞 Fixed unable to find node on unmounted components error. [#12843](https://github.com/ant-design/ant-design/issues/12843) 
+  - 🐞 Fixed unable to find node on unmounted components error. [#12843](https://github.com/ant-design/ant-design/issues/12843)
  - 🐞 Fixed icon margin style. [546c59a](https://github.com/ant-design/ant-design/commit/546c59a4c1a6b482afecbcb4a3cb1e385c0bbdb6)
 - Table
  - 🐞 Fixed sorter issue when render function is present in column. [#12870](https://github.com/ant-design/ant-design/issues/12870) [#12737](https://github.com/ant-design/ant-design/issues/12737)
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@ -15,6 +15,18 @@ timeline: true

 ---

+# 3.10.7
+
+`2018-11-11`
+
+- 🐞 修复一个 Button `line-height` 的笔误。 [74aeace](https://github.com/ant-design/ant-design/commit/74aeaceaa88034b8cb669efb8aa3b6de41ff6f9d)
+
+## 3.10.6
+
+`2018-11-11`
+
+- 🐞 回滚了 [adee2f3](https://github.com/ant-design/ant-design/commit/adee2f33294b9223bda959e6ae27b4d7dadcec49) 以修复一个链接按钮样式问题，并且换了一个方式修复 [#12978](https://github.com/ant-design/ant-design/issues/12978)。
+
 ## 3.10.5

 `2018-11-09`
@ -22,16 +34,16 @@ timeline: true
 - 🎉 发布 [Landing 模板集](https://landing.ant.design)！
 - 📖 发布  Ant Design [新版 Sketch 模版文件](https://github.com/ant-design/ant-design/releases/download/resource/Ant.Design.Components.Beta.3.10.5.sketch)。
 - Button
-	- 🐞 修复在小尺寸的 `Button.Group` 中没有垂直对齐的问题。[#12972](https://github.com/ant-design/ant-design/issues/12972)
-	- 🐞 修复设置了 `href` 属性没有垂直对齐的问题。[#12978](https://github.com/ant-design/ant-design/issues/12978)
+  - 🐞 修复在小尺寸的 `Button.Group` 中没有垂直对齐的问题。[#12972](https://github.com/ant-design/ant-design/issues/12972)
+  - 🐞 修复设置了 `href` 属性没有垂直对齐的问题。[#12978](https://github.com/ant-design/ant-design/issues/12978)
 - 🐞 修复 Cascader 组件的 `filedNames` 属性在 `3.7.0` 版本后的兼容性问题。[#12970](https://github.com/ant-design/ant-design/issues/12970)
 - 🐞 修复 DatePicker 组件的日期值没有被成功修改，浮层中显示的日期应该被重置的问题。[#12929](https://github.com/ant-design/ant-design/issues/12929)
 - 🐞 修复 Icon 组件丢失 `cross` 类型图标的问题。[#12970](https://github.com/ant-design/ant-design/issues/12970)
 - 🐞 修复 Menu 组件处于折叠状态时菜单类型不正确的问题。[#2782](https://github.com/ant-design/ant-design-pro/issues/2782) [#2783](https://github.com/ant-design/ant-design-pro/issues/2783) [#2786](https://github.com/ant-design/ant-design-pro/issues/2786)
 - 🐞 修复 Popover 和 Tooltip 组件中出现不必要的回流问题，避免出现奇怪的动画。[#12942](https://github.com/ant-design/ant-design/issues/12942)
 - Table
-	- 🐞 修复嵌套在其他组件中时样式溢出的问题。[#13025](https://github.com/ant-design/ant-design/issues/13025)
-	- 🐞 修复表头内容过长会与排序图表重合的问题。[#12552](https://github.com/ant-design/ant-design/issues/12552) [#12650](https://github.com/ant-design/ant-design/issues/12650)
+  - 🐞 修复嵌套在其他组件中时样式溢出的问题。[#13025](https://github.com/ant-design/ant-design/issues/13025)
+  - 🐞 修复表头内容过长会与排序图表重合的问题。[#12552](https://github.com/ant-design/ant-design/issues/12552) [#12650](https://github.com/ant-design/ant-design/issues/12650)
 - 🐞 修复 Tooltip 组件嵌套在 `Popover/Popconfirm` 下，并且子元素为 `disabled` 状态时不消失的问题。[#13001](https://github.com/ant-design/ant-design/issues/13001)
 - 🐞 修复 Upload 组件在上传非图片类型文件时会将文件读取至内存，造成浏览器卡顿的问题。[#12948](https://github.com/ant-design/ant-design/issues/12948)
 - 🐞 修复在 `IE` 和 `Edge` 浏览器下 `DOM 对象` 不支持 `removeAttribute` 属性的问题。[#2423](https://github.com/ant-design/ant-design-pro/issues/2423)
@ -49,7 +61,7 @@ timeline: true
 - 🐞 修复 Chrome 下 Divider 在 Popover 中会撑宽 Popover card 的问题。[#10914](https://github.com/ant-design/ant-design/issues/10914)
 - 🐞 修复 Avatar 内容在 Popover 中没有对齐的问题。[#10917](https://github.com/ant-design/ant-design/issues/#10917)
 - Button
-  - 🐞 修复 unable to find node on unmounted components 报错问题。[#12843](https://github.com/ant-design/ant-design/issues/12843) 
+  - 🐞 修复 unable to find node on unmounted components 报错问题。[#12843](https://github.com/ant-design/ant-design/issues/12843)
  - 🐞 修复 icon margin 样式。[546c59a](https://github.com/ant-design/ant-design/commit/546c59a4c1a6b482afecbcb4a3cb1e385c0bbdb6)
 - Table
  - 🐞 修复在 Column 中使用 render function 时的排序问题。[#12870](https://github.com/ant-design/ant-design/issues/12870) [#12737](https://github.com/ant-design/ant-design/issues/12737)
--- a/components/badge/style/index.less
+++ b/components/badge/style/index.less
@ -85,7 +85,7 @@
        height: 100%;
        border-radius: 50%;
        border: 1px solid @processing-color;
-        content: '';
+        content: "";
        animation: antStatusProcessing 1.2s infinite ease-in-out;
      }
    }
--- a/components/button/style/index.less
+++ b/components/button/style/index.less
@ -12,7 +12,10 @@
 // Button styles
 // -----------------------------
 .@{btn-prefix-cls} {
-  line-height: @line-height-base;
+  // Fixing https://github.com/ant-design/ant-design/issues/12978
+  // It is a render problem of chrome, which is only happened in the codesandbox demo
+  // 0.001px solution works and I don't why
+  line-height: @line-height-base - 0.001;
  .btn;
  .btn-default;

@ -79,7 +82,7 @@
    right: -1px;
    background: #fff;
    opacity: 0.35;
-    content: '';
+    content: "";
    border-radius: inherit;
    z-index: 1;
    transition: opacity .2s;
@ -160,7 +163,7 @@
  }

  .christmas&-primary:before {
-    content: '';
+    content: "";
    display: block;
    position: absolute;
    top: -6px;
@ -186,13 +189,11 @@
 }

 a.@{btn-prefix-cls} {
-  > span {
-    line-height: @btn-height-base - 2px;
-  }
-  &-lg > span {
+  line-height: @btn-height-base - 2px;
+  &-lg {
    line-height: @btn-height-lg - 2px;
  }
-  &-sm > span {
+  &-sm {
    line-height: @btn-height-sm - 2px;
  }
 }
--- a/components/button/style/mixin.less
+++ b/components/button/style/mixin.less
@ -25,7 +25,7 @@
 .button-variant-primary(@color; @background) {
  .button-color(@color; @background; @background);
  text-shadow: 0 -1px 0 rgba(0, 0, 0, .12);
-  box-shadow: 0 2px 0 rgba(0, 0, 0, .035);
+  box-shadow: 0 2px 0 rgba(0, 0, 0, .045);

  &:hover,
  &:focus {
@ -101,7 +101,7 @@
  > a:only-child {
    color: currentColor;
    &:after {
-      content: '';
+      content: "";
      position: absolute;
      top: 0;
      left: 0;
@ -167,7 +167,6 @@

  > .@{iconfont-css-prefix} {
    line-height: 1;
-    vertical-align: -0.19em;
  }

  &,
@ -182,7 +181,6 @@

  &:not([disabled]):active {
    outline: 0;
-    transition: none;
    box-shadow: none;
  }

--- a/components/checkbox/style/mixin.less
+++ b/components/checkbox/style/mixin.less
@ -28,7 +28,7 @@
      height: 100%;
      border-radius: @border-radius-sm;
      border: 1px solid @checkbox-color;
-      content: '';
+      content: "";
      animation: antCheckboxEffect 0.36s ease-in-out;
      animation-fill-mode: both;
      visibility: hidden;
--- a/components/date-picker/style/RangePicker.less
+++ b/components/date-picker/style/RangePicker.less
@ -134,7 +134,7 @@
      z-index: 1;
    }
    &:before {
-      content: '';
+      content: "";
      display: block;
      background: @item-active-bg;
      border-radius: 0;
--- a/components/date-picker/style/TimePicker.less
+++ b/components/date-picker/style/TimePicker.less
@ -90,7 +90,7 @@
    }

    li:last-child:after {
-      content: '';
+      content: "";
      height: 202px;
      display: block;
    }
--- a/components/divider/style/index.less
+++ b/components/divider/style/index.less
@ -39,7 +39,7 @@
    margin: 16px 0;
    &:before,
    &:after {
-      content: '';
+      content: "";
      display: table-cell;
      position: relative;
      top: 50%;
--- a/components/form/style/mixin.less
+++ b/components/form/style/mixin.less
@ -91,7 +91,7 @@
  input[type="radio"]:focus,
  input[type="checkbox"]:focus {
    outline: thin dotted;
-    outline: 5px auto -webkit-focus-ring-color; // lesshint duplicateProperty: false
+    outline: 5px auto -webkit-focus-ring-color;
    outline-offset: -2px;
  }

--- a/components/grid/style/mixin.less
+++ b/components/grid/style/mixin.less
@ -49,7 +49,6 @@
  .col(1); // kickstart it
 }

-// lesshint false
 .loop-grid-columns(@index, @class) when (@index > 0) {
  .@{ant-prefix}-col@{class}-@{index} {
    display: block;
--- a/components/input/style/mixin.less
+++ b/components/input/style/mixin.less
@ -160,7 +160,7 @@

    // Reset Select's style in addon
    .@{ant-prefix}-select {
-      margin: -(@input-padding-vertical-base + 1px) (-@input-padding-horizontal-base);  // lesshint spaceAroundOperator: false
+      margin: -(@input-padding-vertical-base + 1px) (-@input-padding-horizontal-base);

      .@{ant-prefix}-select-selection {
        background-color: inherit;
@ -181,7 +181,7 @@
    // https://github.com/ant-design/ant-design/issues/3714
    > i:only-child:after {
      position: absolute;
-      content: '';
+      content: "";
      top: 0;
      left: 0;
      right: 0;
--- a/components/menu/style/index.less
+++ b/components/menu/style/index.less
@ -67,7 +67,7 @@
      left: 0;
      bottom: 0;
      right: 0;
-      content: '';
+      content: "";
    }
  }

@ -216,7 +216,7 @@
        width: 10px;
        &:before,
        &:after {
-          content: '';
+          content: "";
          position: absolute;
          vertical-align: baseline;
          background: #fff;
--- a/components/modal/style/modal.less
+++ b/components/modal/style/modal.less
@ -114,7 +114,7 @@
    right: 0;
    left: 0;
    bottom: 0;
-    background-color: @modal-mask-bg; // lesshint duplicateProperty: false
+    background-color: @modal-mask-bg;
    height: 100%;
    z-index: @zindex-modal-mask;
    filter: ~"alpha(opacity=50)";
@ -132,7 +132,7 @@
 .@{dialog-prefix-cls}-centered {
  text-align: center;
  &:before {
-    content: '';
+    content: "";
    display: inline-block;
    height: 100%;
    vertical-align: middle;
--- a/components/notification/style/index.less
+++ b/components/notification/style/index.less
@ -58,7 +58,7 @@
        display: block;
        max-width: 4px;
        &:before {
-          content: '';
+          content: "";
          display: block;
        }
      }
--- a/components/radio/style/index.less
+++ b/components/radio/style/index.less
@ -46,7 +46,7 @@
    height: 100%;
    border-radius: 50%;
    border: 1px solid @radio-dot-color;
-    content: '';
+    content: "";
    animation: antRadioEffect 0.36s ease-in-out;
    animation-fill-mode: both;
    visibility: hidden;
--- a/components/spin/style/index.less
+++ b/components/spin/style/index.less
@ -90,7 +90,7 @@
    filter: ~"progid\:DXImageTransform\.Microsoft\.Blur(PixelRadius\=1, MakeShadow\=false)";

    &:after {
-      content: '';
+      content: "";
      position: absolute;
      left: 0;
      right: 0;
--- a/components/steps/style/index.less
+++ b/components/steps/style/index.less
@ -82,7 +82,7 @@
    top: 12px;
    padding: 0 10px;
    &:after {
-      content: '';
+      content: "";
      display: inline-block;
      background: @border-color-split;
      height: 1px;
@ -99,7 +99,7 @@
    position: relative;
    line-height: @steps-icon-size;
    &:after {
-      content: '';
+      content: "";
      height: 1px;
      width: 9999px;
      background: @wait-tail-color;
--- a/components/style/core/motion/other.less
+++ b/components/style/core/motion/other.less
@ -11,7 +11,7 @@

 [ant-click-animating-without-extra-node]:after,
 .ant-click-animating-node {
-  content: '';
+  content: "";
  position: absolute;
  top: -1px;
  left: -1px;
--- a/components/style/mixins/iconfont.less
+++ b/components/style/mixins/iconfont.less
@ -33,7 +33,7 @@
  @font-scale: unit(@size / 12px);
  font-size: 12px;
  // IE9
-  font-size: ~"@{size} \9"; // lesshint duplicateProperty: false
+  font-size: ~"@{size} \9";
  transform: scale(@font-scale) rotate(@rotate);
  :root & {
    font-size: @font-size-sm; // reset IE9 and above
--- a/components/table/style/index.less
+++ b/components/table/style/index.less
@ -154,7 +154,7 @@
    .@{table-prefix-cls}-column-sorters {
      &:before {
        position: absolute;
-        content: '';
+        content: "";
        top: 0;
        left: 0;
        right: 0;
@ -219,7 +219,7 @@
    position: relative;
    border-top: @border-width-base @border-style-base @border-color-split;
    &:before {
-      content: '';
+      content: "";
      height: 1px;
      background: @table-header-bg;
      position: absolute;
--- a/components/tree/style/directory.less
+++ b/components/tree/style/directory.less
@ -42,7 +42,7 @@
          }

          &:before {
-            content: '';
+            content: "";
            position: absolute;
            left: 0;
            right: 0;
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "antd",
-  "version": "3.10.5",
+  "version": "3.10.7",
  "title": "Ant Design",
  "description": "An enterprise-class UI design language and React-based implementation",
  "homepage": "http://ant.design/",
@ -139,7 +139,6 @@
    "lz-string": "^1.4.4",
    "majo": "^0.6.2",
    "mockdate": "^2.0.2",
-    "moment-timezone": "^0.5.21",
    "pre-commit": "^1.2.2",
    "preact": "^8.3.1",
    "preact-compat": "^3.18.4",
@ -150,8 +149,8 @@
    "react": "^16.5.2",
    "react-color": "^2.14.1",
    "react-copy-to-clipboard": "^5.0.1",
-    "react-dnd": "^5.0.0",
-    "react-dnd-html5-backend": "^5.0.1",
+    "react-dnd": "^6.0.0",
+    "react-dnd-html5-backend": "^6.0.0",
    "react-document-title": "^2.0.3",
    "react-dom": "^16.5.2",
    "react-github-button": "^0.1.11",
@ -160,7 +159,6 @@
    "react-resizable": "^1.7.5",
    "react-router-dom": "^4.3.1",
    "react-sticky": "^6.0.3",
-    "react-sublime-video": "^0.2.5",
    "react-virtualized": "~9.21.0",
    "remark-frontmatter": "^1.3.0",
    "remark-parse": "^6.0.0",
@ -173,7 +171,6 @@
    "stylelint-config-standard": "^18.2.0",
    "typescript": "~3.1.1",
    "unified": "^7.0.0",
-    "values.js": "^1.0.3",
    "xhr-mock": "^2.4.1",
    "xhr2": "^0.1.4"
  },
--- a/site/theme/static/mock-browser.less
+++ b/site/theme/static/mock-browser.less
@ -13,7 +13,7 @@
 .browser-mockup:before {
  display: block;
  position: absolute;
-  content: '';
+  content: "";
  top: -1.25em;
  left: 1em;
  width: 0.5em;
@ -26,7 +26,7 @@
 .browser-mockup.with-tab:after {
  display: block;
  position: absolute;
-  content: '';
+  content: "";
  top: -2em;
  left: 5.5em;
  width: 20%;
@ -39,7 +39,7 @@
 .browser-mockup.with-url:after {
  display: block;
  position: absolute;
-  content: '';
+  content: "";
  top: -1.6em;
  left: 5.5em;
  width: ~"calc(100% - 6em)";
--- a/site/theme/static/preview-img.less
+++ b/site/theme/static/preview-img.less
@ -53,7 +53,7 @@
 }

 .preview-image-wrapper.good:after {
-  content: '';
+  content: "";
  width: 100%;
  height: 3px;
  background: @primary-color;
@ -64,7 +64,7 @@
 }

 .preview-image-wrapper.bad:after {
-  content: '';
+  content: "";
  width: 100%;
  height: 3px;
  background: @error-color;