summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--doc/style.css12
-rw-r--r--templates/editpage.tmpl2
3 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index abf7a2d87..f7810c66f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (3.20100609) unstable; urgency=low
* 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/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>