Rollup merge of #47721 - GuillaumeGomez:experimental-color, r=QuietMisdreavus

author Guillaume Gomez <guillaume1.gomez@gmail.com>

Thu, 25 Jan 2018 14:52:17 +0000 (15:52 +0100)

committer GitHub <noreply@github.com>

Thu, 25 Jan 2018 14:52:17 +0000 (15:52 +0100)
author Guillaume Gomez <guillaume1.gomez@gmail.com>
Thu, 25 Jan 2018 14:52:17 +0000 (15:52 +0100)
committer GitHub <noreply@github.com>
Thu, 25 Jan 2018 14:52:17 +0000 (15:52 +0100)
diff --cc src/librustdoc/html/static/themes/main.css
Simple merge
author	Guillaume Gomez <guillaume1.gomez@gmail.com>
	Thu, 25 Jan 2018 14:52:17 +0000 (15:52 +0100)
committer	GitHub <noreply@github.com>
	Thu, 25 Jan 2018 14:52:17 +0000 (15:52 +0100)