Merge "Align to CSS coding guidelines and fix CSSLint errors & warnings"