None of the template files needed merging with my Responsive Sheffield Blue 2.0 files. I left the 3 template default files that required merging in /template default.
I made small change of wording in includes/lang/eng/checkout_one define:text_enter_shipping_info. I use only one shipper - Canada Post - and they have several options - so existing mod text 'you have only one method available (sic) could be unclear to the reader.
I use only paypal (until Square Regiter mod is developed) and I don't particularly like the paypal img because it implies it can be clicked (while the actual click to confirm button is lower down and off initial screen view. I don't actually see that img in your files so I presume it is paypal driven.
Big bonus of Responsive Sheffield Blue users is that the buttons in One Page Checkout are dead on.
I tested the mod on my iphone 6s+ and it looks/works fine in portrait and landscape.
Bookmarks