diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/style.css | 12 | ||||
| -rw-r--r-- | templates/autotag.tmpl | 2 | ||||
| -rw-r--r-- | templates/editpage.tmpl | 2 | ||||
| -rw-r--r-- | templates/page.tmpl | 4 |
5 files changed, 20 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 96188c093..f7810c66f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,10 @@ 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. + * style.css: Improvements to make floating sidebar fit better on + pages with inlines. -- Joey Hess <joeyh@debian.org> Mon, 31 May 2010 20:44:17 -0400 diff --git a/doc/style.css b/doc/style.css index 2cd7a9652..d88c93778 100644 --- a/doc/style.css +++ b/doc/style.css @@ -110,7 +110,12 @@ nav { } #editcontent { - width: 100%; + width: 98%; +} + +.editcontentdiv { + width: auto; + overflow: auto; } img { @@ -121,8 +126,8 @@ div.recentchanges { border-style: solid; border-width: 1px; overflow: auto; - clear: both; - width: 100%; + width: auto; + clear: none; background: #eee; color: black !important; } @@ -176,6 +181,7 @@ div.recentchanges { .inlinepage { padding: 10px 10px; border: 1px solid #aaa; + overflow: auto; } .pagedate, diff --git a/templates/autotag.tmpl b/templates/autotag.tmpl index 6bc809d22..9162e9e8d 100644 --- a/templates/autotag.tmpl +++ b/templates/autotag.tmpl @@ -1,4 +1,4 @@ -[[!meta title="tag <TMPL_VAR TAGNAME>"]] +[[!meta title="pages tagged <TMPL_VAR TAGNAME>"]] [[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes" feedshow=10]] diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 118ca4550..36076cb35 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -17,7 +17,9 @@ <TMPL_VAR FIELD-TYPE> </TMPL_IF> <li> +<div class="editcontentdiv"> <TMPL_VAR FIELD-EDITCONTENT><br /> +</div> </li> <TMPL_IF NAME="CAN_COMMIT"> <li> 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> |