about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2016-12-24 14:29:22 -0500
committerGitHub <noreply@github.com>2016-12-24 14:29:22 -0500
commit80d745a1322934b0b6ab88a5d4a67ebebc5ae79b (patch)
tree6eb5aa2931372716202bda7be0159077a122d206
parentd15a47749a7ee1f8bdeb4303e906b4f4bb3d6b81 (diff)
parent17dd0e5cd9debdaeec264f2574eaa609bce07b0c (diff)
downloadrust-80d745a1322934b0b6ab88a5d4a67ebebc5ae79b.tar.gz
rust-80d745a1322934b0b6ab88a5d4a67ebebc5ae79b.zip
Rollup merge of #38480 - clarcharr:import_css, r=steveklabnik
Don't @import normalize.css.

This lets the browser load both files in parallel instead of waiting for `rustdoc.css` to load first.
-rw-r--r--src/librustdoc/html/layout.rs1
-rw-r--r--src/librustdoc/html/static/rustdoc.css2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs
index 5353642e294..06a81641296 100644
--- 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
index 15912b41d59..ce7c6acdf47 100644
--- 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