CON-1707 | Some changes after cr, separate scss for Oasis