Rollup merge of rust-lang#38480 - clarcharr:import_css, r=steveklabnik

steveklabnik · web-flow · commit 80d745a13229 · 2016-12-24T14:29:22.000-05:00
Don't @import normalize.css. This lets the browser load both files in parallel instead of waiting for `rustdoc.css` to load first.
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
@@ -46,6 +46,7 @@ r##"<!DOCTYPE html>
 
     <title>{title}</title>
 
+    <link rel="stylesheet" type="text/css" href="{root_path}normalize.css">
     <link rel="stylesheet" type="text/css" href="{root_path}rustdoc.css">
     <link rel="stylesheet" type="text/css" href="{root_path}main.css">
     {css_extension}
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
@@ -1,5 +1,3 @@
-@import "normalize.css";
-
 /**
  * Copyright 2013 The Rust Project Developers. See the COPYRIGHT
  * file at the top-level directory of this distribution and at

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-@import "normalize.css";`
`2`		`-`
`3`	`1`	`/**`
`4`	`2`	`* Copyright 2013 The Rust Project Developers. See the COPYRIGHT`
`5`	`3`	`* file at the top-level directory of this distribution and at`