From 54c2e05ccf8fad1e77d4ee717c48f3622f60b4e4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 16:33:54 -0400 Subject: Add basic styling of po plugin's languages list. --- doc/style.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc/style.css') diff --git a/doc/style.css b/doc/style.css index e6512aed8..4fa48b140 100644 --- a/doc/style.css +++ b/doc/style.css @@ -32,6 +32,15 @@ border-bottom: 0; } +#otherlanguages ul { + margin: 0; + padding: 6px; + list-style-type: none; +} +.pageheader #otherlanguages { + border-bottom: 1px solid #000; +} + div.inlinecontent { margin-top: .4em; } -- cgit v1.2.3 From e9d20231a0fa99fe614a43cf60c53af7a84fc795 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 17:00:16 -0400 Subject: further otherlanguages list styling --- doc/style.css | 13 ++++++++----- templates/page.tmpl | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'doc/style.css') diff --git a/doc/style.css b/doc/style.css index 4fa48b140..4770fc942 100644 --- a/doc/style.css +++ b/doc/style.css @@ -24,6 +24,10 @@ padding: 6px; list-style-type: none; } +.actions li { + display: inline; + padding: .2em .4em; +} .pageheader .actions ul { border-bottom: 1px solid #000; } @@ -37,6 +41,10 @@ padding: 6px; list-style-type: none; } +#otherlanguages li { + display: inline; + padding: .2em .4em; +} .pageheader #otherlanguages { border-bottom: 1px solid #000; } @@ -45,11 +53,6 @@ div.inlinecontent { margin-top: .4em; } -.actions li { - display: inline; - padding: .2em .4em; -} - .pagefooter { clear: both; } diff --git a/templates/page.tmpl b/templates/page.tmpl index 653179e5d..e71ba316d 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -29,7 +29,7 @@ -( %) + (%) @@ -76,7 +76,7 @@ (master) -( %) + (%) -- cgit v1.2.3 From 6678ab8fb3c956ea52d08e546cea7c8e3204aefb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Oct 2009 12:21:46 -0400 Subject: Added minimal default CSS for calendar plugin, just highlighting the current day. --- debian/changelog | 2 ++ doc/style.css | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'doc/style.css') diff --git a/debian/changelog b/debian/changelog index b9d1923cd..ef92e48fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low * git: --getctime will now follow renames back to the original creation of a file. * calendar: Fix CSS for year calendar to match the plugin documentation. + * Added minimal default CSS for calendar plugin, just highlighting the + current day. -- Joey Hess Fri, 09 Oct 2009 19:53:50 -0400 diff --git a/doc/style.css b/doc/style.css index 4770fc942..be86a0818 100644 --- a/doc/style.css +++ b/doc/style.css @@ -403,7 +403,6 @@ span.color { } /* Used by the highlight plugin. */ - pre.hl { color:#000000; background-color:#ffffff; } .hl.num { color:#2928ff; } .hl.esc { color:#ff00ff; } @@ -419,3 +418,7 @@ pre.hl { color:#000000; background-color:#ffffff; } .hl.kwb { color:#830000; } .hl.kwc { color:#000000; font-weight:bold; } .hl.kwd { color:#010181; } + +/* For the calendar plugin. */ +.month-calendar-day-this-day { background-color: #eee; } +.year-calendar-this-month { background-color: #eee; } -- cgit v1.2.3 From 4bda18a50aab714e72fce347cb4cff32316e55de Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Tue, 5 Jan 2010 15:23:22 +0100 Subject: Support align attribute for img with caption This is achieved by preparing CSS definitions that emulates the behavior of the align attribute, and passing it to the outermost IMG wrapper (A or TABLE) instead of passing the align value to IMG directly. --- IkiWiki/Plugin/img.pm | 21 ++++++++++++++++----- doc/style.css | 20 ++++++++++++++++++++ 2 files changed, 36 insertions(+), 5 deletions(-) (limited to 'doc/style.css') diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 32023fa97..6f1919ea0 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -155,16 +155,23 @@ sub preprocess (@) { '" height="'.$dheight.'"'. (exists $params{alt} ? ' alt="'.$params{alt}.'"' : ''). (exists $params{title} ? ' title="'.$params{title}.'"' : ''). - (exists $params{align} ? ' align="'.$params{align}.'"' : ''). (exists $params{class} ? ' class="'.$params{class}.'"' : ''). (exists $params{id} ? ' id="'.$params{id}.'"' : ''). ' />'; if (! defined $params{link} || lc($params{link}) eq 'yes') { - $imgtag=''.$imgtag.''; + if (exists $params{caption} || !exists $params{align}) { + $imgtag=''.$imgtag.''; + } else { + $imgtag=''.$imgtag.''; + } } elsif ($params{link} =~ /^\w+:\/\//) { - $imgtag=''.$imgtag.''; + if (exists $params{caption} || !exists $params{align}) { + $imgtag=''.$imgtag.''; + } else { + $imgtag=''.$imgtag.''; + } } else { my $b = bestlink($params{page}, $params{link}); @@ -173,12 +180,16 @@ sub preprocess (@) { add_depends($params{page}, $b, deptype("presence")); $imgtag=htmllink($params{page}, $params{destpage}, $params{link}, linktext => $imgtag, - noimageinline => 1); + noimageinline => 1, + (exists $params{caption} || !exists $params{align}) ? + () : (class => 'align-'.$params{align})); } } if (exists $params{caption}) { - return ''. + return '
'. ''. ''. '
'.$params{caption}.'
'.$imgtag.'
'; diff --git a/doc/style.css b/doc/style.css index be86a0818..c56494fff 100644 --- a/doc/style.css +++ b/doc/style.css @@ -82,6 +82,26 @@ div.tags { text-align: center; } +.align-left { + float:left; +} + +.align-right { + float:right; +} + +.align-top { + vertical-align:top; +} + +.align-bottom { + vertical-align:bottom; +} + +.align-middle { + vertical-align:middle; +} + #backlinks { margin-top: 1em; } -- cgit v1.2.3 From cf5f1c3a3a74d5d444736e5bbe6ecaf55c523467 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Jan 2010 16:07:47 -0500 Subject: remove align-top/middle/bottom I think we only need left and right align. The other values including top, middle, bottom, baseline, absbottom, etc, don't make much sense when aligning an image that has a caption included. (They're mostly of value when including a image in a line of text like a word.) --- doc/style.css | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'doc/style.css') diff --git a/doc/style.css b/doc/style.css index c56494fff..317d4c7aa 100644 --- a/doc/style.css +++ b/doc/style.css @@ -90,18 +90,6 @@ div.tags { float:right; } -.align-top { - vertical-align:top; -} - -.align-bottom { - vertical-align:bottom; -} - -.align-middle { - vertical-align:middle; -} - #backlinks { margin-top: 1em; } -- cgit v1.2.3 From baaa848f6c06b0b3a59677d3551e130c65e5fde7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Apr 2010 15:04:17 -0400 Subject: CSS and templates for sidebar changed to use a class, not an id. Multiple sidebars should be possible; also, I want to add a sidebar template. --- debian/changelog | 3 ++- doc/examples/blog.mdwn | 2 +- doc/examples/blog/index.mdwn | 1 - doc/examples/blog/sidebar.mdwn | 7 ------- doc/style.css | 2 +- templates/page.tmpl | 2 +- 6 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 doc/examples/blog/sidebar.mdwn (limited to 'doc/style.css') diff --git a/debian/changelog b/debian/changelog index c2b0c3c23..03361e6a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100410) UNRELEASED; urgency=low +ikiwiki (3.20100415) UNRELEASED; urgency=low [ Joey Hess ] * bzr: Fix bzr log parsing to work with bzr 2.0. (liw) @@ -36,6 +36,7 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low * pagestats: Use style=list to get a list of tags, scaled by use like in a tag cloud. This is useful to put in a sidebar. * Rework example blog front page. + * CSS and templates for sidebar changed to use a class, not an id. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index b9b57b944..33637e57d 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -14,7 +14,7 @@ Some additional configuration you might want to do: \[[!tag tags/life]] * Enable the [[sidebar|plugins/sidebar]] plugin to get a sidebar listing all - the categories you've tagged posts with. + the categories you've tagged posts with, and other navigation links. * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud to display on the [[index]]. diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn index b273ba1a9..da95e7660 100644 --- a/doc/examples/blog/index.mdwn +++ b/doc/examples/blog/index.mdwn @@ -4,7 +4,6 @@ * [[Recent_Comments|comments]] * [[Archives]] -[[!if test="enabled(calendar)" then=""" [[!calendar pages="./posts/* and !*/Discussion"]] """]] diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn deleted file mode 100644 index a9fac388e..000000000 --- a/doc/examples/blog/sidebar.mdwn +++ /dev/null @@ -1,7 +0,0 @@ -Example sidebar - -* [[Blog|index]] -* [[Archive|posts]] - -Categories: -[[!map pages="./tags/* and !*/Discussion"]] diff --git a/doc/style.css b/doc/style.css index 317d4c7aa..af0fc230c 100644 --- a/doc/style.css +++ b/doc/style.css @@ -228,7 +228,7 @@ div.recentchanges { .bigPC { font-size: 115%; } .biggestPC { font-size: 130%; } -#sidebar { +.sidebar { line-height: 3ex; width: 20ex; float: right; diff --git a/templates/page.tmpl b/templates/page.tmpl index c24f88823..7e850a56b 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -92,7 +92,7 @@ - - + -- cgit v1.2.3 From 154732dc4235b7b31191975da50d780a2765fa02 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 2 May 2010 16:12:08 -0400 Subject: adapt comment.tmpl to html5 Note that I put comment-header in a
despite it being below the comment. Using a