aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/css/elements/navigation.php50
-rw-r--r--views/default/navigation/menu/site.php18
2 files changed, 39 insertions, 29 deletions
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 2e6aace8d..42d7f7409 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -93,12 +93,13 @@
* .elgg-menu-$menu > li {display:inline-block}
*
* To add separators to a horizontal menu:
- * .elgg-menu-$menu > li:after {content: 'separator'}
+ * .elgg-menu-$menu > li > a {display:inline-block}
+ * .elgg-menu-$menu > li:after {content: '|'}
*************************************** */
-.elgg-menu > li {vertical-align: middle}
+.elgg-menu > li {vertical-align: middle;position:relative}
.elgg-menu > li:after {display: inline-block}
.elgg-menu > li:last-child:after {display:none}
-.elgg-menu > li > a {display:inline-block}
+.elgg-menu > li > a {display:block}
.elgg-menu img, .elgg-menu .elgg-icon {vertical-align: middle; margin-top: -2px}
/* ***************************************
@@ -119,6 +120,7 @@
font-weight: normal;
}
.elgg-breadcrumbs a {
+ display: inline-block;
color: #999999;
}
.elgg-breadcrumbs a:hover {
@@ -169,14 +171,13 @@
width: auto;
z-index: 7000;
}
-.elgg-menu-site li {
- display: block;
- float: left;
- height: 23px;
-}
.elgg-menu-site > li {
+ display: inline-block;
margin-right: 1px;
}
+.elgg-menu-site li {
+ height: 23px;
+}
.elgg-menu-site a {
color: white;
font-weight: bold;
@@ -196,15 +197,25 @@
-moz-border-radius: 4px 4px 0 0;
-webkit-border-radius: 4px 4px 0 0;
}
-.elgg-menu-site .elgg-more {
- overflow: hidden;
+
+.elgg-more > a:before {
+ content: "\25BC";
+ font-size:smaller;
+ margin-right: 4px;
}
-.elgg-menu-site .elgg-more:hover {
- overflow: visible;
+
+.elgg-more > ul {
+ display:none;
+ position:relative;
+ left: -1px;
+ top: -1px;
+ width: 100%;
}
-.elgg-menu-site .elgg-more:hover span {
- background-position: -146px -76px;
+
+.elgg-more:hover > ul {
+ display:block;
}
+
.elgg-menu-site .elgg-more ul {
z-index: 7000;
min-width: 150px;
@@ -216,10 +227,9 @@
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
}
.elgg-menu-site .elgg-more ul li {
- float: none;
+ display:block;
}
.elgg-menu-site .elgg-more:hover ul li a {
- display: block;
background: white;
color: #555555;
-webkit-border-radius: 0;
@@ -315,8 +325,10 @@
/* ***************************************
FOOTER
*************************************** */
-.elgg-menu-footer > li {
+.elgg-menu-footer > li,
+.elgg-menu-footer > li > a {
display: inline-block;
+ color:#999;
}
.elgg-menu-footer > li:after {
@@ -324,10 +336,6 @@
padding: 0 4px;
}
-.elgg-menu-footer > li > a {
- color:#999;
-}
-
.elgg-menu-footer.elgg-section-alt {
float: right;
}
diff --git a/views/default/navigation/menu/site.php b/views/default/navigation/menu/site.php
index 0b3a47a62..41c81de03 100644
--- a/views/default/navigation/menu/site.php
+++ b/views/default/navigation/menu/site.php
@@ -12,15 +12,17 @@ foreach ($vars['menu']['default'] as $menu_item) {
}
if (isset($vars['menu']['more'])) {
- $more = elgg_echo('more');
- $arrow = elgg_view_icon('arrow-s');
echo '<li class="elgg-more">';
- echo "<a class='subnav' title=\"$more\">$arrow $more</a>";
- echo '<ul>';
- foreach ($vars['menu']['more'] as $menu_item) {
- echo elgg_view('navigation/menu/elements/item', array('item' => $menu_item));
- }
- echo '</ul>';
+
+ $more = elgg_echo('more');
+ echo "<a title=\"$more\">$more</a>";
+
+ echo elgg_view('navigation/menu/elements/group', array(
+ 'class' => 'elgg-menu',
+ 'section' => 'more',
+ 'items' => $vars['menu']['more'],
+ ));
+
echo '</li>';
}
echo '</ul>';