Index: trunk/phase3/skins/monobook/IE60Fixes.css |
— | — | @@ -49,6 +49,10 @@ |
50 | 50 | #p-cactions li a:hover { |
51 | 51 | padding-bottom: 0.17em; |
52 | 52 | } |
| 53 | +#p-navigation a { |
| 54 | + display: inline-block; |
| 55 | + width: 100%; |
| 56 | +} |
53 | 57 | #portal-personaltools { |
54 | 58 | padding-bottom: 0.1em; |
55 | 59 | } |
— | — | @@ -77,3 +81,4 @@ |
78 | 82 | position: relative; |
79 | 83 | } |
80 | 84 | /*{ border:1px solid Red !important;}*/ |
| 85 | + |
Index: trunk/phase3/skins/monobook/IE55Fixes.css |
— | — | @@ -57,6 +57,10 @@ |
58 | 58 | #p-cactions li a:hover { |
59 | 59 | padding-bottom: 0.17em; |
60 | 60 | } |
| 61 | +#p-navigation a { |
| 62 | + display: inline-block; |
| 63 | + width: 100%; |
| 64 | +} |
61 | 65 | .portlet { |
62 | 66 | overflow:hidden; |
63 | 67 | } |
Index: trunk/phase3/skins/monobook/main.css |
— | — | @@ -682,10 +682,21 @@ |
683 | 683 | z-index: 3; |
684 | 684 | } |
685 | 685 | |
686 | | -#p-navigation strong { |
687 | | - font-weight: normal; |
| 686 | +#p-navigation .pBody { |
| 687 | + padding-right: 0; |
688 | 688 | } |
689 | 689 | |
| 690 | +#p-navigation a { |
| 691 | + display: block; |
| 692 | +} |
| 693 | + |
| 694 | +#p-navigation li.active a, #p-navigation li.active a:hover { |
| 695 | + color: #000; |
| 696 | + text-decoration: none; |
| 697 | + display: inline; |
| 698 | +} |
| 699 | + |
| 700 | + |
690 | 701 | /* |
691 | 702 | ** Search portlet |
692 | 703 | */ |
Index: trunk/phase3/skins/MonoBook.php |
— | — | @@ -135,10 +135,8 @@ |
136 | 136 | if ( $val['active'] ) echo ' class="active"'; |
137 | 137 | echo '>'; |
138 | 138 | if ( $val['active'] ) echo '<strong>'; |
139 | | - if ( $val['dolink'] ) echo '<a href="' . htmlspecialchars($val['href']) . '">'; |
140 | | - echo htmlspecialchars($val['text']); |
| 139 | + echo '<a href="' . htmlspecialchars($val['href']) . '">' . htmlspecialchars($val['text']) . '</a>'; |
141 | 140 | if ( $val['active'] ) echo '</strong>'; |
142 | | - if ( $val['dolink'] ) echo '</a>'; |
143 | 141 | echo '</li>'; |
144 | 142 | } ?> |
145 | 143 | </ul> |
Index: trunk/phase3/includes/Skin.php |
— | — | @@ -1337,13 +1337,11 @@ |
1338 | 1338 | if (wfEmptyMsg($line[0], $link)) |
1339 | 1339 | $link = $line[0]; |
1340 | 1340 | $href = $this->makeInternalOrExternalUrl( $link ); |
1341 | | - $active = ( $pageurl == $href ); |
1342 | 1341 | $bar[$heading][] = array( |
1343 | 1342 | 'text' => $text, |
1344 | 1343 | 'href' => $href, |
1345 | 1344 | 'id' => 'n-' . strtr($line[1], ' ', '-'), |
1346 | | - 'active' => $active, |
1347 | | - 'dolink' => ( !$active || ($action != 'view' && $action != 'purge' ) ) |
| 1345 | + 'active' => ( $pageurl == $href ) |
1348 | 1346 | ); |
1349 | 1347 | } else { continue; } |
1350 | 1348 | } |