Merge pull request #948 from DivanteLtd/develop

Minor fixes before RC2

Author: pkarw

core/components/blocks/Form/BaseInput.vue

@@ -37,6 +37,11 @@ export default {
       required: false,
       default: false
     },
+    autofocus: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     validation: {
       type: Object,
       required: false,

core/resource/i18n/en-US.csv

@@ -271,7 +271,7 @@
 "You've entered an incorrect coupon code. Please try again.","You've entered an incorrect coupon code. Please try again."
 "Add a discount code","Add a discount code"
 "Discount code","Discount code"
-"Add discount code","Add discount code"
+"Add discount code","Apply"
 "color_filter","Color"
 "size_filter","Size"
 "price_filter","Price"

package.json

@@ -82,7 +82,9 @@
     "vuelidate": "^0.6.2",
     "vuex": "^3.0.0",
     "vuex-router-sync": "^5.0.0",
-    "rimraf": "^2.6.0"
+    "rimraf": "^2.6.0",
+    "vue-carousel": "^0.6.9",
+    "vue-no-ssr": "^0.2.2"    
   },
   "devDependencies": {
     "babel-core": "^6.26.0",

src/themes/default/components/core/blocks/Checkout/PersonalDetails.vue

@@ -36,6 +36,7 @@
           <base-input
             class="col-xs-12 col-md-6 mb25"
             type="text"
+            :autofocus="true"
             name="first-name"
             :placeholder="$t('First name *')"
             v-model.trim="personalDetails.firstName"

src/themes/default/components/core/blocks/Form/BaseInput.vue

@@ -3,14 +3,15 @@
     <input
       class="
         py10 w-100 border-box brdr-none brdr-bottom
-        brdr-cl-primary h4 weight-200 sans-serif
+        brdr-cl-primary h4 sans-serif
       "
       :class="{pr30: type === 'password'}"
       :type="type === 'password' ? passType : type"
       :name="name"
       :placeholder="placeholder"
       :autocomplete="autocomplete"
       :value="value"
+      :autofocus="autofocus"
       :ref="focus ? name : false"
       @input="$emit('input', $event.target.value)"
       @blur="$emit('blur')"

src/themes/default/components/core/blocks/Microcart/Microcart.vue

@@ -58,7 +58,7 @@
         <div v-if="isOnline && segment.code === 'discount' && addCouponPressed" class="col-xs-12 pt30 coupon-wrapper">
           <div class="coupon-input">
             <label class="h6 cl-secondary">{{ $t('Discount code') }}</label>
-            <base-input type="text" id="couponinput" :focus="true" v-model.trim="couponCode" @keyup="enterCoupon"/>
+            <base-input type="text" id="couponinput" :autofocus="true" v-model.trim="couponCode" @keyup="enterCoupon"/>
           </div>
           <button-outline color="dark" :disabled="!couponCode" @click.native="applyCoupon">{{ $t('Add discount code') }}</button-outline>
         </div>