projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ebf414d)
* Make all pages pull in a local.css style sheet, if present. This won't
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Thu, 24 Aug 2006 20:45:09 +0000 (20:45 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Thu, 24 Aug 2006 20:45:09 +0000 (20:45 +0000)
  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.

basewiki/style.css patch | blob | history
debian/changelog patch | blob | history
templates/editpage.tmpl patch | blob | history
templates/misc.tmpl patch | blob | history
templates/page.tmpl patch | blob | history
templates/recentchanges.tmpl patch | blob | history

diff --git a/basewiki/style.css b/basewiki/style.css
index ef7f23c188c0063ac349d2e1d4cce774f01ced22..0dfab6e77b68c2c56e825c909407d28321ccc9d2 100644 (file)
--- 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 7931dc98abe0f669496d3d46df10fdd079ecb1ea..cc6b286ef94d400cbd24845d7c695d2a07148e28 100644 (file)
--- 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 27155f5cf7e1b47c9ef17b8f718b74cd38d5159f..b215d9df32d44cd08e8b3ebc738419f89ffa26f4 100644 (file)
--- 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 0376a19f9eca1b87c80282688d3b1f6bf2d30eb7..d6be08a6189404df7aad4662ea7dabfdfd8eba9d 100644 (file)
--- 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 438fbc25d04bbcb63c12f13c59885912ebe5acf0..e8b30d7070f2df916bd9133882171eb10babb4f3 100644 (file)
--- 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 792fff00cb0cd9c7051580965eebec38393ceead..dd061a06a88b987591f6f7487e4539abb7b1ee4c 100644 (file)
--- 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>
 
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.