diff options
| author | Joey Hess <joey@kitenet.net> | 2010-06-10 15:15:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-06-10 15:16:22 -0400 |
| commit | 1609da8f00e29c580e92fd1d3c2b093cbc41d20e (patch) | |
| tree | 3ed717a2341556527d0eb19e9151b6081ceeac0b | |
| parent | 04ff998c51b578017edf369e0dfc2dc7c63d8071 (diff) | |
| download | ikiwiki-1609da8f00e29c580e92fd1d3c2b093cbc41d20e.tar ikiwiki-1609da8f00e29c580e92fd1d3c2b093cbc41d20e.tar.gz | |
I'm told that the pagebody div should be after the sidebar.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | templates/page.tmpl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index d66bcab20..01307db55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,8 @@ ikiwiki (3.20100610) unstable; urgency=low * Fix display of sidebar when previewing page edit. (Thanks, privat) * relativedate: Fix problem with localised dates not working. * editpage: Avoid storing accidental state changes when previewing pages. - * page.tmpl: Add a div around the sidebar, page content, and comments, - to aide in styling. + * page.tmpl: Add a div around the page content, and comments, to aide in + sidebar styling. * style.css: Improvements to make floating sidebar fit much better on pages with inlines. * calendar: Shorten day names, and improve styling of month calendar. diff --git a/templates/page.tmpl b/templates/page.tmpl index 24db9a594..da8c2940f 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -106,14 +106,14 @@ <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> -<div id="pagebody"> - <TMPL_IF SIDEBAR> <TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF> <TMPL_VAR SIDEBAR> <TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> +<div id="pagebody"> + <TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF> <TMPL_VAR CONTENT> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> |