Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / todo / merge_bootstrap_branch.mdwn

diff --git a/doc/todo/merge_bootstrap_branch.mdwn b/doc/todo/merge_bootstrap_branch.mdwn
index e2fb5f3c6ca9c0efa53c3e241685181f4ae59e46..34a4a1f72781a9f6a5667ff20b606c2e521bad71 100644 (file)
--- a/doc/todo/merge_bootstrap_branch.mdwn
+++ b/doc/todo/merge_bootstrap_branch.mdwn
@@ -25,6 +25,7 @@ except when the bootstrap theme is enabled.
 >> As for not tampering with template files, the only way I found to
 >> work around this is to rename the desired bootstrap classes to the
 >> ones that the default ikiwiki template wants (toc, map, etc.).
 >> As for not tampering with template files, the only way I found to
 >> work around this is to rename the desired bootstrap classes to the
 >> ones that the default ikiwiki template wants (toc, map, etc.).

->> [see for yourself](https://notabug.org/iikb/ikiwiki-theme-bootstrap/commit/7f30630b6255336a34b14f70f2a674e15cd797a0) - don't mind the red parts.
+>> What this means is copying css code from `bootstrap.css` to the `styles.css`.
+>> [See for yourself](https://notabug.org/iikb/ikiwiki-theme-bootstrap/commit/7f30630b6255336a34b14f70f2a674e15cd797a0) - don't mind the red parts.

 >> This is tedious and boring, it's easier to tamper with template files
 >> than to rewrite bootstrap by copying and pasting it. --[[desci]]
 >> This is tedious and boring, it's easier to tamper with template files
 >> than to rewrite bootstrap by copying and pasting it. --[[desci]]