navbar v3 - bold links!

diff --git a/includes/Skin.php b/includes/Skin.php
index e059ac1..7363719 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1337,13 +1337,11 @@ END;
                                        if (wfEmptyMsg($line[0], $link))
                                                $link = $line[0];
                                        $href = $this->makeInternalOrExternalUrl( $link );
-                                       $active = ( $pageurl == $href );
                                        $bar[$heading][] = array(
                                                'text' => $text,
                                                'href' => $href,
                                                'id' => 'n-' . strtr($line[1], ' ', '-'),
-                                               'active' => $active,
-                                               'dolink' => ( !$active || ($action != 'view' && $action != 'purge' ) )
+                                               'active' => ( $pageurl == $href )
                                        );
                                } else { continue; }
                        }

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index b07660c..def7b66 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -135,10 +135,8 @@ class MonoBookTemplate extends QuickTemplate {
                                if ( $val['active'] ) echo ' class="active"';
                                echo '>';
                                if ( $val['active'] ) echo '<strong>';
-                               if ( $val['dolink'] ) echo '<a href="' . htmlspecialchars($val['href']) . '">';
-                               echo htmlspecialchars($val['text']); 
+                               echo '<a href="' . htmlspecialchars($val['href']) . '">' . htmlspecialchars($val['text']) . '</a>'; 
                                if ( $val['active'] ) echo '</strong>';
-                               if ( $val['dolink'] ) echo '</a>';
                                echo '</li>';
                        } ?>
            </ul>

diff --git a/skins/monobook/IE55Fixes.css b/skins/monobook/IE55Fixes.css
index 2f78561..6a7df22 100644 (file)
--- a/skins/monobook/IE55Fixes.css
+++ b/skins/monobook/IE55Fixes.css
@@ -57,6 +57,10 @@ body { font-size: xx-small; }
 #p-cactions li a:hover {
     padding-bottom: 0.17em;
 }
+#p-navigation a {
+    display: inline-block;
+    width: 100%;
+}
 .portlet {
     overflow:hidden;
 }

diff --git a/skins/monobook/IE60Fixes.css b/skins/monobook/IE60Fixes.css
index feec15f..1bd8382 100644 (file)
--- a/skins/monobook/IE60Fixes.css
+++ b/skins/monobook/IE60Fixes.css
@@ -49,6 +49,10 @@
 #p-cactions li a:hover {
     padding-bottom: 0.17em;
 }
+#p-navigation a {
+    display: inline-block;
+    width: 100%;
+}
 #portal-personaltools {
     padding-bottom: 0.1em;
 }
@@ -77,3 +81,4 @@ div.tleft {
     position: relative;
 }
 /*{ border:1px solid Red !important;}*/
+

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index ee7d454..ba76616 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -682,10 +682,21 @@ special external link styling */
     z-index: 3;
 }
 
-#p-navigation strong {
-    font-weight: normal;
+#p-navigation .pBody {
+    padding-right: 0;
+}
+
+#p-navigation a {
+    display: block;
+}
+
+#p-navigation li.active a, #p-navigation li.active a:hover {
+    color: #000;
+    text-decoration: none;
+    display: inline;
 }
 
+
 /*
 ** Search portlet
 */