diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-26 19:33:28 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-26 19:33:28 +0000 |
| commit | fe52c28bd660013563c55574bddfac28d132b8b9 (patch) | |
| tree | 26aedf20b6195aaf272e65612d101bbc7259ef64 | |
| parent | 67e299bf7d21d1cefde63d7ff3499539186a48c1 (diff) | |
| download | ikiwiki-fe52c28bd660013563c55574bddfac28d132b8b9.tar ikiwiki-fe52c28bd660013563c55574bddfac28d132b8b9.tar.gz | |
* Move the footer div to enclose tags and links too.
* More style sheet updates, remove the hack that used the tags div to create
the footer border.
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | doc/style.css | 10 | ||||
| -rw-r--r-- | templates/page.tmpl | 4 |
3 files changed, 11 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 57a5bd4a2..51a7b1188 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,11 +9,14 @@ ikiwiki (1.51) UNRELEASED; urgency=low * Fix aggregator to not warn when a feed contains no body content at all. * Work around bug #420636 by, if XML::Parser crashes, running the feed content though Encode::decode_utf8. + * Move the footer div to enclose tags and links too. + * More style sheet updates, remove the hack that used the tags div to create + the footer border. [ Josh Triplett ] * Change basewiki CSS to not put a border around images used as links. - -- Josh Triplett <josh@freedesktop.org> Tue, 24 Apr 2007 13:50:51 -0700 + -- Joey Hess <joeyh@debian.org> Thu, 26 Apr 2007 15:24:22 -0400 ikiwiki (1.50) unstable; urgency=low diff --git a/doc/style.css b/doc/style.css index 0143b8fac..929934927 100644 --- a/doc/style.css +++ b/doc/style.css @@ -35,19 +35,17 @@ padding: .2em .4em; } -#backlinks { - margin: 1em 0; -} - .tags { clear: both; } -div.tags { +#footer { + clear: both; + margin: 1em 0; border-top: 1px solid #000; } -#footer { +#backlinks { margin: 1em 0; } diff --git a/templates/page.tmpl b/templates/page.tmpl index e9cc62b6d..3cb8e75bb 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -58,6 +58,8 @@ <TMPL_VAR CONTENT> </div> +<div id="footer"> + <TMPL_IF NAME="TAGS"> <div class="tags"> Tags: @@ -85,12 +87,12 @@ Links: </div> </TMPL_IF> -<div id="footer"> <div class="pageinfo"> <!-- from <TMPL_VAR NAME=WIKINAME> --> Last edited <TMPL_VAR NAME=MTIME> <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF> </div> + </div> </body> |