Merge branch 'master' of github.com:ant-design/ant-design

components/form/demo/inline-form.md

@@ -14,7 +14,7 @@
   </div>
   <div class="ant-form-item">
     <label for="password">密码：</label>
-    <input class="ant-input" type="text" id="password" placeholder="请输入密码"/>
+    <input class="ant-input" type="password" id="password" placeholder="请输入密码"/>
   </div>
   <input type="submit" class="ant-btn ant-btn-primary" value="登录" />
 </form>
@@ -26,7 +26,7 @@
     <input class="ant-input" type="text" id="userName" placeholder="请输入账户名"/>
   </div>
   <div class="ant-form-item">
-    <input class="ant-input" type="text" id="password" placeholder="请输入密码"/>
+    <input class="ant-input" type="password" id="password" placeholder="请输入密码"/>
   </div>
   <div class="ant-checkbox">
     <label>

style/components/slider.less

@@ -14,7 +14,7 @@
   margin: 12px 0;
   margin-left: 7px;
   height: 4px;
-  width: 100%;
+  width: auto;
   border-radius: @border-radius-base;
   background-color: #e9e9e9;