From c8038fde327a7c87c94bac05aa8ca9a137d29b9b Mon Sep 17 00:00:00 2001
From: yiminghe <yiminghe@gmail.com>
Date: Mon, 4 Jan 2016 19:23:19 +0800
Subject: [PATCH] move cascade style up

---
 components/cascader/index.jsx | 6 ++++--
 package.json                  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/cascader/index.jsx b/components/cascader/index.jsx
index 448766707a..80edfff09a 100644
--- a/components/cascader/index.jsx
+++ b/components/cascader/index.jsx
@@ -71,10 +71,12 @@ class AntCascader extends React.Component {
         onPopupVisibleChange={this.handlePopupVisibleChange}
         onChange={this.handleChange}>
         {children ||
-          <span className={`${prefixCls}-picker`}>
+          <span
+            style={style}
+            className={`${prefixCls}-picker`}>
             <Input placeholder={placeholder}
               className={`${prefixCls}-input ant-input ${sizeCls}`}
-              style={style}
+              style={{width: '100%'}}
               value={this.getLabel()}
               readOnly />
             {clearIcon}
diff --git a/package.json b/package.json
index fa011cf3bb..1f7b120891 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "0.12.0-beta3",
+  "version": "0.12.0-beta4",
   "title": "Ant Design",
   "description": "一个 UI 设计语言",
   "homepage": "http://ant.design/",