CSR-203: resolve conflict with develop branch
This commit is contained in:
commit
0253c2efef
1 changed files with 3 additions and 2 deletions
|
|
@ -60,7 +60,7 @@ export default {
|
||||||
vm.radioQuestionWidgets = resultMap.getPageContent.RadioQuestionWidget[0];
|
vm.radioQuestionWidgets = resultMap.getPageContent.RadioQuestionWidget[0];
|
||||||
vm.vehicleBannerWidget = resultMap.getPageContent.VehicleBannerWidget[0];
|
vm.vehicleBannerWidget = resultMap.getPageContent.VehicleBannerWidget[0];
|
||||||
vm.vehicleYears = resultMap.getVehicleYear;
|
vm.vehicleYears = resultMap.getVehicleYear;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -90,6 +90,7 @@ export default {
|
||||||
height: calc(100% - 300px);
|
height: calc(100% - 300px);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 0 1.5rem;
|
padding: 0 1.5rem;
|
||||||
|
-webkit-overflow-scrolling: touch;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue