aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-06-25 09:51:21 -0400
committerCash Costello <cash.costello@gmail.com>2011-06-25 09:51:21 -0400
commit30958fd27d81717354bc04e029213239f6b9bc6b (patch)
tree446e6efc2a5302c9fb09a7f33eb7343b33f968fa
parent505962b2533467a48c1ebcb7d151d215f41f8c81 (diff)
downloadelgg-30958fd27d81717354bc04e029213239f6b9bc6b.tar.gz
elgg-30958fd27d81717354bc04e029213239f6b9bc6b.tar.bz2
Refs #3388 entity menu has better vertical alignment
-rw-r--r--mod/likes/views/default/likes/button.php (renamed from mod/likes/views/default/likes/display.php)0
-rw-r--r--views/default/css/elements/core.php6
-rw-r--r--views/default/css/elements/navigation.php26
3 files changed, 23 insertions, 9 deletions
diff --git a/mod/likes/views/default/likes/display.php b/mod/likes/views/default/likes/button.php
index 2dc50ddd0..2dc50ddd0 100644
--- a/mod/likes/views/default/likes/display.php
+++ b/mod/likes/views/default/likes/button.php
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index 61dcdb1fe..af4a1882a 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -96,9 +96,6 @@
.elgg-menu-hz > li > span {
/* Google says do this, but why? */
position: relative;
-
- /* FF2 */
- display: -moz-inline-box;
display: inline-block;
@@ -106,6 +103,3 @@
zoom: 1;
*display: inline;
}
-
-/* Looks much better when middle-aligned with surrounding text */
-.elgg-icon {vertical-align:middle} \ No newline at end of file
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index d930d3a89..cde978138 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -421,20 +421,27 @@ li:hover > .elgg-menu-site-more {
/* ***************************************
ENTITY
*************************************** */
+<?php // height depends on line height/font size ?>
.elgg-menu-entity {
float: right;
margin-left: 15px;
font-size: 90%;
color: #aaa;
+ line-height: 16px;
+ height: 16px;
}
.elgg-menu-entity > li {
- display: inline-block;
margin-left: 15px;
}
-<?php // height depends on line height/font size ?>
.elgg-menu-entity > li > a {
color: #aaa;
- height: 18px;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-entity > li > a {
+ display: block;
+}
+.elgg-menu-entity > li > span {
+ vertical-align: baseline;
}
/* ***************************************
@@ -476,11 +483,24 @@ li:hover > .elgg-menu-site-more {
margin-left: 15px;
font-size: 90%;
color: #aaa;
+ line-height: 16px;
+ height: 16px;
}
.elgg-menu-river > li {
display: inline-block;
margin-left: 5px;
}
+.elgg-menu-river > li > a {
+ color: #aaa;
+ height: 16px;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-river > li > a {
+ display: block;
+}
+.elgg-menu-river > li > span {
+ vertical-align: baseline;
+}
/* ***************************************
SIDEBAR EXTRAS (rss, bookmark, etc)