aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-01 23:25:41 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-01 23:25:41 +0000
commit1d416fd2ae6d0e70cd5adf5140dbc52894718a76 (patch)
tree7a38a9584a08ba9c9fe27bdfe92d162856566152
parentef49036b70918b4d5a608cf5e17d463ff0106c0b (diff)
downloadelgg-1d416fd2ae6d0e70cd5adf5140dbc52894718a76.tar.gz
elgg-1d416fd2ae6d0e70cd5adf5140dbc52894718a76.tar.bz2
Some fixes for site menu
git-svn-id: http://code.elgg.org/elgg/trunk@8550 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--views/default/css/elements/modules.php4
-rw-r--r--views/default/css/elements/navigation.php86
-rw-r--r--views/default/navigation/menu/site.php2
3 files changed, 45 insertions, 47 deletions
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index 7f11aa69e..d4707ed08 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -67,11 +67,9 @@
-webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
-moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
-
- <?php //@todo cleaner way to do this? ?>
position:absolute;
right: 0px;
- top: 35px;
+ top: 100%;
}
/* Featured */
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index d8c857b8c..21df87f9f 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -118,6 +118,11 @@
vertical-align:middle;
}
+/* Allow inline image blocks in horizontal menus */
+.elgg-menu-hz .elgg-body:after {
+ content: '.';
+}
+
/* ***************************************
BREADCRUMBS
*************************************** */
@@ -181,32 +186,37 @@
SITE MENU
*************************************** */
.elgg-menu-site {
- position: absolute;
- height: 23px;
- bottom: 0;
- left: 0;
- width: auto;
z-index: 7000;
}
-.elgg-menu-site > li {
- display: inline-block;
- margin-right: 1px;
-}
-.elgg-menu-site li {
- height: 23px;
-}
-.elgg-menu-site a {
- color: white;
+
+.elgg-menu-site > li > a {
font-weight: bold;
padding: 3px 13px 0px 13px;
height: 20px;
}
-.elgg-menu-site a:hover {
+
+.elgg-menu-site > li > a:hover {
text-decoration: none;
}
-.elgg-menu-site li.elgg-state-selected a,
-.elgg-menu-site li a:hover,
-.elgg-menu-site .elgg-more:hover a {
+
+
+.elgg-menu-site-default {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ height: 23px;
+}
+
+.elgg-menu-site-default > li {
+ float: left;
+ margin-right: 1px;
+}
+
+.elgg-menu-site-default > li > a {color: white}
+
+
+.elgg-menu-site-default > .elgg-state-selected > a,
+.elgg-menu-site-default > li:hover > a {
background: white;
color: #555555;
-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
@@ -215,25 +225,11 @@
-webkit-border-radius: 4px 4px 0 0;
}
-.elgg-more > a:before {
- content: "\25BC";
- font-size:smaller;
- margin-right: 4px;
-}
-
-.elgg-more > ul {
+.elgg-menu-site-more {
display:none;
position:relative;
left: -1px;
- top: -1px;
width: 100%;
-}
-
-.elgg-more:hover > ul {
- display:block;
-}
-
-.elgg-menu-site .elgg-more ul {
z-index: 7000;
min-width: 150px;
border: 1px solid #999999;
@@ -243,10 +239,12 @@
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
}
-.elgg-menu-site .elgg-more ul li {
+
+li:hover > .elgg-menu-site-more {
display:block;
}
-.elgg-menu-site .elgg-more:hover ul li a {
+
+.elgg-menu-site-more > li > a {
background: white;
color: #555555;
-webkit-border-radius: 0;
@@ -254,14 +252,21 @@
-webkit-box-shadow: none;
-moz-box-shadow: none;
}
-.elgg-menu-site .elgg-more ul li a:hover {
+.elgg-menu-site-more > li > a:hover {
background: #4690D6;
color: white;
}
-.elgg-menu-site .elgg-more ul li:last-child a,
-.elgg-menu-site .elgg-more ul li:last-child a:hover {
+.elgg-menu-site-more > li:last-child > a,
+.elgg-menu-site-more > li:last-child > a:hover {
-moz-border-radius: 0 0 4px 4px;
-webkit-border-radius: 0 0 4px 4px;
+ border-radius: 0 0 4px 4px;
+}
+
+.elgg-more > a:before {
+ content: "\25BC";
+ font-size:smaller;
+ margin-right: 4px;
}
/* ***************************************
@@ -425,11 +430,6 @@
color: #aaa;
}
-/* Ick. Allows the horizontal menu to hold image blocks without breaking */
-.elgg-menu-metadata .elgg-body:after {
- content: '.';
-}
-
/* ***************************************
LONGTEXT
*************************************** */
diff --git a/views/default/navigation/menu/site.php b/views/default/navigation/menu/site.php
index aa41840fe..1409f54af 100644
--- a/views/default/navigation/menu/site.php
+++ b/views/default/navigation/menu/site.php
@@ -18,7 +18,7 @@ if (isset($vars['menu']['more'])) {
echo "<a title=\"$more\">$more</a>";
echo elgg_view('navigation/menu/elements/section', array(
- 'class' => 'elgg-menu elgg-menu-site-more',
+ 'class' => 'elgg-menu elgg-menu-site elgg-menu-site-more',
'items' => $vars['menu']['more'],
));