Merge branch '1.x' into 'dev'

packages/step/index.js

@@ -5,7 +5,9 @@ const [sfc, bem] = use('step');
 
 export default sfc({
   beforeCreate() {
-    this.$parent.steps.push(this);
+    const { steps } = this.$parent;
+    const index = this.$parent.slots().indexOf(this.$vnode);
+    steps.splice(index === -1 ? steps.length : index, 0, this);
   },
 
   beforeDestroy() {

packages/step/index.less

@@ -26,7 +26,7 @@
 
     &:last-child {
       position: absolute;
-      right: 10px;
+      right: 1px;
       width: auto;
 
       .van-step__title {
@@ -55,6 +55,10 @@
       font-size: 12px;
       margin-left: 3px;
       transform: translateX(-50%);
+
+      @media(max-width: 321px) {
+        font-size: 11px;
+      }
     }
 
     .van-step__line {