Merge commit '3b41f3256228ffb01225eab671ef301aa18337d7' into rollup

Author: alexcrichton

src/librustdoc/html/static/main.css

@@ -120,6 +120,11 @@ code, pre {
     font-family: "Source Code Pro", Menlo, Monaco, Consolas, "DejaVu Sans Mono", Inconsolata, monospace;
     white-space: pre-wrap;
 }
+.docblock code {
+    background-color: #F5F5F5;
+    border-radius: 3px;
+    padding: 0 0.2em;
+}
 pre {
     background-color: #F5F5F5;
     padding: 14px;