merge helponformatting fix to basewiki

[ikiwiki.git] / basewiki / style.css

diff --git a/basewiki/style.css b/basewiki/style.css
index abedf58055e7258393aed3a87bf4f1e2120eb7d5..c03f39ea35856a73a078a36e8bcb4b9ff93e5e58 100644 (file)
--- a/basewiki/style.css
+++ b/basewiki/style.css
@@ -1,3 +1,9 @@
+/* ikiwiki style sheet */
+
+/* Note that instead of modifying this style sheet, you can instead create
+ * a local.css in your wiki, and override or change settings in this one.
+ */
+
 .header {
        margin: 0;
        font-size: 22px;
@@ -13,27 +19,43 @@
        display: block;
 }
 
-#actions ul {
+.actions ul {
        margin: 0;
        padding: 6px;
        list-style-type: none;
        border-bottom: 1px solid #000;
 }
 
-#actions li {
+.inlinepage .actions ul {
+       border-bottom: 0;
+}
+
+.actions li {
        display: inline;
        padding: .2em .4em;
 }
 
+#backlinks {
+       margin: 1em 0;
+}
+
+.tags {
+       clear: both;
+}
+
+div.tags {
+       border-top: 1px solid #000;
+}
+
+#footer {
+       margin: 1em 0;
+}
+
 #searchform {
        display: inline;
        float: right;
 }
 
-#content {
-       border-bottom: 1px solid #000;
-}
-
 #editcontent {
        width: 100%;
 }      
@@ -74,15 +96,8 @@ td.changelog {
        border: 1px solid #aaa;
 }
 
-#backlinks {
-       margin: 1em 0;
-}
-
-#footer {
-       margin: 1em 0;
-}
-
 .pageinfo {
+       clear: both;
        font-style: italic;
        display: block;
 }
@@ -144,8 +159,18 @@ td.changelog {
        margin-left: 2ex;
        margin-top: 1ex;
        margin-bottom: 1ex;
-       padding: 2ex 2ex;
+       padding: 1ex 1ex;
+       border: 1px solid #aaa;
+}
+
+.notebox {
+       float: right;
+       margin-left: 2ex;
+       margin-top: 1ex;
+       margin-bottom: 1ex;
+       padding: 1ex 1ex;
        border: 1px solid #aaa;
+       width: 25%
 }
 
 /* outlines  */