From 99d74b3d6aaf464ffc35ca6504623b547fa340e6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Dec 2010 14:48:52 -0400 Subject: add themes page and remove actiontabs.css from css_market since it is a theme --- doc/css_market.mdwn | 12 ++-- doc/css_market/actiontabs.css | 122 ---------------------------------------- doc/plugins/theme.mdwn | 7 +-- doc/themes.mdwn | 16 ++++++ doc/themes/actiontabs_small.png | Bin 0 -> 19202 bytes doc/themes/blueview_small.png | Bin 0 -> 18543 bytes doc/themes/none_small.png | Bin 0 -> 18516 bytes 7 files changed, 23 insertions(+), 134 deletions(-) delete mode 100644 doc/css_market/actiontabs.css create mode 100644 doc/themes.mdwn create mode 100644 doc/themes/actiontabs_small.png create mode 100644 doc/themes/blueview_small.png create mode 100644 doc/themes/none_small.png diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn index c167388a7..1838b2f60 100644 --- a/doc/css_market.mdwn +++ b/doc/css_market.mdwn @@ -4,9 +4,11 @@ User contributed stylesheet files for ikiwiki. Unless otherwise noted, these style sheets can be installed by copying them into your wiki's source dir with a filename of `local.css`. +Some of stylesheets have developed into fullfledged [[themes]] that are +included in ikiwiki for easy use. + Feel free to add your own stylesheets here. (Upload as wiki pages; wiki -gnomes will convert them to css files..) Selected ones from here are -included in the [[theme_plugin|plugins/theme]]. +gnomes will convert them to css files..) * **[[css_market/zack.css]]**, contributed by [[StefanoZacchiroli]], customized mostly for *blogging purposes*, can be seen in action on @@ -46,15 +48,11 @@ included in the [[theme_plugin|plugins/theme]]. * **[contraste.css][4]**, contributed by [[Blanko]]. Can be seen on [Contraste Demo][5]. Local.css and templates available [here][6]. -* **[[css_market/actiontabs.css]]**, contributed by [[svend]]. This style sheet displays - the action list (Edit, RecentChanges, etc.) as tabs. This is in use at [branchable](http://www.branchable.com/). - [[!meta stylesheet="actiontabs"]] - * **[wiki.css](http://cyborginstitute.net/includes/wiki.css)** by [[tychoish]]. I typically throw this in as `local.css` in new wikis as a slightly more clear and readable layout for wikis that need to be functional and elegant, but not necessarily uniquely designed. Currently in use by the [the outeralliance wiki](http://oa.criticalfutures.com/). - + If your web browser allows selecting between multiple stylesheets, this page can be viewed using many of the stylesheets above. For example, if diff --git a/doc/css_market/actiontabs.css b/doc/css_market/actiontabs.css deleted file mode 100644 index a1dc47e92..000000000 --- a/doc/css_market/actiontabs.css +++ /dev/null @@ -1,122 +0,0 @@ -/* ikiwiki local style sheet */ - -/* Add local styling here, instead of modifying style.css. */ - -a { - text-decoration: none; - color: #005a9c; -} - -a:hover { - text-decoration: underline; -} - - -hr { - border-style: none; - background-color: #999; - height: 1px; -} - -code, pre { - background: #eee; -} - -pre { - padding: .5em; -} - -body { - margin: 0; - padding: 0; - font-family: sans-serif; - color: black; - background: white; -} - -.pageheader { - margin: 0; - padding: 1em 2em 0 2em; - background: #eee; - border-color: #999; - border-style: none none solid none; - border-width: 1px; -} - -.header { - font-size: 100%; - font-weight: normal; -} - -.title { - display: block; - margin-top: .2em; - font: 140% sans-serif; - text-transform: capitalize; -} - -.actions { - text-align: right; - padding: 0; -} - -#content, #comments, #footer { - margin: 1em 2em; -} - -#pageinfo { - border-color: #999; -} - -.inlinepage { - margin: .4em 0; - padding: .4em 0; - border-style: none; - border-top: 1px solid #aaa; -} - -.inlineheader { - font-size: 120%; - font-weight: normal; -} - -h1 { font: 120% sans-serif } -h2 { font: bold 100% sans-serif } -h3 { font: italic 100% sans-serif } -h4, h5, h6 { font: small-caps 100% sans-serif } - -/* Smaller headings for inline pages */ -.inlinepage h1 { font-size: 110% } -.inlinepage h2 { font-size: 100% } -.inlinepage h3 { font-size: 100% } - -.pageheader .actions ul { - border-style: none -} - -.actions ul { - font-size: 75%; - padding: 0; - border-style: none; -} - -.actions ul li a { - text-decoration: none; -} - -.actions ul li { - margin: 0; - padding: .1em .5em 0 .5em; - background: white; - border-color: #999; - border-style: solid solid none solid; - border-width: 1px; -} - -div.recentchanges { - border-style: none; -} - -.pagecloud { - width: auto; -} diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn index 2622abc88..ebbb0be8e 100644 --- a/doc/plugins/theme.mdwn +++ b/doc/plugins/theme.mdwn @@ -4,11 +4,8 @@ The theme plugin allows easily applying a theme to your wiki, by configuring the `theme` setting in the setup file with the name of a theme to use. The themes you can choose from are all subdirectories, typically -inside `/usr/share/ikiwiki/themes/`. - -A theme provides, via the underlay, an enhanced version of the regular -[[style.css]]. This leaves [[local.css]] free for you to further -customise. Themes can also provide header and background images. +inside `/usr/share/ikiwiki/themes/`. See [[themes]] for an overview +of the themes included in ikiwiki. You can set the theme via the **theme** option in your config file (after enabling the plugin). Refresh the wiki after changing it to see the changes. diff --git a/doc/themes.mdwn b/doc/themes.mdwn new file mode 100644 index 000000000..daa38cd44 --- /dev/null +++ b/doc/themes.mdwn @@ -0,0 +1,16 @@ +Ikiwiki now comes with several themes contributed by users. +You can enable the [[theme_plugin|plugins/theme]] to use any of these. + +A theme provides, via the underlay, an enhanced version of the regular +[[style.css]]. This leaves [[local.css]] free for you to further +customise. Themes can also provide header and background images. + +[[!img align=left actiontabs_small.png]] The actiontabs theme, contributed by +[[svend]]. This style sheet displays the action list +(Edit, RecentChanges, etc.) as tabs. + +[[!img align=left blueview_small.png]] The blueview theme, contributed by +[[BerndZeimetz]], featuring a panorama photo he took. + +[[!img align=left none_small.png]] For completeness, ikiwiki's default +anti-theme. diff --git a/doc/themes/actiontabs_small.png b/doc/themes/actiontabs_small.png new file mode 100644 index 000000000..4b05ad3dc Binary files /dev/null and b/doc/themes/actiontabs_small.png differ diff --git a/doc/themes/blueview_small.png b/doc/themes/blueview_small.png new file mode 100644 index 000000000..74972c4c3 Binary files /dev/null and b/doc/themes/blueview_small.png differ diff --git a/doc/themes/none_small.png b/doc/themes/none_small.png new file mode 100644 index 000000000..8272ae606 Binary files /dev/null and b/doc/themes/none_small.png differ -- cgit v1.2.3