css: remove useless @import, use .min.css everywhere

debian.css is already minified into debcodesearch.min.css, so the @import resulted in loading that content twice. Using debcodesearch.min.css everywhere shaves off 0.10s of the total loading time (1.56s to 1.47s) and saves 1 request.
Debian · Jun 28, 2016 · 6d614ad · 6d614ad
1 parent e65763a
commit 6d614ad
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 13 deletions.
diff --git a/cmd/dcs-web/templates/error.html b/cmd/dcs-web/templates/error.html
@@ -4,7 +4,7 @@
 <html lang="en">
 <head>
 <title>Error!</title>
-<link rel="stylesheet" href="debcodesearch.css">
+<link rel="stylesheet" href="debcodesearch.min.css">
 <style type="text/css">
 pre, code {
     /* We need to make sure that the line numbers and the code itself have

diff --git a/cmd/dcs-web/templates/perpackage-results.html b/cmd/dcs-web/templates/perpackage-results.html
@@ -4,7 +4,7 @@
 <html lang="en">
 <head>
 <title>Debian Code Search: {{.q}}</title>
-<link rel="stylesheet" href="debcodesearch.css">
+<link rel="stylesheet" href="debcodesearch.min.css">
 <style type="text/css">
 pre, code {
     /* We need to make sure that the line numbers and the code itself have

diff --git a/cmd/dcs-web/templates/placeholder.html b/cmd/dcs-web/templates/placeholder.html
@@ -4,7 +4,7 @@
 <html lang="en">
 <head>
 <title>Debian Code Search: {{.q}}</title>
-<link rel="stylesheet" href="debcodesearch.css">
+<link rel="stylesheet" href="debcodesearch.min.css">
 <style type="text/css">
 pre, code {
     /* We need to make sure that the line numbers and the code itself have

diff --git a/cmd/dcs-web/templates/queryz.html b/cmd/dcs-web/templates/queryz.html
@@ -4,7 +4,7 @@
 <html lang="en">
 <head>
 <title>Debian Code Search: Current queries</title>
-<link rel="stylesheet" href="debcodesearch.css">
+<link rel="stylesheet" href="debcodesearch.min.css">
 <style type="text/css">
 pre, code {
     /* We need to make sure that the line numbers and the code itself have

diff --git a/cmd/dcs-web/templates/results.html b/cmd/dcs-web/templates/results.html
@@ -4,7 +4,7 @@
 <html lang="en">
 <head>
 <title>Debian Code Search: {{.q}}</title>
-<link rel="stylesheet" href="debcodesearch.css">
+<link rel="stylesheet" href="debcodesearch.min.css">
 <style type="text/css">
 pre, code {
     /* We need to make sure that the line numbers and the code itself have

diff --git a/cmd/dcs-web/templates/show.html b/cmd/dcs-web/templates/show.html
@@ -4,7 +4,7 @@
 <html lang="en">
 <head>
 <title>Debian Code Search: {{.filename}}</title>
-<link rel="stylesheet" href="debcodesearch.css">
+<link rel="stylesheet" href="debcodesearch.min.css">
 <style type="text/css">
 pre, code {
     /* We need to make sure that the line numbers and the code itself have

diff --git a/static/50x.html b/static/50x.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Debian Code Search</title>
-<link rel="stylesheet" href="debcodesearch.css">
+<link rel="stylesheet" href="debcodesearch.min.css">
 </head>
 <body>
 

diff --git a/static/about.html b/static/about.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>About Debian Code Search</title>
-<link rel="stylesheet" href="debcodesearch.css">
+<link rel="stylesheet" href="debcodesearch.min.css">
 </head>
 <body>
 

diff --git a/static/contact.html b/static/contact.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Debian Code Search</title>
-<link rel="stylesheet" href="debcodesearch.css">
+<link rel="stylesheet" href="debcodesearch.min.css">
 </head>
 <body>
 

diff --git a/static/debcodesearch.css b/static/debcodesearch.css
@@ -1,6 +1,5 @@
-/* TODO: Verify that the CSS processing order is as specified in an HTML file
- * and then include debian.css first, debcodesearch.css last */
-@import url("debian.css");
+/* debian.css is imported by virtue of minifying it together with this file
+ * into debcodesearch.min.css. */
 
 #searchdiv {
 	text-align: center;

diff --git a/static/faq.html b/static/faq.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>Debian Code Search</title>
-<link rel="stylesheet" href="debcodesearch.css">
+<link rel="stylesheet" href="debcodesearch.min.css">
 </head>
 <body>