added border color + changed color to #999
Merge branch 'upstream/master'

Conflicts:
	less.less