Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/debian/changelog b/debian/changelog
index c2c58861ac5b269a2d11cdf55a54785d57f20961..5aa937d1583eac274b0aac9853db6971db48cf1f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20120726) UNRELEASED; urgency=low
+
+  * monochrome: New theme, contributed by Jon Dowland.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 30 Aug 2012 11:56:12 -0400
+
 ikiwiki (3.20120725) unstable; urgency=low
 
   * recentchangesdiff: When diffurl is not set, provide inline diffs

diff --git a/debian/copyright b/debian/copyright
index ee52c0eda5f43d80bd34934a879b6472cec37b88..e1a81932b2f0a5b8145aecbf33f73cb9063f20e5 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -248,6 +248,10 @@ Files: underlays/themes/goldtype/*
 Copyright: © Lars Wirzenius
 License: GPL-2+
 
+Files: underlays/themes/monochrome/*
+Copyright: © 2012 Jon Dowland
+License: GPL-2+
+
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions

diff --git a/doc/themes.mdwn b/doc/themes.mdwn
index 57f899677f8bade0c71f21d350414cd09e5adaa8..7df25e66b6528f64a342ffc59c3f718e17dcc91d 100644 (file)
--- a/doc/themes.mdwn
+++ b/doc/themes.mdwn
@@ -21,6 +21,11 @@ blueview and featuring the photography of Lars Wirzenius.
 
 <br clear="both" />
 
+[[!img monochrome_small.png align==left]] The **monochrome** theme,
+based on [[Jon]]'s homepage design.
+
+<br clear="both" />
+
 [[!img none_small.png align=left]] For completeness, ikiwiki's default
 anti-theme.
 

diff --git a/doc/themes/monochrome_small.png b/doc/themes/monochrome_small.png
new file mode 100644 (file)
index 0000000..6c98100
Binary files /dev/null and b/doc/themes/monochrome_small.png differ

diff --git a/doc/todo/monochrome_theme.mdwn b/doc/todo/monochrome_theme.mdwn
index ebaca9b4fa5c9007e3949f11d56c3270463efe0c..f4c8a02032013dad65096c4dab42fbcea427a551 100644 (file)
--- a/doc/todo/monochrome_theme.mdwn
+++ b/doc/todo/monochrome_theme.mdwn
@@ -15,3 +15,20 @@ Perhaps controversially, I think that this would be a good basis for a default t
 >> Sure I'll sort that out.  Sorry, I didn't realise the prepending was an automatic process. I did it manually. It should be quick for me to fix. — [[Jon]]
 
 >>> Fixed. I rebased the branch; hopefully that won't cause your script issues.  — [[Jon]]
+
+>>>> I've merged your branch.
+>>>> 
+>>>> Looking more closely at the css, I do have a few questions:
+>>>> 
+>>>> * Is the google-provided font really necessary? I consider that a sort
+>>>>   of web bug, I would prefer users of ikiwiki not need to worry that
+>>>>   their referer information is being sent to some third party.
+>>>>   I'd also prefer for ikiwiki sites to always be functional when
+>>>>   viewed offline.
+>>>> * The external link markup needs the local url to be put into
+>>>>   local.css to work right, correct? I wonder if this is too much of a
+>>>>   complication to ask of users. It seems to be it could either be left
+>>>>   out of the theme, or perhaps ikiwiki could be made to expand
+>>>>   something in the css to the site's url at build time.
+>>>> 
+>>>> --[[Joey]] 

diff --git a/themes/monochrome/gradient.png b/themes/monochrome/gradient.png
new file mode 100644 (file)
index 0000000..7363185
Binary files /dev/null and b/themes/monochrome/gradient.png differ

diff --git a/themes/monochrome/style.css b/themes/monochrome/style.css
new file mode 100644 (file)
index 0000000..41a3a44
--- /dev/null
+++ b/themes/monochrome/style.css
@@ -0,0 +1,53 @@
+/*
+ * monochrome - ikiwiki theme © Jon Dowland 2012
+ * based on ikiwiki style.css and bits from jmtd.net at the time
+ * License: GPL-2+
+ */
+
+@import url(http://fonts.googleapis.com/css?family=Lato&v2);
+
+body {
+       margin-left: auto;
+       margin-right: auto;
+       width: 48em;
+
+       background: url(gradient.png) repeat-x white 0px -16px;
+       margin-top: 48px; /* height of gradient.png that we want to see */
+
+       color: #555;
+       font-family: 'Lato', sans-serif;
+}
+
+.header {
+       margin-bottom: 0.5em;
+}
+.pageheader .actions ul {
+       border-bottom: 2px solid #c00040;
+}
+
+#pageinfo {
+       border-top: 2px solid #c00040;
+       text-align: center;
+       color: #aaa;
+}
+
+/*
+ * css3 external links stuff
+ * thanks to <http://www.kryogenix.org/days/2002/08/30/external>
+ */
+#content a[href^="http:"]:after,
+#content a[href^="https:"]:after {
+  content: "↗";
+}
+/* you will want to replicate this for your own domain in local.css */
+#content a[href^="http://localhost"]:after,
+#content a[href^="http://ikiwiki.info"]:after {
+  content: none;
+}
+
+/* colouring */
+a:link    { color: #c00040; font-weight: bold; text-decoration: none; }
+a:hover   { color: #f01070; text-decoration: underline;}
+a:active  { color: #c00040; }
+a:visited { color: #c08080; font-weight: normal; font-style: italic; }
+hr { border: none; border-top: 2px solid #c00040; clear: both; }