Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design int…

…o develop-0.12.0
ithanshui · Jan 8, 2016 · 44110db · 44110db
2 parents 0c9afc8 + 6e84d67
commit 44110db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "0.12.0-beta5",
+  "version": "0.12.0-beta6",
   "title": "Ant Design",
   "description": "一个 UI 设计语言",
   "homepage": "http://ant.design/",

diff --git a/style/components/cascader.less b/style/components/cascader.less
@@ -89,7 +89,7 @@
   }
   &-menu {
     float: left;
-    width: 111px;
+    min-width: 111px;
     height: 180px;
     list-style: none;
     margin: 0;
@@ -102,9 +102,7 @@
     }
   }
   &-menu-item {
-    height: 32px;
-    line-height: 32px;
-    padding: 0 16px;
+    padding: 7px 16px;
     cursor: pointer;
     white-space: nowrap;
     overflow: hidden;

diff --git a/style/components/tree.less b/style/components/tree.less
@@ -28,7 +28,6 @@
     outline: 0;
     a[draggable],
     a[draggable="true"] {
-      color: #333;
       -moz-user-select: none;
       -khtml-user-select: none;
       -webkit-user-select: none;
@@ -47,17 +46,17 @@
     }
     &.drag-over-gap-top {
       > a[draggable] {
-        border-top: 2px blue solid;
+        border-top: 2px @primary-color solid;
       }
     }
     &.drag-over-gap-bottom {
       > a[draggable] {
-        border-bottom: 2px blue solid;
+        border-bottom: 2px @primary-color solid;
       }
     }
     &.filter-node {
       > a {
-        color: #a60000!important;
+        color: @error-color!important;
         font-weight: bold!important;
       }
     }