<TMPL_VAR TITLE>

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. --- doc/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/style.css') 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; -- cgit v1.2.3 From 3fbc9e411eec34361e711813e09a516e1fb62e03 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Apr 2010 15:38:23 -0400 Subject: increase sidebar width from 20 to 30 ex This makes it big enough to fit a month calendar. --- doc/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/style.css') diff --git a/doc/style.css b/doc/style.css index af0fc230c..80b76b26c 100644 --- a/doc/style.css +++ b/doc/style.css @@ -230,7 +230,7 @@ div.recentchanges { .sidebar { line-height: 3ex; - width: 20ex; + width: 30ex; float: right; margin-left: 40px; margin-bottom: 40px; -- cgit v1.2.3 From 5143d790b023f7f04ebdf694225b2946af676503 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Apr 2010 16:08:33 -0400 Subject: sidebar styling improvements Added a visible border; tuned down the whitespace/borders. Note the use of the -1 pixel margin-top -- this makes the sidebar appear to hang down from the line under the actions at the top of the page. --- doc/style.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'doc/style.css') diff --git a/doc/style.css b/doc/style.css index 80b76b26c..bdd4bb466 100644 --- a/doc/style.css +++ b/doc/style.css @@ -229,13 +229,14 @@ div.recentchanges { .biggestPC { font-size: 130%; } .sidebar { - line-height: 3ex; width: 30ex; float: right; - margin-left: 40px; - margin-bottom: 40px; - padding: 2ex 2ex; + margin-left: 4px; + margin-bottom: 4px; + margin-top: -1px; + padding: 0ex 2ex; background: white; + border: 2px solid black; color: black !important; } -- cgit v1.2.3 From 425f6a8de2ed66b934c16c102456b15da4ff5a14 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Apr 2010 19:21:01 -0400 Subject: reduce border --- doc/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/style.css') diff --git a/doc/style.css b/doc/style.css index bdd4bb466..44e06ae4f 100644 --- a/doc/style.css +++ b/doc/style.css @@ -236,7 +236,7 @@ div.recentchanges { margin-top: -1px; padding: 0ex 2ex; background: white; - border: 2px solid black; + border: 1px solid black; color: black !important; } -- cgit v1.2.3 From 142e025ae471c91e68a23476f700df0b8ad6b31d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Apr 2010 20:12:03 -0400 Subject: calendar: Improved display of arrows. --- IkiWiki/Plugin/calendar.pm | 21 +++++++++++---------- debian/changelog | 1 + doc/plugins/calendar.mdwn | 2 ++ doc/style.css | 8 ++++++++ 4 files changed, 22 insertions(+), 10 deletions(-) (limited to 'doc/style.css') diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index 0f0e9518a..aeb5f3d29 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -164,11 +164,11 @@ sub format_month (@) { # Start producing the month calendar $calendar=< - - $purl - $url - $nurl - + + $purl + $url + $nurl + EOF @@ -312,13 +312,14 @@ sub format_year (@) { add_depends($params{page}, "$archivebase/$nyear", deptype("presence")); # Start producing the year calendar + my $m=$params{months_per_row}-2; $calendar=< - - $purl - $url - $nurl - + + $purl + $url + $nurl + Months diff --git a/debian/changelog b/debian/changelog index e4056fdc6..737d73655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low * sidebar: Add global_sidebars setting. * conditional: Fix bug that forced "all" mode off by default. * calendarmonth.tmpl: The month calendar is now put in a sidebar. + * calendar: Improved display of arrows. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn index 49fd90627..76e718a3b 100644 --- a/doc/plugins/calendar.mdwn +++ b/doc/plugins/calendar.mdwn @@ -14,6 +14,7 @@ customization. * `month-calendar` - The month calendar as a whole. * `month-calendar-head` - The head of the month calendar (ie,"March"). +* `month-calendar-arrow` - Arrow pointing to previous/next month. * `month-calendar-day-head` - A column head in the month calendar (ie, a day-of-week abbreviation). * `month-calendar-day-noday`, `month-calendar-day-link`, @@ -27,6 +28,7 @@ customization. weekends. * `year-calendar` - The year calendar as a whole. * `year-calendar-head` - The head of the year calendar (ie, "2007"). +* `year-calendar-arrow` - Arrow pointing to previous/next year. * `year-calendar-subhead` - For example, "Months". * `year-calendar-month-link`, `year-calendar-month-nolink`, `year-calendar-month-future`, `year-calendar-this-month` - The month diff --git a/doc/style.css b/doc/style.css index 44e06ae4f..7ffcf9fe2 100644 --- a/doc/style.css +++ b/doc/style.css @@ -431,3 +431,11 @@ pre.hl { color:#000000; background-color:#ffffff; } /* For the calendar plugin. */ .month-calendar-day-this-day { background-color: #eee; } .year-calendar-this-month { background-color: #eee; } +.month-calendar-arrow A:link, +.year-calendar-arrow A:link, +.month-calendar-arrow A:visited, +.year-calendar-arrow A:visited { + text-decoration: none; + font-weight: normal; + font-size: 150%; +} -- cgit v1.2.3 From d69f6057d1e1787fa3c19cc13c40eb3e9b822283 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 2 May 2010 15:09:33 -0400 Subject: use html5 semantic markup in page.tmpl This is a first pass, it avoids needing to change style.css except where it refers to tag types. This goes a bit off the rails at the pageheader with its nested header. Semantically, there should be an article around the whole page header, content, and footer. Just as there will be an article around a whole comment or inlined page header, content, and footer. But that will mean changing the css that currently refers to pageheader to refer to the enclosing article instead. --- debian/changelog | 3 +++ doc/style.css | 5 +---- templates/page.tmpl | 49 +++++++++++++++++++++++++------------------------ 3 files changed, 29 insertions(+), 28 deletions(-) (limited to 'doc/style.css') diff --git a/debian/changelog b/debian/changelog index c9fc2e657..789fda1ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low * Add parameter to displaytime to specify that it is a pubdate, and in html5 mode, use time tag. * Add placeholder text in search form (in html5 mode only). + * In html5 mode, use all the nice new semantic tags. Care was taken + to not change the id/class named used in the CSS, so only CSS + that refers to tag types needed to be changed. -- Joey Hess Sun, 02 May 2010 13:22:50 -0400 diff --git a/doc/style.css b/doc/style.css index 7ffcf9fe2..69c7f80d8 100644 --- a/doc/style.css +++ b/doc/style.css @@ -60,15 +60,12 @@ div.inlinecontent { clear: both; } -.tags { -} - #pageinfo { margin: 1em 0; border-top: 1px solid #000; } -div.tags { +.tags { margin-top: 1em; } diff --git a/templates/page.tmpl b/templates/page.tmpl index 661d4a515..0176b0116 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -5,7 +5,7 @@ - + <TMPL_VAR TITLE> @@ -26,8 +26,8 @@ -

- +

- -

+ + -- 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