]> sipb.mit.edu Git - ikiwiki.git/commitdiff
sipb-www / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3bb79c4)
* Reorder the icon in the template above the stylesheets, to avoid icon
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Fri, 6 Apr 2007 17:31:00 +0000 (17:31 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Fri, 6 Apr 2007 17:31:00 +0000 (17:31 +0000)
  flashing during page load.

debian/changelog patch | blob | history
templates/page.tmpl patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index f5dc3598656ea156c1c0500fc61da39747c0e4a2..ae77a3dcd1463d6ba731e7db2c3c64a5d0ec4319 100644 (file)
--- 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 61d22723f0c2010bb31f7b67e96d68c595bda2c9..aebd6a5c4dc9e9ff8c2a26d7c227300825c47458 100644 (file)
--- 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>
wiki compiler