Merge branch 'master' into integration

[git.ikiwiki.info.git] / doc / style.css

diff --git a/doc/style.css b/doc/style.css
index 0fa15d2b1a10a26254ecab2141a8954e31675bc4..e6512aed8834971abf312c3d1ae36f940630e7f9 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -12,7 +12,7 @@
        display: block;
 }
 
-.author {
+.inlineheader .author {
        margin: 0;
        font-size: 18px;
        font-weight: bold;
@@ -23,6 +23,8 @@
        margin: 0;
        padding: 6px;
        list-style-type: none;
+}
+.pageheader .actions ul {
        border-bottom: 1px solid #000;
 }
 
@@ -30,17 +32,26 @@
        border-bottom: 0;
 }
 
+div.inlinecontent {
+       margin-top: .4em;
+}
+
 .actions li {
        display: inline;
        padding: .2em .4em;
 }
 
-.tags {
+.pagefooter {
        clear: both;
 }
+.inlinefooter {
+       clear: both;
+}
+
+.tags {
+}
 
 #pageinfo {
-       clear: both;
        margin: 1em 0;
        border-top: 1px solid #000;
 }
@@ -53,6 +64,12 @@ div.tags {
        text-decoration: none;
 }
 
+.img caption {
+       font-size: 80%;
+       caption-side: bottom;
+       text-align: center;
+}
+
 #backlinks {
        margin-top: 1em;
 }
@@ -70,27 +87,53 @@ img {
        border-style: none;
 }
 
-/* Stuff for the RecentChanges table. */
-tr.changeheader {
+div.recentchanges {
+       border-style: solid;
+       border-width: 1px;
+       overflow: auto;
+       clear: both;
+       width: 100%;
        background: #eee;
        color: black !important;
 }
-tr.changeinfo {
-       background: #eee;
+.recentchanges .metadata {
+       padding: 0px 0.5em;
+}
+.recentchanges .changelog {
+       font-style: italic;
+       clear: both;
+       display: block;
+       padding: 1px 2px;
+       background: white !important;
        color: black !important;
 }
-th.changeheader {
-       padding: 1px .3em;
+.recentchanges .desc {
+       display: none;
 }
-td.changeinfo {
-       padding: 1px .3em;
+.recentchanges .diff {
+       display: none;
 }
-td.changetime {
-       white-space: nowrap;
-       padding: 1px .3em;
+.recentchanges .committer {
+       float: left;
+       margin: 0;
+       width: 40%;
 }
-td.changelog {
-       font-style: italic;
+.recentchanges .committype {
+       float: left;
+       margin: 0;
+       width: 5%;
+       font-size: small;
+}
+.recentchanges .changedate {
+       float: left;
+       margin: 0;
+       width: 35%;
+       font-size: small;
+}
+.recentchanges .pagelinks {
+       float: right;
+       margin: 0;
+       width: 60%;
 }
 
 /* Used for adding a blog page. */
@@ -109,12 +152,15 @@ td.changelog {
 .pagedate,
 .pagelicense,
 .pagecopyright {
-       clear: both;
        font-style: italic;
        display: block;
        margin-top: 1em;
 }
 
+.error {
+       color: #C00;
+}
+
 /* Used for invalid form fields. */
 .fb_invalid {
        color: red;
@@ -169,6 +215,8 @@ td.changelog {
        margin-left: 40px;
        margin-bottom: 40px;
        padding: 2ex 2ex;
+       background: white;
+       color: black !important;
 }
 
 /* outlines */
@@ -210,6 +258,22 @@ div.poll {
        border: 1px solid #aaa;
 }
 
+div.progress {
+       margin-top: 1ex;
+       margin-bottom: 1ex;
+       border: 1px solid #888;
+       width: 400px;
+       background: #eee;
+       color: black !important;
+       padding: 1px;
+}
+div.progress-done {
+       background: #ea6 !important;
+       color: black !important;
+       text-align: center;
+       padding: 1px;
+}
+
 input#openid_url {
        background: url(wikiicons/openidlogin-bg.gif) no-repeat;
        background-color: #fff;
@@ -218,6 +282,14 @@ input#openid_url {
        padding-left: 18px;
 }
 
+input#searchbox {
+       background: url(wikiicons/search-bg.gif) no-repeat;
+       background-color: #fff;
+       background-position: 100% 50%;
+       color: #000;
+       padding-right: 16px;
+}
+
 /* Things to hide in printouts. */
 @media print {
        .actions { display: none; }
@@ -236,6 +308,8 @@ input#openid_url {
        margin-bottom: 1ex;
        padding: 1ex 1ex;
        border: 1px solid #aaa;
+       background: white;
+       color: black !important;
 }
 
 /* Provided for use by template plugin for floating note boxes. */
@@ -246,7 +320,9 @@ input#openid_url {
        margin-bottom: 1ex;
        padding: 1ex 1ex;
        border: 1px solid #aaa;
-       width: 25%
+       width: 25%;
+       background: white;
+       color: black !important;
 }
 
 /* Used by the popup template and for backlinks hiding. */
@@ -268,11 +344,6 @@ input#openid_url {
        border: 2px solid;
        background-color: #dee;
        color: black;
-       
-       /* Nonstandard, but very nice. */
-       opacity: 0.95;
-       -moz-opacity: 0.95;
-       filter: alpha(opacity=95);
 }
 
 /* Formbuilder styling */
@@ -297,3 +368,42 @@ legend {
        background: #eee; 
        color: black !important;
 }
+
+span.color {
+       padding: 2px;
+}
+
+.comment-header,
+.microblog-header {
+       font-style: italic;
+       margin-top: .3em;
+}
+.comment .author,
+.microblog .author {
+       font-weight: bold;
+}
+.comment-subject {
+       font-weight: bold;
+}
+.comment {
+       border: 1px solid #aaa;
+       padding: 3px;
+}
+
+/* Used by the highlight plugin. */
+
+pre.hl { color:#000000; background-color:#ffffff; }
+.hl.num { color:#2928ff; }
+.hl.esc { color:#ff00ff; }
+.hl.str { color:#ff0000; }
+.hl.dstr { color:#818100; }
+.hl.slc { color:#838183; font-style:italic; }
+.hl.com { color:#838183; font-style:italic; }
+.hl.dir { color:#008200; }
+.hl.sym { color:#000000; }
+.hl.line { color:#555555; }
+.hl.mark { background-color:#ffffbb; }
+.hl.kwa { color:#000000; font-weight:bold; }
+.hl.kwb { color:#830000; }
+.hl.kwc { color:#000000; font-weight:bold; }
+.hl.kwd { color:#010181; }