From d3d5ef824e3dafaf7165ba88712c74a4140c171c Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Thu, 15 Sep 2011 21:08:17 -0400
Subject: Fixes #3400, #3820 added additional icons to Elgg's sprite

---
 views/default/css/elements/icons.php | 181 +++++++++++++++++++++--------------
 1 file changed, 110 insertions(+), 71 deletions(-)

(limited to 'views/default/css/elements')

diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index 1bc056072..ee166b5be 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -27,215 +27,254 @@
 .elgg-icon-arrow-two-head {
 	background-position: 0 -36px;
 }
-.elgg-icon-calendar {
+.elgg-icon-attention:hover {
 	background-position: 0 -54px;
 }
-.elgg-icon-checkmark:hover {
+.elgg-icon-attention {
 	background-position: 0 -72px;
 }
-.elgg-icon-checkmark {
+.elgg-icon-calendar {
 	background-position: 0 -90px;
 }
-.elgg-icon-clip:hover {
+.elgg-icon-cell-phone {
 	background-position: 0 -108px;
 }
-.elgg-icon-clip {
+.elgg-icon-checkmark:hover {
 	background-position: 0 -126px;
 }
-.elgg-icon-cursor-drag-arrow {
+.elgg-icon-checkmark {
 	background-position: 0 -144px;
 }
-.elgg-icon-delete-alt:hover {
+.elgg-icon-clip:hover {
 	background-position: 0 -162px;
 }
-.elgg-icon-delete-alt {
+.elgg-icon-clip {
 	background-position: 0 -180px;
 }
-.elgg-icon-delete:hover {
+.elgg-icon-cursor-drag-arrow {
 	background-position: 0 -198px;
 }
-.elgg-icon-delete {
+.elgg-icon-delete-alt:hover {
 	background-position: 0 -216px;
 }
-.elgg-icon-download:hover {
+.elgg-icon-delete-alt {
 	background-position: 0 -234px;
 }
-.elgg-icon-download {
+.elgg-icon-delete:hover {
 	background-position: 0 -252px;
 }
-.elgg-icon-facebook {
+.elgg-icon-delete {
 	background-position: 0 -270px;
 }
-.elgg-icon-home:hover {
+.elgg-icon-download:hover {
 	background-position: 0 -288px;
 }
-.elgg-icon-home {
+.elgg-icon-download {
 	background-position: 0 -306px;
 }
-.elgg-icon-hover-menu:hover {
+.elgg-icon-eye {
 	background-position: 0 -324px;
 }
-.elgg-icon-hover-menu {
+.elgg-icon-facebook {
 	background-position: 0 -342px;
 }
-.elgg-icon-link:hover {
+.elgg-icon-grid:hover {
 	background-position: 0 -360px;
 }
-.elgg-icon-link {
+.elgg-icon-grid {
 	background-position: 0 -378px;
 }
-.elgg-icon-mail-alt:hover {
+.elgg-icon-home:hover {
 	background-position: 0 -396px;
 }
-.elgg-icon-mail-alt {
+.elgg-icon-home {
 	background-position: 0 -414px;
 }
-.elgg-icon-mail:hover {
+.elgg-icon-hover-menu:hover {
 	background-position: 0 -432px;
 }
-.elgg-icon-mail {
+.elgg-icon-hover-menu {
 	background-position: 0 -450px;
 }
-.elgg-icon-print-alt {
+.elgg-icon-info:hover {
 	background-position: 0 -468px;
 }
-.elgg-icon-print {
+.elgg-icon-info {
 	background-position: 0 -486px;
 }
-.elgg-icon-push-pin-alt {
+.elgg-icon-link:hover {
 	background-position: 0 -504px;
 }
-.elgg-icon-push-pin {
+.elgg-icon-link {
 	background-position: 0 -522px;
 }
-.elgg-icon-redo {
+.elgg-icon-list {
 	background-position: 0 -540px;
 }
-.elgg-icon-refresh:hover {
+.elgg-icon-lock-closed {
 	background-position: 0 -558px;
 }
-.elgg-icon-refresh {
+.elgg-icon-lock-open {
 	background-position: 0 -576px;
 }
-.elgg-icon-round-arrow-left {
+.elgg-icon-mail-alt:hover {
 	background-position: 0 -594px;
 }
-.elgg-icon-round-arrow-right {
+.elgg-icon-mail-alt {
 	background-position: 0 -612px;
 }
-.elgg-icon-round-checkmark {
+.elgg-icon-mail:hover {
 	background-position: 0 -630px;
 }
-.elgg-icon-round-minus {
+.elgg-icon-mail {
 	background-position: 0 -648px;
 }
-.elgg-icon-round-plus {
+.elgg-icon-photo {
 	background-position: 0 -666px;
 }
-.elgg-icon-rss {
+.elgg-icon-print-alt {
 	background-position: 0 -684px;
 }
-.elgg-icon-search-focus {
+.elgg-icon-print {
 	background-position: 0 -702px;
 }
-.elgg-icon-search {
+.elgg-icon-push-pin-alt {
 	background-position: 0 -720px;
 }
-.elgg-icon-settings-alt:hover {
+.elgg-icon-push-pin {
 	background-position: 0 -738px;
 }
-.elgg-icon-settings-alt {
+.elgg-icon-redo {
 	background-position: 0 -756px;
 }
-.elgg-icon-settings {
+.elgg-icon-refresh:hover {
 	background-position: 0 -774px;
 }
-.elgg-icon-share:hover {
+.elgg-icon-refresh {
 	background-position: 0 -792px;
 }
-.elgg-icon-share {
+.elgg-icon-round-arrow-left {
 	background-position: 0 -810px;
 }
-.elgg-icon-shop-cart:hover {
+.elgg-icon-round-arrow-right {
 	background-position: 0 -828px;
 }
-.elgg-icon-shop-cart {
+.elgg-icon-round-checkmark {
 	background-position: 0 -846px;
 }
-.elgg-icon-speech-bubble-alt:hover {
+.elgg-icon-round-minus {
 	background-position: 0 -864px;
 }
-.elgg-icon-speech-bubble-alt {
+.elgg-icon-round-plus {
 	background-position: 0 -882px;
 }
-.elgg-icon-speech-bubble:hover {
+.elgg-icon-rss {
 	background-position: 0 -900px;
 }
-.elgg-icon-speech-bubble {
+.elgg-icon-search-focus {
 	background-position: 0 -918px;
 }
-.elgg-icon-star-alt {
+.elgg-icon-search {
 	background-position: 0 -936px;
 }
-.elgg-icon-star-empty:hover {
+.elgg-icon-settings-alt:hover {
 	background-position: 0 -954px;
 }
-.elgg-icon-star-empty {
+.elgg-icon-settings-alt {
 	background-position: 0 -972px;
 }
-.elgg-icon-star:hover {
+.elgg-icon-settings {
 	background-position: 0 -990px;
 }
-.elgg-icon-star {
+.elgg-icon-share:hover {
 	background-position: 0 -1008px;
 }
-.elgg-icon-tag:hover {
+.elgg-icon-share {
 	background-position: 0 -1026px;
 }
-.elgg-icon-tag {
+.elgg-icon-shop-cart:hover {
 	background-position: 0 -1044px;
 }
-.elgg-icon-thumbs-down-alt:hover {
+.elgg-icon-shop-cart {
 	background-position: 0 -1062px;
 }
-.elgg-icon-thumbs-down:hover,
-.elgg-icon-thumbs-down-alt {
+.elgg-icon-speech-bubble-alt:hover {
 	background-position: 0 -1080px;
 }
-.elgg-icon-thumbs-down {
+.elgg-icon-speech-bubble-alt {
 	background-position: 0 -1098px;
 }
-.elgg-icon-thumbs-up-alt:hover {
+.elgg-icon-speech-bubble:hover {
 	background-position: 0 -1116px;
 }
-.elgg-icon-thumbs-up:hover,
-.elgg-icon-thumbs-up-alt {
+.elgg-icon-speech-bubble {
 	background-position: 0 -1134px;
 }
-.elgg-icon-thumbs-up {
+.elgg-icon-star-alt {
 	background-position: 0 -1152px;
 }
-.elgg-icon-trash {
+.elgg-icon-star-empty:hover {
 	background-position: 0 -1170px;
 }
-.elgg-icon-twitter {
+.elgg-icon-star-empty {
 	background-position: 0 -1188px;
 }
-.elgg-icon-undo {
+.elgg-icon-star:hover {
 	background-position: 0 -1206px;
 }
-.elgg-icon-user {
+.elgg-icon-star {
 	background-position: 0 -1224px;
 }
-.elgg-icon-user:hover {
+.elgg-icon-tag:hover {
 	background-position: 0 -1242px;
 }
-.elgg-icon-users:hover {
+.elgg-icon-tag {
 	background-position: 0 -1260px;
 }
-.elgg-icon-users {
+.elgg-icon-thumbs-down-alt:hover {
 	background-position: 0 -1278px;
 }
+.elgg-icon-thumbs-down:hover,
+.elgg-icon-thumbs-down-alt {
+	background-position: 0 -1296px;
+}
+.elgg-icon-thumbs-down {
+	background-position: 0 -1314px;
+}
+.elgg-icon-thumbs-up-alt:hover {
+	background-position: 0 -1332px;
+}
+.elgg-icon-thumbs-up:hover,
+.elgg-icon-thumbs-up-alt {
+	background-position: 0 -1350px;
+}
+.elgg-icon-thumbs-up {
+	background-position: 0 -1368px;
+}
+.elgg-icon-trash {
+	background-position: 0 -1386px;
+}
+.elgg-icon-twitter {
+	background-position: 0 -1404px;
+}
+.elgg-icon-undo {
+	background-position: 0 -1422px;
+}
+.elgg-icon-user:hover {
+	background-position: 0 -1440px;
+}
+.elgg-icon-user {
+	background-position: 0 -1458px;
+}
+.elgg-icon-users:hover {
+	background-position: 0 -1476px;
+}
+.elgg-icon-users {
+	background-position: 0 -1494px;
+}
+.elgg-icon-video {
+	background-position: 0 -1512px;
+}
 
 
 .elgg-avatar > .elgg-icon-hover-menu {
-- 
cgit v1.2.3


From 9a44acd27b0f8fb63cd07af7e7232f6c2b29ecf5 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Wed, 21 Sep 2011 20:57:33 -0400
Subject: Fixes #3770 CSS only site menu that works in IE7

---
 js/lib/ui.js                              |  33 --------
 views/default/css/elements/navigation.php | 123 ++++++++++++++++--------------
 views/default/css/ie.php                  |  13 ++--
 views/default/navigation/menu/site.php    |   2 +-
 4 files changed, 73 insertions(+), 98 deletions(-)

(limited to 'views/default/css/elements')

diff --git a/js/lib/ui.js b/js/lib/ui.js
index 46e418e8b..7abf7626f 100644
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -22,13 +22,6 @@ elgg.ui.init = function () {
 	if ($('.elgg-input-date').length) {
 		elgg.ui.initDatePicker();
 	}
-
-	// fix for ie7 CSS issue on menu dropdown
-	// open the menu when you hover over it, close when you click off of it.
-	// @todo This should be possible with CSS. Anyone want to tame the beast, go for it.
-	if ($.browser.msie && $.browser.version <= 7) {
-		$('.elgg-menu-site > .elgg-more').live('mouseenter', elgg.ui.ie7MenuFixMouseEnter)
-	}
 }
 
 /**
@@ -282,32 +275,6 @@ elgg.ui.initDatePicker = function() {
 	});
 }
 
-/**
- * IE 7 doesn't like our site menu system CSS, so open it with JS.
- */
-elgg.ui.ie7MenuFixMouseEnter = function() {
-	$('.elgg-menu-site .elgg-menu-site-more').css('display', 'block');
-	$('.elgg-menu-site .elgg-more > a')
-		.css('background-color', 'white')
-		.css('color', '#555')
-
-	$body = $('body');
-	if (!$body.data('hasIe7Clear')) {
-		$body.live('click', elgg.ui.ie7MenuClear);
-		$body.data('hasIe7Clear', true);
-	}
-	
-}
-
-/**
- * Close the menu when clicking on the body
- */
-elgg.ui.ie7MenuClear = function() {
-	$('.elgg-menu-site .elgg-menu-site-more').css('display', 'none');
-	$('.elgg-menu-site .elgg-more > a')
-		.css('background-color', 'transparent')
-		.css('color', 'white')
-}
 
 elgg.register_hook_handler('init', 'system', elgg.ui.init);
 elgg.register_hook_handler('getOptions', 'ui.popup', elgg.ui.LoginHandler);
\ No newline at end of file
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index b5388715e..9eef96eb9 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -169,95 +169,100 @@
 }
 
 .elgg-menu-site > li > a {
-	font-weight: bold;
-	padding: 3px 13px 0px 13px;
-	height: 20px;
+    font-weight: bold;
+    padding: 3px 13px 0px 13px;
+    height: 20px;
 }
 
 .elgg-menu-site > li > a:hover {
-	text-decoration: none;
+    text-decoration: none;
 }
 
-
 .elgg-menu-site-default {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	height: 23px;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    height: 23px;
 }
 
 .elgg-menu-site-default > li {
-	float: left;
-	margin-right: 1px;
+    float: left;
+    margin-right: 1px;
 }
 
-.elgg-menu-site-default > li > a {color: white}
+.elgg-menu-site-default > li > a {
+    color: white;
+}
 
+.elgg-menu-site > li > ul {
+    display: none;
+    background-color: white;
+}
+
+.elgg-menu-site > li:hover > ul {
+    display: block;
+}
 
 .elgg-menu-site-default > .elgg-state-selected > a,
 .elgg-menu-site-default > li:hover > a {
-	background: white;
-	color: #555;
-	
-	-webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-	-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-	box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-	
-	-webkit-border-radius: 4px 4px 0 0;
-	-moz-border-radius: 4px 4px 0 0;
-	border-radius: 4px 4px 0 0;
+    background: white;
+    color: #555;
+
+    -webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
+    -moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
+    box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
+
+    -webkit-border-radius: 4px 4px 0 0;
+    -moz-border-radius: 4px 4px 0 0;
+    border-radius: 4px 4px 0 0;
 }
 
 .elgg-menu-site-more {
-	display: none;
-	position: relative;
-	left: -1px;
-	width: 100%;
-	z-index: 1;
-	min-width: 150px;
-	border: 1px solid #999;
-	border-top: 0;
-	
-	-webkit-border-radius: 0 0 4px 4px;
-	-moz-border-radius: 0 0 4px 4px;
-	border-radius: 0 0 4px 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);
-	box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
-}
+    position: relative;
+    left: -1px;
+    width: 100%;
+    min-width: 150px;
+    border: 1px solid #999;
+    border-top: 0;
 
-li:hover > .elgg-menu-site-more {
-	display: block;
+    -webkit-border-radius: 0 0 4px 4px;
+    -moz-border-radius: 0 0 4px 4px;
+    border-radius: 0 0 4px 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);
+    box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
 }
 
 .elgg-menu-site-more > li > a {
-	background: white;
-	color: #555;
-	
-	-webkit-border-radius: 0;
-	-moz-border-radius: 0;
-	border-radius: 0;
-	
-	-webkit-box-shadow: none;
-	-moz-box-shadow: none;
-	box-shadow: none;
+    background-color: white;
+    color: #555;
+
+    -webkit-border-radius: 0;
+    -moz-border-radius: 0;
+    border-radius: 0;
+
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
 }
+
 .elgg-menu-site-more > li > a:hover {
-	background: #4690D6;
-	color: white;
+    background: #4690D6;
+    color: white;
 }
+
 .elgg-menu-site-more > li:last-child > a,
 .elgg-menu-site-more > li:last-child > a:hover {
-	-webkit-border-radius: 0 0 4px 4px;
-	-moz-border-radius: 0 0 4px 4px;
-	border-radius: 0 0 4px 4px;
+    -webkit-border-radius: 0 0 4px 4px;
+    -moz-border-radius: 0 0 4px 4px;
+    border-radius: 0 0 4px 4px;
 }
 
 .elgg-more > a:before {
-	content: "\25BC";
-	font-size: smaller;
-	margin-right: 4px;
+    content: "\25BC";
+    font-size: smaller;
+    margin-right: 4px;
 }
 
 /* ***************************************
diff --git a/views/default/css/ie.php b/views/default/css/ie.php
index cb4ede0ae..c5edefd4c 100644
--- a/views/default/css/ie.php
+++ b/views/default/css/ie.php
@@ -1,11 +1,14 @@
 /**
- * elgg_layout css for Internet Explorer > ie6
- * @uses $vars['wwwroot'] The site URL
-*/
+ * CSS for Internet Explorer for versions > ie6
+ */
+
 * {zoom: 1;} /* trigger hasLayout in IE */
 
-/* tools drop-down menu */
-#elgg-header {z-index:1;}
+/* site menu drop-down for IE7 */
+.elgg-page-header {
+    z-index: 1;
+}
+
 .navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
 .navigation li a:hover ul li a {display:block;}
 .navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
diff --git a/views/default/navigation/menu/site.php b/views/default/navigation/menu/site.php
index 1409f54af..e2d3aa8fa 100644
--- a/views/default/navigation/menu/site.php
+++ b/views/default/navigation/menu/site.php
@@ -15,7 +15,7 @@ if (isset($vars['menu']['more'])) {
 	echo '<li class="elgg-more">';
 
 	$more = elgg_echo('more');
-	echo "<a title=\"$more\">$more</a>";
+	echo "<a href=\"#\">$more</a>";
 	
 	echo elgg_view('navigation/menu/elements/section', array(
 		'class' => 'elgg-menu elgg-menu-site elgg-menu-site-more', 
-- 
cgit v1.2.3


From 49d433e8b0404c91be3853b11c275c5928af23b9 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Wed, 21 Sep 2011 21:03:13 -0400
Subject: argh, spaces rather than tabs in previous commit

---
 views/default/css/elements/navigation.php | 100 +++++++++++++++---------------
 1 file changed, 50 insertions(+), 50 deletions(-)

(limited to 'views/default/css/elements')

diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 9eef96eb9..9386fa27b 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -169,100 +169,100 @@
 }
 
 .elgg-menu-site > li > a {
-    font-weight: bold;
-    padding: 3px 13px 0px 13px;
-    height: 20px;
+	font-weight: bold;
+	padding: 3px 13px 0px 13px;
+	height: 20px;
 }
 
 .elgg-menu-site > li > a:hover {
-    text-decoration: none;
+	text-decoration: none;
 }
 
 .elgg-menu-site-default {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    height: 23px;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	height: 23px;
 }
 
 .elgg-menu-site-default > li {
-    float: left;
-    margin-right: 1px;
+	float: left;
+	margin-right: 1px;
 }
 
 .elgg-menu-site-default > li > a {
-    color: white;
+	color: white;
 }
 
 .elgg-menu-site > li > ul {
-    display: none;
-    background-color: white;
+	display: none;
+	background-color: white;
 }
 
 .elgg-menu-site > li:hover > ul {
-    display: block;
+	display: block;
 }
 
 .elgg-menu-site-default > .elgg-state-selected > a,
 .elgg-menu-site-default > li:hover > a {
-    background: white;
-    color: #555;
+	background: white;
+	color: #555;
 
-    -webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-    -moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
-    box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
+	-webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
+	-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
+	box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
 
-    -webkit-border-radius: 4px 4px 0 0;
-    -moz-border-radius: 4px 4px 0 0;
-    border-radius: 4px 4px 0 0;
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
 }
 
 .elgg-menu-site-more {
-    position: relative;
-    left: -1px;
-    width: 100%;
-    min-width: 150px;
-    border: 1px solid #999;
-    border-top: 0;
+	position: relative;
+	left: -1px;
+	width: 100%;
+	min-width: 150px;
+	border: 1px solid #999;
+	border-top: 0;
 
-    -webkit-border-radius: 0 0 4px 4px;
-    -moz-border-radius: 0 0 4px 4px;
-    border-radius: 0 0 4px 4px;
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 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);
-    box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
+	-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
+	-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
+	box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
 }
 
 .elgg-menu-site-more > li > a {
-    background-color: white;
-    color: #555;
+	background-color: white;
+	color: #555;
 
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
 
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
 }
 
 .elgg-menu-site-more > li > a:hover {
-    background: #4690D6;
-    color: white;
+	background: #4690D6;
+	color: white;
 }
 
 .elgg-menu-site-more > li:last-child > a,
 .elgg-menu-site-more > li:last-child > a:hover {
-    -webkit-border-radius: 0 0 4px 4px;
-    -moz-border-radius: 0 0 4px 4px;
-    border-radius: 0 0 4px 4px;
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
 }
 
 .elgg-more > a:before {
-    content: "\25BC";
-    font-size: smaller;
-    margin-right: 4px;
+	content: "\25BC";
+	font-size: smaller;
+	margin-right: 4px;
 }
 
 /* ***************************************
-- 
cgit v1.2.3


From d9d3cc65e96c54332f22f90ac17b014dfe183ddf Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 24 Sep 2011 17:29:41 -0400
Subject: Fixes #3828 correct list classes

---
 engine/lib/deprecated-1.8.php                      | 2 +-
 engine/lib/river.php                               | 2 +-
 engine/lib/views.php                               | 2 +-
 mod/likes/views/default/likes/count.php            | 9 +++++++--
 mod/likes/views/default/likes/css.php              | 2 +-
 mod/likes/views/default/likes/js.php               | 2 +-
 mod/messageboard/views/default/messageboard/js.php | 2 +-
 views/default/css/elements/components.php          | 4 ++--
 8 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'views/default/css/elements')

diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
index f0f4bd9dc..beba7d2b7 100644
--- a/engine/lib/deprecated-1.8.php
+++ b/engine/lib/deprecated-1.8.php
@@ -2424,7 +2424,7 @@ $posted_max = 0, $pagination = true) {
 		'offset' => $offset,
 		'limit' => $limit,
 		'pagination' => $pagination,
-		'list-class' => 'elgg-river-list',
+		'list-class' => 'elgg-list-river',
 	);
 
 	return elgg_view('page/components/list', $params);
diff --git a/engine/lib/river.php b/engine/lib/river.php
index 64ddcfdc1..a11e6145c 100644
--- a/engine/lib/river.php
+++ b/engine/lib/river.php
@@ -378,7 +378,7 @@ function elgg_list_river(array $options = array()) {
 		'offset'     => (int) max(get_input('offset', 0), 0),
 		'limit'      => (int) max(get_input('limit', 20), 0),
 		'pagination' => TRUE,
-		'list_class' => 'elgg-river',
+		'list_class' => 'elgg-list-river elgg-river', // @todo remove elgg-river in Elgg 1.9
 	);
 
 	$options = array_merge($defaults, $options);
diff --git a/engine/lib/views.php b/engine/lib/views.php
index f6e5aa6b8..9a236508f 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1044,7 +1044,7 @@ $list_type_toggle = true, $pagination = true) {
 function elgg_view_annotation_list($annotations, array $vars = array()) {
 	$defaults = array(
 		'items' => $annotations,
-		'list_class' => 'elgg-annotation-list',
+		'list_class' => 'elgg-list-annotation elgg-annotation-list', // @todo remove elgg-annotation-list in Elgg 1.9
 		'full_view' => true,
 		'offset_key' => 'annoff',
 	);
diff --git a/mod/likes/views/default/likes/count.php b/mod/likes/views/default/likes/count.php
index bdc50bcd1..071a069bd 100644
--- a/mod/likes/views/default/likes/count.php
+++ b/mod/likes/views/default/likes/count.php
@@ -24,8 +24,13 @@ if ($num_of_likes) {
 		'href' => "#likes-$guid"
 	);
 	$list = elgg_view('output/url', $params);
-	$list .= "<div class='elgg-module elgg-module-popup elgg-likes-list hidden clearfix' id='likes-$guid'>";
-	$list .= elgg_list_annotations(array('guid' => $guid, 'annotation_name' => 'likes', 'limit' => 99));
+	$list .= "<div class='elgg-module elgg-module-popup elgg-likes hidden clearfix' id='likes-$guid'>";
+	$list .= elgg_list_annotations(array(
+		'guid' => $guid,
+		'annotation_name' => 'likes',
+		'limit' => 99,
+		'list_class' => 'elgg-list-likes'
+	));
 	$list .= "</div>";
 	echo $list;
 }
diff --git a/mod/likes/views/default/likes/css.php b/mod/likes/views/default/likes/css.php
index fabf54e46..1ec07b366 100644
--- a/mod/likes/views/default/likes/css.php
+++ b/mod/likes/views/default/likes/css.php
@@ -7,7 +7,7 @@
 /* ***************************************
 	Likes
 *************************************** */
-.elgg-likes-list {
+.elgg-likes {
 	width: 345px;
 	position: absolute;
 }
diff --git a/mod/likes/views/default/likes/js.php b/mod/likes/views/default/likes/js.php
index b7e000539..f701ebedf 100644
--- a/mod/likes/views/default/likes/js.php
+++ b/mod/likes/views/default/likes/js.php
@@ -15,7 +15,7 @@
  * @return {Object}
  */
 elgg.ui.likesPopupHandler = function(hook, type, params, options) {
-	if (params.target.hasClass('elgg-likes-list')) {
+	if (params.target.hasClass('elgg-likes')) {
 		options.my = 'right bottom';
 		options.at = 'left top';
 		return options;
diff --git a/mod/messageboard/views/default/messageboard/js.php b/mod/messageboard/views/default/messageboard/js.php
index 5d89fcd69..e5495409a 100644
--- a/mod/messageboard/views/default/messageboard/js.php
+++ b/mod/messageboard/views/default/messageboard/js.php
@@ -23,7 +23,7 @@ elgg.messageboard.submit = function(e) {
 		data: data,
 		success: function(json) {
 			// the action always returns the full ul and li wrapped annotation.
-			var ul = form.next('ul.elgg-annotation-list');
+			var ul = form.next('ul.elgg-list-annotation');
 
 			if (ul.length < 1) {
 				form.parent().append(json.output);
diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index 4a09ca74e..f675ab7cb 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -146,10 +146,10 @@
 /* ***************************************
 	River
 *************************************** */
-.elgg-river {
+.elgg-list-river {
 	border-top: 1px solid #CCC;
 }
-.elgg-river > li {
+.elgg-list-river > li {
 	border-bottom: 1px solid #CCC;
 }
 .elgg-river-item {
-- 
cgit v1.2.3


From 43f82db7fe8cab6b035fb66b307e5466cb5b3aa5 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 24 Sep 2011 22:11:43 -0400
Subject: Fixes #3845 added ie7 css view and tested all current hacks for ie7

---
 engine/lib/views.php                      |   1 +
 mod/embed/views/default/embed/css.php     |   2 +-
 views/default/css/elements/core.php       |   4 -
 views/default/css/elements/navigation.php |   4 +-
 views/default/css/ie.php                  | 119 +-----------------------------
 views/default/css/ie6.php                 |   8 +-
 views/default/css/ie7.php                 |  49 ++++++++++++
 views/default/page/elements/head.php      |   6 +-
 8 files changed, 61 insertions(+), 132 deletions(-)
 create mode 100644 views/default/css/ie7.php

(limited to 'views/default/css/elements')

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 9a236508f..3b9448c71 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1553,6 +1553,7 @@ function elgg_views_boot() {
 	elgg_register_simplecache_view('css/elgg');
 	elgg_register_simplecache_view('css/ie');
 	elgg_register_simplecache_view('css/ie6');
+	elgg_register_simplecache_view('css/ie7');
 	elgg_register_simplecache_view('js/elgg');
 
 	elgg_register_js('jquery', '/vendors/jquery/jquery-1.6.2.min.js', 'head');
diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 5750c05c0..03373da2b 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -8,7 +8,7 @@
 .embed-wrapper {
 	width: 730px;
 	min-height: 400px;
-	margin: 10px;
+	margin: 15px;
 }
 .embed-wrapper h2 {
 	color: #333333;
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index af4a1882a..627cae55c 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -98,8 +98,4 @@
 	position: relative;
 
 	display: inline-block;
-	
-	/* Inline-block: IE 6, 7 */
-	zoom: 1;
-	*display: inline;
 }
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 9386fa27b..bee1312ec 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -98,7 +98,7 @@
 .elgg-breadcrumbs > li {
 	display: inline-block;
 }
-.elgg-breadcrumbs > li:after{
+.elgg-breadcrumbs > li:after {
 	content: "\003E";
 	padding: 0 4px;
 	font-weight: normal;
@@ -412,7 +412,7 @@
 .elgg-menu-footer > li,
 .elgg-menu-footer > li > a {
 	display: inline-block;
-	color:#999;
+	color: #999;
 }
 
 .elgg-menu-footer > li:after {
diff --git a/views/default/css/ie.php b/views/default/css/ie.php
index c5edefd4c..d20bb4d59 100644
--- a/views/default/css/ie.php
+++ b/views/default/css/ie.php
@@ -1,121 +1,4 @@
 /**
- * CSS for Internet Explorer for versions > ie6
+ * CSS for IE8 and above
  */
 
-* {zoom: 1;} /* trigger hasLayout in IE */
-
-/* site menu drop-down for IE7 */
-.elgg-page-header {
-    z-index: 1;
-}
-
-.navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
-.navigation li a:hover ul li a {display:block;}
-.navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
-
-.clearfix { display: block; }
-.hidden.clearfix { display: none; }
-#elgg-page-contents {overflow: hidden;} /* remove horizontal scroll on riverdash */
-#breadcrumbs {top:-2px; margin-bottom: 5px;}
-
-/* entity list views */
-.entity-metadata {max-width: 300px;}
-.entity-edit {float:right;}
-.access_level {float:left;}
-.elgg-image-block .entity-metadata {
-	min-width:400px;
-	text-align: right;
-}
-
-/* profile */
-.elgg-tabs.profile .profile_name {margin-left: -260px;}
-#profile_content .river_comment_form.hidden .input-text { width:510px; }
-
-/* notifications */
-.friends-picker-navigation {margin:0;padding:0;}
-.friends-picker-container h3 {margin:0;padding:0;line-height: 1em;}
-
-/* private messages */
-#elgg-topbar-contents a.privatemessages.new span { 
-	display:block;
-	padding:1px;
-	position:relative;
-	text-align:center;
-	float:left;
-	top:-1px;
-	right:auto;
-}
-#elgg-topbar-contents a.privatemessages.new  {padding:0 0 0 20px;}
-#elgg-topbar-contents a.privatemessages:hover {background-position:left 2px;}
-#elgg-topbar-contents a.privatemessages.new:hover {background-position: left 2px;}
-
-/* riverdashboard mod rules */
-#riverdashboard_updates {clear:both;}
-#riverdashboard_updates a.update_link {margin:0 0 9px 0;}
-.riverdashboard_filtermenu {margin:10px 0 0 0;}
-.river_comment_form.hidden .input-text {
-	width:530px;
-	float:left;
-}
-.river_link_divider {
-	width:10px;
-	text-align: center;
-}
-
-/* shared access */
-.shared_access_collection h2.shared_access_name {margin-top:-15px;}
-
-/* dropdown login */
-*:first-child+html #login-dropdown #signin-button {
-	line-height:10px;
-}
-*:first-child+html #login-dropdown #signin-button a.signin span {
-	background-position:-150px -54px;
-}
-*:first-child+html #login-dropdown #signin-button a.signin.menu-open span {
-	background-position:-150px -74px;
-}
-
-/* Gallery */
-.elgg-gallery-fluid > li {
-	float: left;
-	margin: 2px;
-}
-
-
-/* navigation */
-.elgg-breadcrumbs > li {
-	display: inline;
-}
-
-.elgg-breadcrumbs > li > a {
-	display: inline;
-	padding-right: 4px;
-	margin-right: 4px;
-	border-right: 1px solid #bababa;
-}
-
-.elgg-menu-title > li {
-	display: block;
-}
-
-.elgg-menu-title > li > a {
-	display: block;
-}
-
-.elgg-menu-footer > li > a {
-	display: inline;
-}
-
-.elgg-menu-river > li {
-	display: inline;
-}
-
-li:hover > .elgg-menu-site-more {
-	display: none;
-}
-
-/* admin */
-.elgg-menu-footer li {
-	display: inline;
-}
\ No newline at end of file
diff --git a/views/default/css/ie6.php b/views/default/css/ie6.php
index f8ed208f6..cf49d33f2 100644
--- a/views/default/css/ie6.php
+++ b/views/default/css/ie6.php
@@ -1,15 +1,11 @@
 /**
- * elgg_layout css for Internet Explorer6
- * @uses $vars['wwwroot'] The site URL
-*/
+ * CSS for IE6
+ */
 
 * {zoom: 1;} /* trigger hasLayout in IE */
 
 /* main nav drop-down */
 #elgg-header {z-index:1;}
-.navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
-.navigation li a:hover ul li a {display:block;}
-.navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
 
 /* @todo check this one */
 .elgg-button-delete a { background-position-y: 2px; }
diff --git a/views/default/css/ie7.php b/views/default/css/ie7.php
new file mode 100644
index 000000000..91d23823f
--- /dev/null
+++ b/views/default/css/ie7.php
@@ -0,0 +1,49 @@
+/**
+ * CSS for IE7
+ */
+
+/* trigger hasLayout in IE */
+* {
+	zoom: 1;
+}
+
+/* site menu drop-down z-index fix for IE7 */
+.elgg-page-header {
+    z-index: 1;
+}
+
+/* inline-block fixes */
+.elgg-gallery > li,
+.elgg-button,
+.elgg-icon,
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a,
+.elgg-menu-hz > li > span,
+.elgg-breadcrumbs > li,
+.elgg-menu-footer > li > a,
+.elgg-menu-footer li {
+	display: inline;
+}
+
+/* IE7 does not support :after */
+.elgg-breadcrumbs > li > a {
+	display: inline;
+	padding-right: 4px;
+	margin-right: 4px;
+	border-right: 1px solid #bababa;
+}
+.elgg-menu-footer li,
+.elgg-menu-user li {
+	padding-left: 4px;
+	padding-right: 4px;
+}
+
+/* longtext menu would not display horizontally without this */
+.elgg-menu-longtext {
+	width: 100%;
+}
+.elgg-menu-longtext li {
+	width: 100px;
+	float: right;
+}
diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php
index 8776f07a7..e968e95ce 100644
--- a/views/default/page/elements/head.php
+++ b/views/default/page/elements/head.php
@@ -48,11 +48,15 @@ $release = get_version(true);
 
 <?php
 	$ie_url = elgg_get_simplecache_url('css', 'ie');
+	$ie7_url = elgg_get_simplecache_url('css', 'ie7');
 	$ie6_url = elgg_get_simplecache_url('css', 'ie6');
 ?>
-	<!--[if gt IE 6]>
+	<!--[if gt IE 7]>
 		<link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
 	<![endif]-->
+	<!--[if IE 7]>
+		<link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" />
+	<![endif]-->
 	<!--[if IE 6]>
 		<link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
 	<![endif]-->
-- 
cgit v1.2.3


From 83221c9eb9dcf37d5287180e7f7d9469036aaac6 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 24 Sep 2011 22:29:22 -0400
Subject: Fixes #3653 shrink wrapping .elgg-avatar so that hover menu arrow is
 constrained to the avatar image

---
 views/default/css/admin.php          | 1 +
 views/default/css/elements/icons.php | 1 +
 views/default/css/ie.php             | 4 ++++
 views/default/css/ie7.php            | 4 ++++
 4 files changed, 10 insertions(+)

(limited to 'views/default/css/elements')

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index e9e489fcb..c032ee3fc 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -1065,6 +1065,7 @@ a.elgg-widget-collapsed:before {
 *************************************** */
 .elgg-avatar {
 	position: relative;
+	display: inline-block;
 }
 .elgg-avatar > a > img {
 	display: block;
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index ee166b5be..f7c789e33 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -297,6 +297,7 @@
 *************************************** */
 .elgg-avatar {
 	position: relative;
+	display: inline-block;
 }
 .elgg-avatar > a > img {
 	display: block;
diff --git a/views/default/css/ie.php b/views/default/css/ie.php
index d20bb4d59..4bddd4d55 100644
--- a/views/default/css/ie.php
+++ b/views/default/css/ie.php
@@ -2,3 +2,7 @@
  * CSS for IE8 and above
  */
 
+/* ie8 does not like shrink wrapping this div with inline-block */
+.elgg-avatar {
+	display: block;
+}
diff --git a/views/default/css/ie7.php b/views/default/css/ie7.php
index 91d23823f..56047b954 100644
--- a/views/default/css/ie7.php
+++ b/views/default/css/ie7.php
@@ -47,3 +47,7 @@
 	width: 100px;
 	float: right;
 }
+
+.elgg-avatar {
+	display: inline;
+}
\ No newline at end of file
-- 
cgit v1.2.3