diff options
| author | Joey Hess <joey@kitenet.net> | 2010-06-10 13:16:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-06-10 13:16:35 -0400 |
| commit | 492c61f825ed792b2bd839b76777454d4102ca8c (patch) | |
| tree | f689e46a9087bdaf628efa611d7842997e66cbfc | |
| parent | 31775762ba897246b8e837b070a9258fb5a3ec6c (diff) | |
page.tmpl: Add a div around the sidebar, page content, and comments, to aide in styling.
http://bzed.de/posts/2010/05/new_css_for_bzed.de/
smcv: [10:59:01] is the logical thing you want a <div> whose meaning is "the bits the sidebar is allowed to accompany"?
bzed: [10:59:14] yeah
bzed: [10:59:58] then you could just ensure that this part is as high as the sidebar
smcv: [11:02:44] wrapping a <div> around the sidebar, content and comments seems like the way forward, then
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | templates/page.tmpl | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 96188c093..abf7a2d87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ ikiwiki (3.20100609) 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. -- Joey Hess <joeyh@debian.org> Mon, 31 May 2010 20:44:17 -0400 diff --git a/templates/page.tmpl b/templates/page.tmpl index 235b693fe..24db9a594 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -106,6 +106,8 @@ <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> @@ -129,6 +131,8 @@ <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> +</div> + <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF> <TMPL_UNLESS DYNAMIC> <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF> |