aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-06 17:31:00 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-04-06 17:31:00 +0000
commit8d03891ebab60eb2db65f26183d06249937d2458 (patch)
treeb2901d276834b97a5c4c5c235b5900b1ecadb5aa
parent3bb79c43dad290c979c675203f050ef3bd5e40ea (diff)
downloadikiwiki-8d03891ebab60eb2db65f26183d06249937d2458.tar
ikiwiki-8d03891ebab60eb2db65f26183d06249937d2458.tar.gz
* Reorder the icon in the template above the stylesheets, to avoid icon
flashing during page load.
-rw-r--r--debian/changelog4
-rw-r--r--templates/page.tmpl4
2 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index f5dc35986..ae77a3dcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,8 +39,10 @@ ikiwiki (1.49) UNRELEASED; urgency=low
[ Joey Hess ]
* Updated French translation from JLC. Closes: #417982
+ * Reorder the icon in the template above the stylesheets, to avoid icon
+ flashing during page load.
- -- Joey Hess <joeyh@debian.org> Fri, 06 Apr 2007 13:14:15 -0400
+ -- Joey Hess <joeyh@debian.org> Fri, 06 Apr 2007 13:30:20 -0400
ikiwiki (1.48) unstable; urgency=low
diff --git a/templates/page.tmpl b/templates/page.tmpl
index 61d22723f..aebd6a5c4 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -4,11 +4,11 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><TMPL_VAR TITLE></title>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
<TMPL_IF NAME="FAVICON">
<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
</TMPL_IF>
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
<TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
<TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
</head>