Merge branch 'master' into master-nonedit + drop ikiwiki/directive.mdwn

3 files changed, 21 insertions, 2 deletions

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 037c31e..4bb6774 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -61,13 +61,13 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
 
 To add a new shortcut, use the `shortcut`
-[[ikiwiki/PreprocessorDirective]]. In the url, "%s" is replaced with the
+[[ikiwiki/directive]]. In the url, "%s" is replaced with the
 text passed to the named shortcut, after url-encoding it, and '%S' is
 replaced with the raw, non-encoded text. The optional `desc` parameter
 controls the description of the link.
 
 Remember that the `name` you give the shortcut will become a new
-[[ikiwiki/PreprocessorDirective]].  Avoid using a `name` that conflicts
+[[ikiwiki/directive]].  Avoid using a `name` that conflicts
 with an existing directive.  These directives also accept a `desc`
 parameter that will override the one provided at definition time.
 
diff --git a/style.css b/style.css
index 0e3bfb3..2e6cdee 100644
--- a/style.css
+++ b/style.css
@@ -82,6 +82,7 @@ div.recentchanges {
 	border-style: solid;
 	border-width: 1px;
 	overflow: auto;
+	clear: both;
 	width: 100%;
 	background: #eee;
 	color: black !important;
@@ -205,6 +206,8 @@ div.recentchanges {
 	margin-left: 40px;
 	margin-bottom: 40px;
 	padding: 2ex 2ex;
+	background: white;
+	color: black !important;
 }
 
 /* outlines */
@@ -254,6 +257,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; }
@@ -272,6 +283,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. */
@@ -283,6 +296,8 @@ input#openid_url {
 	padding: 1ex 1ex;
 	border: 1px solid #aaa;
 	width: 25%
+	background: white;
+	color: black !important;
 }
 
 /* Used by the popup template and for backlinks hiding. */
@@ -333,3 +348,7 @@ legend {
 	background: #eee; 
 	color: black !important;
 }
+
+span.color {
+	padding: 2px;
+}
diff --git a/wikiicons/search-bg.gif b/wikiicons/search-bg.gif
new file mode 100644
index 0000000..02f9da4
--- /dev/null
+++ b/wikiicons/search-bg.gif