finished clean up the header css (except for search box in search plugin

git-svn-id: http://code.elgg.org/elgg/trunk@7590 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index f5871f33e2331d23811c12dab1d36fc530798845..4073b641853b9cdf803f032cb0945dd65fc1c39d 100644 (file)
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -136,6 +136,8 @@
        display: block;
        float: left;
        height: 23px;
+}
+.elgg-site-menu > li {
        margin-right: 1px;
 }
 .elgg-site-menu a {
@@ -146,7 +148,9 @@
        height: 20px;
        display: block;
 }
-.elgg-site-menu li.selected a, .elgg-site-menu li a:hover {
+.elgg-site-menu li.selected a,
+.elgg-site-menu li a:hover,
+.elgg-site-menu .elgg-more:hover a {
        background: white;
        color: #555555;
        -webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
@@ -156,83 +160,56 @@
        -webkit-border-top-left-radius: 4px;
        -webkit-border-top-right-radius: 4px;
 }
-
 .elgg-site-menu .elgg-more {
+       overflow: hidden;
 }
-li.navigation-more {
-       overflow:hidden;
-}
-li.navigation-more:hover {
-       overflow:visible;
+.elgg-site-menu .elgg-more:hover {
+       overflow: visible;
 }
-
-li.navigation-more:hover a {
-       background:white;
-       color:#555555;
-       -moz-border-radius-topleft:4px;
-       -moz-border-radius-topright:4px;
-       -webkit-border-top-left-radius:4px;
-       -webkit-border-top-right-radius:4px;
-       -webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-       -moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-}
-
-li.navigation-more a.subnav span {
+.elgg-site-menu .elgg-more a.subnav span {
        background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
        background-repeat: no-repeat;
        background-position: -150px -56px;
        padding-left: 12px;
 }
-li.navigation-more:hover a.subnav span,
-li.navigation-more a.subnav:hover span {
+.elgg-site-menu .elgg-more:hover a.subnav span,
+.elgg-site-menu .elgg-more:hover span {
        background-position: -150px -76px;
 }
-li.navigation-more ul {
+.elgg-site-menu .elgg-more ul {
        z-index: 7000;
        min-width: 150px;
-       margin-left:-1px;
-       background-color:white;
-       border-left:1px solid #999999;
-       border-right:1px solid #999999;
-       border-bottom:1px solid #999999;
-       -moz-border-radius-bottomleft:4px;
-       -moz-border-radius-bottomright:4px;
-       -webkit-border-bottom-left-radius:4px;
-       -webkit-border-bottom-right-radius:4px;
+       border-left: 1px solid #999999;
+       border-right: 1px solid #999999;
+       border-bottom: 1px solid #999999;
+       -moz-border-radius-bottomleft: 4px;
+       -moz-border-radius-bottomright: 4px;
+       -webkit-border-bottom-left-radius: 4px;
+       -webkit-border-bottom-right-radius: 4px;
        -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
        -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
 }
-li.navigation-more ul li {
-       float:none;
+.elgg-site-menu .elgg-more ul li {
+       float: none;
 }
-.elgg-site-menu li.navigation-more ul li a {
-       background:white;
-       color:#555555;
-       margin:0;
+.elgg-site-menu .elgg-more:hover ul li a {
+       background: white;
+       color: #555555;
        -webkit-border-radius: 0;
        -moz-border-radius: 0;
        -webkit-box-shadow: none;
        -moz-box-shadow: none;
 }
-.elgg-site-menun li.navigation-more ul li:last-child a,
-.elgg-site-menu li.navigation-more ul li:last-child a:hover {
-       -moz-border-radius-bottomleft:4px;
-       -moz-border-radius-bottomright:4px;
-       -webkit-border-bottom-left-radius:4px;
-       -webkit-border-bottom-right-radius:4px;
-}
-.elgg-site-menu li.navigation-more ul li a:hover {
-       background:#4690D6;
-       color:white;
-       margin:0;
-       -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-       -webkit-box-shadow: none;
-       -moz-box-shadow: none;
+.elgg-site-menu .elgg-more ul li a:hover {
+       background: #4690D6;
+       color: white;
 }
-.elgg-site-menu li.navigation-more ul li.selected a {
-       background:#4690D6;
-       color:white;
+.elgg-site-menu .elgg-more ul li:last-child a,
+.elgg-site-menu .elgg-more ul li:last-child a:hover {
+       -moz-border-radius-bottomleft: 4px;
+       -moz-border-radius-bottomright: 4px;
+       -webkit-border-bottom-left-radius: 4px;
+       -webkit-border-bottom-right-radius: 4px;
 }
 
 

diff --git a/views/default/navigation/site_nav.php b/views/default/navigation/site_nav.php
index 50be4ce3cfb8cc4a6c994542da8d68fcee0c5bf3..7fbeda12514dfe81a7918bf8653f6db3b835d21d 100644 (file)
--- a/views/default/navigation/site_nav.php
+++ b/views/default/navigation/site_nav.php
@@ -34,7 +34,7 @@ if ($featured) {
                $nav_html .= "<li $selected><a href=\"$url\" title=\"$title\"><span>$title</span></a></li>";
        }
 } elseif ($more) {
-       for ($i=0; $i<5; $i++) {
+       for ($i=0; $i<6; $i++) {
                if (!array_key_exists($i, $more)) {
                        break;
                }
@@ -65,7 +65,7 @@ foreach ($more as $info) {
 
 if ($more_nav_html) {
        $more = elgg_echo('more');
-       $nav_html .= "<li class='navigation-more'><a class='subnav' title=\"$more\"><span>$more</span></a>
+       $nav_html .= "<li class='elgg-more'><a class='subnav' title=\"$more\"><span>$more</span></a>
                <ul>
                        $more_nav_html
                </ul>