updated css file from less styles.
resolving merge conflict