From: Joey Hess Date: Sat, 25 Aug 2012 14:56:30 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/4ef13d9856d0d61d87afadcfd7ec20d4e0cb646c?hp=72cde6d41923f0a43dba6b227d5efbfd4e2f600d Merge branch 'master' of ssh://git.ikiwiki.info --- diff --git a/doc/todo/Zoned_ikiwiki.mdwn b/doc/todo/Zoned_ikiwiki.mdwn index ba21e3ca2..26260b256 100644 --- a/doc/todo/Zoned_ikiwiki.mdwn +++ b/doc/todo/Zoned_ikiwiki.mdwn @@ -57,4 +57,8 @@ diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm return @links; } - + + +> Have you considered all the ways that anyone with edit access to the +> public wiki could expose information from the public wiki? For example, +> you could inline all the private pages into a public page. --[[Joey]] diff --git a/doc/todo/monochrome_theme.mdwn b/doc/todo/monochrome_theme.mdwn index 6e076ab6d..a1956e683 100644 --- a/doc/todo/monochrome_theme.mdwn +++ b/doc/todo/monochrome_theme.mdwn @@ -4,3 +4,10 @@ 'monochrome' in listed git repo/branch. [Here's the screenshot of what it looks like](https://github.com/jmtd/ikiwiki/blob/30af2437cd41d394930864e93b3c2319d1ec2b06/doc/themes/monochrome.png). — [[Jon]] Perhaps controversially, I think that this would be a good basis for a default theme for the ikiwiki website. (I suspect more work is needed, I have not tested the theme against every plugin which provides theme-able bits and pieces, nor with e.g. HTML5 mode turned on, etc. etc.) Whilst the anti-theme is the best default for an ikiwiki instance (although an argument could be made against that, too!), the site needs to try to advertise some of the potential of ikiwiki to visitors, and serve as an example of what can be done. I'd appreciate thoughts of frequent ikiwiki contributors on this proposal ☺ — [[Jon]] + +> I appreciate you putting that branch together. I was ready to merge it, +> but `themes/monochrome/style.css` seems to contain a lot of redundant +> things that are in ikiwiki's normal style.css. This is especially +> redundant since ikiwiki's style.css gets prepended to the theme's stylesheet +> at build time! Can you remove those redundant bits please? (PITA I know, +> but it will make maintaining this much easier.) --[[Joey]]