CON-706 Changing calc to a different solution

Once Oasis was enabled on Android tablets, lack of support for
calc() in Android Browser prior to 4.4 became a pain.
CON-706 Removed padding
CON-706 Ordering properties, fixing spacing
Merge pull request #3014 from Wikia/CON-706

Con 706