urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'smcv/ready/trail'

master
Joey Hess 2012-04-18 15:45:37 -04:00
parent 3b6b0e59b3 c1f5a1ccc7
commit ae083783df
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki/Plugin/trail.pm
View File

@ -335,7 +335,7 @@ sub prerender {
if (exists $pagestate{$member}{trail}{item} &&
! exists $member_to_trails{$member}) {
$rebuild_trail_members{$member} = 1;
delete $pagestate{$member}{trailitem};
delete $pagestate{$member}{trail}{item};
}
}

5
doc/style.css
View File

@ -275,6 +275,7 @@ div.progress-done {
@media print {
.actions { display: none; }
.tags { display: none; }
.trails { display: none; }
.feedbutton { display: none; }
#searchform { display: none; }
.blogform, #blogform { display: none; }
@ -502,6 +503,10 @@ a.openid_large_btn:focus {
background: url(ikiwiki/images/pbar-ani.gif);
}
.trails {
margin-top: 1em;
margin-bottom: 1em;
}
.trail {
display: block;
clear: both;

2
templates/page.tmpl
View File

@ -149,6 +149,8 @@
<TMPL_UNLESS DYNAMIC>
<TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
<TMPL_VAR TRAILS>
<TMPL_IF TAGS>
<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
Tags:

2
themes/actiontabs/style.css
View File

@ -143,7 +143,7 @@ div.recentchanges {
border-color: #999;
}
.trails {
.pageheader .trails {
/* allow space for the action tabs */
margin-bottom: 2em;
}

8
themes/blueview/style.css
View File

@ -197,23 +197,19 @@ body {
font-weight: bold;
}
.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li, .trailprev, .trailnext, .trailup {
.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li, .pageheader .trailprev, .pageheader .trailnext, .pageheader .trailup {
padding: 0.25em 0.25em 0.25em 0.25em;
background-image: url('background_darkness.png');
background-repeat: repeat;
color: white;
}
.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a, .pageheader a {
.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a, .pageheader a, .pageheader .trail a {
font-weight: bold;
color: white;
text-decoration: none;
}
.trailprev, .trailnext, .trailup {
margin-top: 0.5em;
}
.pageheader .actions {
text-align: right;
vertical-align: bottom;