diff options
| -rw-r--r-- | basewiki/style.css | 6 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | templates/editpage.tmpl | 1 | ||||
| -rw-r--r-- | templates/misc.tmpl | 1 | ||||
| -rw-r--r-- | templates/page.tmpl | 1 | ||||
| -rw-r--r-- | templates/recentchanges.tmpl | 1 |
6 files changed, 14 insertions, 1 deletions
diff --git a/basewiki/style.css b/basewiki/style.css index ef7f23c18..0dfab6e77 100644 --- a/basewiki/style.css +++ b/basewiki/style.css @@ -1,3 +1,9 @@ +/* ikiwiki style sheet */ + +/* Note that instead of modifying this style sheet, you can instead create + * a local.css in your wiki, and override or change settings in this one. + */ + .header { margin: 0; font-size: 22px; diff --git a/debian/changelog b/debian/changelog index 7931dc98a..cc6b286ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,11 @@ ikiwiki (1.22) UNRELEASED; urgency=low that looks like a wikilink will now have it treated as such; AFAIK this doesn't change any behavior though except for the template plugin. * Enable preprocessor directives when previewing an edit. + * Make all pages pull in a local.css style sheet, if present. This won't + be included in ikiwiki, but can be created to make local styling changes + w/o needing to merge in every new change to the distributed style.css. - -- Joey Hess <joeyh@debian.org> Wed, 23 Aug 2006 15:30:09 -0400 + -- Joey Hess <joeyh@debian.org> Thu, 24 Aug 2006 16:29:24 -0400 ikiwiki (1.21) unstable; urgency=low diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 27155f5cf..b215d9df3 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -6,6 +6,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title><TMPL_VAR FORM-TITLE></title> <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" /> +<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" /> </head> <body> <TMPL_IF NAME="PAGE_CONFLICT"> diff --git a/templates/misc.tmpl b/templates/misc.tmpl index 0376a19f9..d6be08a61 100644 --- a/templates/misc.tmpl +++ b/templates/misc.tmpl @@ -6,6 +6,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title><TMPL_VAR TITLE></title> <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" /> +<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" /> </head> <body> diff --git a/templates/page.tmpl b/templates/page.tmpl index 438fbc25d..e8b30d707 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -5,6 +5,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title><TMPL_VAR TITLE></title> <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" /> +<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" /> <TMPL_IF NAME="META"> <TMPL_VAR META> </TMPL_IF> diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl index 792fff00c..dd061a06a 100644 --- a/templates/recentchanges.tmpl +++ b/templates/recentchanges.tmpl @@ -6,6 +6,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title><TMPL_VAR TITLE></title> <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" /> +<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" /> </head> <body> |