Merge branch 'master' into po

Conflicts:
	debian/control

2 files changed, 150 insertions, 83 deletions

diff --git a/doc/css_market/discussion.mdwn b/doc/css_market/discussion.mdwn
index cba13132e..f80053e38 100644
--- a/doc/css_market/discussion.mdwn
+++ b/doc/css_market/discussion.mdwn
@@ -5,3 +5,12 @@ What is the correct way to install the .tmpl files? -- [[JosephTurian]]
 > ikiwiki's standard templates (in, eg `/usr/share/ikiwiki/templates`)
 > --[[Joey]]
 
+----
+
+How can I update a .css file uploaded to the CSS market?
+My CSS has been updated to address comments (for the comments plugin), but I cannot find a way to update zack.css.
+The most recent version is always available at: <http://git.upsilon.cc/cgi-bin/gitweb.cgi?p=zack-homepage.git;a=blob_plain;f=local.css;hb=HEAD>
+
+-- [[StefanoZacchiroli]]
+
+> Just letting me know about the change works -- updated. --[[Joey]] 
diff --git a/doc/css_market/zack.css b/doc/css_market/zack.css
index dbc2e5c44..5a0521d54 100644
--- a/doc/css_market/zack.css
+++ b/doc/css_market/zack.css
@@ -14,122 +14,180 @@
  */
 
 body {
-  font-family: sans;
-  width: 760px;
-  margin-left: 20px;
+  font-family: sans-serif;
+  font-size: medium;
 }
+h1, h2, h3, h4 {
+  font-weight: normal;
+}
+h1 { font-size: 140%; }
+h2 { font-size: 120%; }
+h3 { font-size: 110%; }
+h4 { font-size: 105% }
 
-div#content {
-  font-size: 11pt;
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+
+.flow {
+  float: right;
+  margin-left: 10px;
+  margin-bottom: 10px;
+  text-align: center;
 }
 
-.header span {
-  font-size: 14pt;
-  font-weight: normal;
+.attrib-caption {
+  font-size: xx-small;
+  font-style: italic;
 }
 
-div.actions ul {
-  font-size: 10pt;
+input {
+  border: solid 1px;
+  border-color: #aaa;
 }
 
-h1 {
-  font-weight: normal;
-  font-size: 17pt;
+.header { font-weight: normal; }
+
+.selflink { text-decoration: underline; }
+
+.pageheader .actions ul,
+#sitemeta {
+  border-top: solid 1px;
+  border-bottom: solid 1px;
+  font-size: small;
+  border-color: #aaa;
+  background: #eee;
 }
-h2 {
-  font-weight: normal;
-  font-size: 16pt;
+.actions ul {
+  padding: 1px;
+  margin-top: 5px;
 }
-h3 {
-  font-weight: normal;
-  font-size: 15pt;
+#sitemeta {
+  padding: 0;
+  margin-bottom: 5px;
 }
-h4 {
-  font-weight: normal;
-  font-size: 14pt;
+#backlinks,
+.tags {
+  margin-top: 0;
+  margin-bottom: 0;
 }
-h5 {
-  font-weight: normal;
-  font-size: 13pt;
+
+#pageinfo {
+  border: none;
 }
-h6 {
-  font-weight: normal;
-  font-size: 12pt;
+
+#searchform div:before {
+  font-size: small;
+  content: "search:";
+}
+#searchform input {
+  border-top: none;
+  border-bottom: none;
+  vertical-align: bottom;
+  margin-right: 7px;
 }
 
-div.inlinepage > span.header > a {
-  float: right;
-  display: block;
-  font-size: 11pt;
-  font-weight: normal;
-  margin: 0;
+#sidebar {
+  border: solid;
+  border-width: 1px;
   padding: 0;
+  margin-top: 15px;
+  border: 1px solid;
+  border-color: #aaa;
+  background: #eee;
+  width: 16ex;
 }
-div.inlinepage > span.header > a:before {
-  content: "permalink: ";
-  font-size: smaller;
-  text-decoration: none;
-  font-style: italic;
+#sidebar ul {
+  margin: 0;
+  padding-left: 1em;
+  list-style-type: none;
 }
-
-div.inlinepage {
-  margin-bottom: 10px;
+#sidebar ul ul {
+  padding-left: 1.5em;
+  font-size: 90%;
 }
 
-div.inlinepage h1 {
-  font-weight: normal;
-  font-size: 14pt;
+#pageinfo,
+#footer {
   margin: 0;
 }
-div.inlinepage h2 {
-  font-weight: normal;
-  font-size: 13pt;
-  margin: 0;
+#pageinfo {
+  font-size: small;
 }
-div.inlinepage h3 {
-  font-weight: normal;
-  font-size: 12pt;
+.pagecopyright,
+.pagelicense,
+.pagedate {
   margin: 0;
+  display: inline;
 }
-div.inlinepage h4 {
-  font-weight: normal;
-  font-size: 11pt;
-  margin: 0;
+#backlinks {
+  margin-top: 5px;
+  margin-bottom: 10px;
+  font-size: larger;
 }
-div.inlinepage h5 {
-  font-weight: normal;
-  font-size: 11pt;
-  margin: 0;
+.validation {
+  display: inline;
+  float: right;
 }
-div.inlinepage h6 {
-  font-weight: normal;
-  font-size: 11pt;
-  margin: 0;
+
+.pagecloud {
+  margin-left: 5px;
 }
 
-div#blogform {
-  padding: 0px 5px;
-  margin-bottom: 10px;
+table.identikit tr th {
+  text-align: right;
+  vertical-align: top;
+}
+table.identikit tr th:after {
+  content: ":";
+}
+table.identikit tr td {
+  text-align: left;
+  vertical-align: top;
 }
 
-pre {
-  width: 90%;
-  font-size: 10pt;
-  font-family: monospace;
-  background: #e1e1e1;
-  margin-left: 4%;
-  padding-top: 5px;
-  padding-bottom: 5px;
+.doi_logo , .doi_logo a {
+    background: #3965bd;
+    color: white !important;
+    font-size: 80%;
+    text-decoration: none;
+    font-family: times;
+    font-weight: bold;
+    padding: 0px 1px 0px 2px;
 }
 
-.pagecloud {
-  width: 25%;
-  border-top: 1px solid #aaa;
-  border-bottom: 1px solid #aaa;
-  background: #eee;
-  color: black !important;
+#comments {
+    margin-top: 5ex;
+    border-top: solid 1px;
+    border-color: #aaa;
+    font-size: small;
+}
+
+#comments #feedlink {
+    text-align: right;
+}
+#comments #feedlink:before {
+    content: "comment feeds: ";
+}
+
+.addcomment {
+    padding: 5px;
+    font-style: italic;
+}
+
+.comment {
+    border: none;
+    background-color: #eee;
+    margin: 5px;
+    margin-top: 10px;
+}
+
+.comment-subject {
+    font-style: normal;
 }
 
-.pagecloud a {
-  text-decoration: none;
+.comment-header {
+    border-top: solid 1px;
+    border-color: #aaa;
+    text-align: right;
+    font-style: normal;
 }