summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-10-23 13:13:17 +0200
committerJonas Smedegaard <dr@jones.dk>2008-10-23 13:13:17 +0200
commit7fb1c12eb8ab54df0085bac0262ba73d5a858194 (patch)
treec8f53c62c95bd88a8994b7582a75ae845e8be300
parentea40716aa31cbbb0b5e18a89dabda1e1fef9b39b (diff)
parentb1fadc6eacaacb4d892b495e15ff82e9ba36c638 (diff)
Merge branch 'master' into master-nonedit
Conflicts (all dropped, as in earlier change in this branch): ikiwiki.mdwn ikiwiki/blog.mdwn ikiwiki/directive.mdwn ikiwiki/formatting.mdwn ikiwiki/pagespec.mdwn ikiwiki/pagespec/attachment.mdwn templates.mdwn
-rw-r--r--shortcuts.mdwn2
-rw-r--r--style.css22
2 files changed, 22 insertions, 2 deletions
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 4bb6774..14cd5ff 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -27,7 +27,7 @@ This page controls what shortcut links the wiki supports.
* [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
* [[!shortcut name=debss url="http://snapshot.debian.net/package/%s"]]
* Usage: `\[[!debss package]]`, `\[[!debss package#version]]`, or `\[[!debss package/version]]`. See http://snapshot.debian.net for details.
- [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]
+* [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]
* [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]]
* [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
* [[!shortcut name=gnomebug url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
diff --git a/style.css b/style.css
index 2e6cdee..5787ef6 100644
--- a/style.css
+++ b/style.css
@@ -30,6 +30,10 @@
border-bottom: 0;
}
+div.inlinecontent {
+ margin-top: .4em;
+}
+
.actions li {
display: inline;
padding: .2em .4em;
@@ -249,6 +253,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;
@@ -295,7 +315,7 @@ input#searchbox {
margin-bottom: 1ex;
padding: 1ex 1ex;
border: 1px solid #aaa;
- width: 25%
+ width: 25%;
background: white;
color: black !important;
}