1 files changed, 381 insertions, 150 deletions

diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 52e8bd1d4..6b29e4c19 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -16,14 +16,17 @@
 	text-align: center;
 }
 .elgg-pagination li {
-	display: inline;
+	display: inline-block;
 	margin: 0 6px 0 0;
 	text-align: center;
 }
 .elgg-pagination a, .elgg-pagination span {
-	padding: 2px 6px;
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
+	border-radius: 4px;
+
+	display: block;
+	padding: 2px 6px;
 	color: #4690d6;
 	border: 1px solid #4690d6;
 	font-size: 12px;
@@ -33,61 +36,57 @@
 	color: white;
 	text-decoration: none;
 }
-.elgg-pagination .inactive {
+.elgg-pagination .elgg-state-disabled span {
 	color: #CCCCCC;
 	border-color: #CCCCCC;
 }
-.elgg-pagination .active {
+.elgg-pagination .elgg-state-selected span {
 	color: #555555;
 	border-color: #555555;
 }
+
 /* ***************************************
 	TABS
 *************************************** */
 .elgg-tabs {
-	margin-bottom:5px;
-	padding: 0;
+	margin-bottom: 5px;
 	border-bottom: 2px solid #cccccc;
-	display:table;
-	width:100%;
-}
-.elgg-tabs ul {
-	list-style: none;
-	padding: 0;
-	margin: 0;
+	display: table;
+	width: 100%;
 }
 .elgg-tabs li {
 	float: left;
-	border: 2px solid #cccccc;
-	border-bottom-width: 0;
-	background: #eeeeee;
+	border: 2px solid #ccc;
+	border-bottom: 0;
+	background: #eee;
 	margin: 0 0 0 10px;
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	-webkit-border-top-left-radius:5px;
-	-webkit-border-top-right-radius:5px;
+	
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
 }
 .elgg-tabs a {
 	text-decoration: none;
 	display: block;
-	padding:3px 10px 0 10px;
+	padding: 3px 10px 0 10px;
 	text-align: center;
-	height:21px;
-	color:#999999;
+	height: 21px;
+	color: #999;
 }
 .elgg-tabs a:hover {
 	background: #dedede;
-	color:#4690D6;
+	color: #4690D6;
 }
-.elgg-tabs .selected {
-	border-color: #cccccc;
+.elgg-tabs .elgg-state-selected {
+	border-color: #ccc;
 	background: white;
 }
-.elgg-tabs .selected a {
+.elgg-tabs .elgg-state-selected a {
 	position: relative;
 	top: 2px;
 	background: white;
 }
+
 /* ***************************************
 	BREADCRUMBS
 *************************************** */
@@ -97,233 +96,465 @@
 	line-height: 1.2em;
 	color: #bababa;
 }
-.elgg-breadcrumbs li {
-	display: inline;
+.elgg-breadcrumbs > li {
+	display: inline-block;
 }
-.elgg-breadcrumbs li:after{
+.elgg-breadcrumbs > li:after {
 	content: "\003E";
-	display: inline-block;
-	padding: 0 4px 0 4px;
+	padding: 0 4px;
 	font-weight: normal;
 }
-.elgg-breadcrumbs li:last-child:after {
-	content: "";
-}
-.elgg-breadcrumbs a {
-	color: #999999;
+.elgg-breadcrumbs > li > a {
+	display: inline-block;
+	color: #999;
 }
-.elgg-breadcrumbs a:hover {
+.elgg-breadcrumbs > li > a:hover {
 	color: #0054a7;
 	text-decoration: underline;
 }
+
 .elgg-main .elgg-breadcrumbs {
 	position: relative;
-	top:-6px;
-	left:0;
+	top: -6px;
+	left: 0;
+}
+
+/* ***************************************
+	TOPBAR MENU
+*************************************** */
+.elgg-menu-topbar {
+	float: left;
+}
+
+.elgg-menu-topbar > li {
+	float: left;
+}
+
+.elgg-menu-topbar > li > a {
+	padding-top: 2px;
+	color: #eee;
+	margin: 1px 15px 0;
 }
+
+.elgg-menu-topbar > li > a:hover {
+	color: #4690D6;
+	text-decoration: none;
+}
+
+.elgg-menu-topbar-alt {
+	float: right;
+}
+
+.elgg-menu-topbar .elgg-icon {
+	vertical-align: middle;
+	margin-top: -1px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-logo {
+	margin-top: 0;
+	padding-left: 5px;
+	width: 38px;
+	height: 20px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-avatar {
+	width: 18px;
+	height: 18px;
+}
+
 /* ***************************************
 	SITE MENU
 *************************************** */
-.elgg-site-menu {
+.elgg-menu-site {
+	z-index: 1;
+}
+
+.elgg-menu-site > li > a {
+	font-weight: bold;
+	padding: 3px 13px 0px 13px;
+	height: 20px;
+}
+
+.elgg-menu-site > li > a:hover {
+	text-decoration: none;
+}
+
+.elgg-menu-site-default {
 	position: absolute;
-	height: 23px;
 	bottom: 0;
 	left: 0;
-	width: auto;
-	z-index: 7000;
-}
-.elgg-site-menu li {
-	display: block;
-	float: left;
 	height: 23px;
 }
-.elgg-site-menu > li {
+
+.elgg-menu-site-default > li {
+	float: left;
 	margin-right: 1px;
 }
-.elgg-site-menu a {
+
+.elgg-menu-site-default > li > a {
 	color: white;
-	font-weight: bold;
-	padding: 3px 13px 0px 13px;
-	height: 20px;
-	display: block;
 }
-.elgg-site-menu a:hover {
-	text-decoration: none;
+
+.elgg-menu-site > li > ul {
+	display: none;
+	background-color: white;
+}
+
+.elgg-menu-site > li:hover > ul {
+	display: block;
 }
-.elgg-site-menu li.selected a,
-.elgg-site-menu li a:hover,
-.elgg-site-menu .elgg-more:hover a {
+
+.elgg-menu-site-default > .elgg-state-selected > a,
+.elgg-menu-site-default > li:hover > a {
 	background: white;
-	color: #555555;
+	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);
-	-moz-border-radius-topleft: 4px;
-	-moz-border-radius-topright: 4px;
-	-webkit-border-top-left-radius: 4px;
-	-webkit-border-top-right-radius: 4px;
-}
-.elgg-site-menu .elgg-more {
-	overflow: hidden;
-}
-.elgg-site-menu .elgg-more:hover {
-	overflow: visible;
-}
-.elgg-site-menu .elgg-more:hover span {
-	background-position: -146px -76px;
+	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-site-menu .elgg-more ul {
-	z-index: 7000;
+
+.elgg-menu-site-more {
+	position: relative;
+	left: -1px;
+	width: 100%;
 	min-width: 150px;
-	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: 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);
 }
-.elgg-site-menu .elgg-more ul li {
-	float: none;
-}
-.elgg-site-menu .elgg-more:hover ul li a {
-	background: white;
-	color: #555555;
+
+.elgg-menu-site-more > li > a {
+	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-site-menu .elgg-more ul li a:hover {
+
+.elgg-menu-site-more > li > a:hover {
 	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;
+
+.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;
+}
+
+.elgg-more > a:before {
+	content: "\25BC";
+	font-size: smaller;
+	margin-right: 4px;
+}
+
+/* ***************************************
+	TITLE
+*************************************** */
+.elgg-menu-title {
+	float: right;
+}
+
+.elgg-menu-title > li {
+	display: inline-block;
+	margin-left: 4px;
+}
+
+/* ***************************************
+	FILTER MENU
+*************************************** */
+.elgg-menu-filter {
+	margin-bottom: 5px;
+	border-bottom: 2px solid #ccc;
+	display: table;
+	width: 100%;
+}
+.elgg-menu-filter > li {
+	float: left;
+	border: 2px solid #ccc;
+	border-bottom: 0;
+	background: #eee;
+	margin: 0 0 0 10px;
+	
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
+}
+.elgg-menu-filter > li:hover {
+	background: #dedede;
+}
+.elgg-menu-filter > li > a {
+	text-decoration: none;
+	display: block;
+	padding: 3px 10px 0;
+	text-align: center;
+	height: 21px;
+	color: #999;
+}
+.elgg-menu-filter > li > a:hover {
+	background: #dedede;
+	color: #4690D6;
+}
+.elgg-menu-filter > .elgg-state-selected {
+	border-color: #ccc;
+	background: white;
+}
+.elgg-menu-filter > .elgg-state-selected > a {
+	position: relative;
+	top: 2px;
+	background: white;
 }
 
 /* ***************************************
 	PAGE MENU
 *************************************** */
-.elgg-page-menu a {
+.elgg-menu-page {
+	margin-bottom: 15px;
+}
+
+.elgg-menu-page a {
 	display: block;
+	
 	-webkit-border-radius: 8px;
 	-moz-border-radius: 8px;
+	border-radius: 8px;
+	
 	background-color: white;
-	margin: 0 0 3px 0;
+	margin: 0 0 3px;
 	padding: 2px 4px 2px 8px;
 }
-.elgg-page-menu a:hover {
+.elgg-menu-page a:hover {
 	background-color: #0054A7;
 	color: white;
 	text-decoration: none;
 }
-.elgg-page-menu li.selected > a {
+.elgg-menu-page li.elgg-state-selected > a {
 	background-color: #4690D6;
 	color: white;
 }
-.elgg-page-menu .elgg-child-menu {
+.elgg-menu-page .elgg-child-menu {
 	display: none;
 	margin-left: 15px;
 }
-.elgg-menu-closed:before, .elgg-menu-opened:before {
+.elgg-menu-page .elgg-menu-closed:before, .elgg-menu-opened:before {
 	display: inline-block;
 	padding-right: 4px;
 }
-.elgg-menu-closed:before {
+.elgg-menu-page .elgg-menu-closed:before {
 	content: "\002B";
 }
-.elgg-menu-opened:before {
+.elgg-menu-page .elgg-menu-opened:before {
 	content: "\002D";
 }
+
 /* ***************************************
 	HOVER MENU
 *************************************** */
-.elgg-hover-menu {
+.elgg-menu-hover {
 	display: none;
 	position: absolute;
+	z-index: 10000;
 
-	width: 165px;
-	border-top: solid 1px #E5E5E5;
-	border-left: solid 1px #E5E5E5;
-	border-right: solid 1px #999999;
-	border-bottom: solid 1px #999999;
-	background-color: #FFFFFF;
+	overflow: hidden;
+
+	min-width: 165px;
+	max-width: 250px;
+	border: solid 1px;
+	border-color: #E5E5E5 #999 #999 #E5E5E5;
+	background-color: #FFF;
+	
 	-webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
 	-moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
+	box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
 }
-.elgg-hover-menu > li {
-	border-bottom: 1px solid #dddddd;
+.elgg-menu-hover > li {
+	border-bottom: 1px solid #ddd;
 }
-.elgg-hover-menu > li:last-child {
+.elgg-menu-hover > li:last-child {
 	border-bottom: none;
 }
-.elgg-hover-menu a {
+.elgg-menu-hover .elgg-heading-basic {
 	display: block;
+}
+.elgg-menu-hover a {
 	padding: 2px 8px;
 	font-size: 92%;
 }
-.elgg-hover-menu a:hover {
-	background: #cccccc;
+.elgg-menu-hover a:hover {
+	background: #ccc;
 	text-decoration: none;
 }
-.elgg-hover-admin a {
+.elgg-menu-hover-admin a {
 	color: red;
 }
-.elgg-hover-admin a:hover {
+.elgg-menu-hover-admin a:hover {
 	color: white;
 	background-color: red;
 }
-.avatar_menu_button {
-	width:15px;
-	height:15px;
-	position:absolute;
-	cursor:pointer;
-	display:none;
-	right:0;
-	bottom:0;
+
+/* ***************************************
+	SITE FOOTER
+*************************************** */
+.elgg-menu-footer > li,
+.elgg-menu-footer > li > a {
+	display: inline-block;
+	color: #999;
+}
+
+.elgg-menu-footer > li:after {
+	content: "\007C";
+	padding: 0 4px;
+}
+
+.elgg-menu-footer-default {
+	float: right;
 }
-.avatar_menu_arrow {
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px top;
-	width:15px;
-	height:15px;
+
+.elgg-menu-footer-alt {
+	float: left;
 }
-.avatar_menu_arrow_on {
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px -16px;
-	width:15px;
-	height:15px;
+
+/* ***************************************
+	GENERAL MENU
+*************************************** */
+.elgg-menu-general > li,
+.elgg-menu-general > li > a {
+	display: inline-block;
+	color: #999;
 }
-.avatar_menu_arrow_hover {
-	background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -150px -32px;
-	width:15px;
-	height:15px;
+
+.elgg-menu-general > li:after {
+	content: "\007C";
+	padding: 0 4px;
+}
+
+/* ***************************************
+	ENTITY AND ANNOTATION
+*************************************** */
+<?php // height depends on line height/font size ?>
+.elgg-menu-entity, .elgg-menu-annotation {
+	float: right;
+	margin-left: 15px;
+	font-size: 90%;
+	color: #aaa;
+	line-height: 16px;
+	height: 16px;
+}
+.elgg-menu-entity > li, .elgg-menu-annotation > li {
+	margin-left: 15px;
+}
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+	color: #aaa;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+	display: block;
+}
+.elgg-menu-entity > li > span, .elgg-menu-annotation > li > span {
+	vertical-align: baseline;
 }
 
 /* ***************************************
 	OWNER BLOCK
 *************************************** */
-.elgg-owner-block-menu li {
-	float: left;
-	width: 50%;
+.elgg-menu-owner-block li a {
+	display: block;
+	
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	
+	background-color: white;
+	margin: 3px 0 5px 0;
+	padding: 2px 4px 2px 8px;
+}
+.elgg-menu-owner-block li a:hover {
+	background-color: #0054A7;
+	color: white;
+	text-decoration: none;
+}
+.elgg-menu-owner-block li.elgg-state-selected > a {
+	background-color: #4690D6;
+	color: white;
+}
+
+/* ***************************************
+	LONGTEXT
+*************************************** */
+.elgg-menu-longtext {
+	float: right;
+}
+
+/* ***************************************
+	RIVER
+*************************************** */
+.elgg-menu-river {
+	float: right;
+	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;
 }
+
 /* ***************************************
-	FOOTER
+	SIDEBAR EXTRAS (rss, bookmark, etc)
 *************************************** */
-.elgg-footer-menu li {
-	float: left;
+.elgg-menu-extras {
+	margin-bottom: 15px;
 }
-.elgg-footer-menu li:after{
-	content: "\007C";
+
+/* ***************************************
+	WIDGET MENU
+*************************************** */
+.elgg-menu-widget > li {
+	position: absolute;
+	top: 4px;
 	display: inline-block;
-	padding: 0 4px 0 4px;
-	font-weight: normal;
+	width: 18px;
+	height: 18px;
+	padding: 2px 2px 0 0;
+}
+
+.elgg-menu-widget > .elgg-menu-item-collapse {
+	left: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-delete {
+	right: 5px;
 }
-.elgg-footer-menu li:last-child:after {
-	content: "";
+.elgg-menu-widget > .elgg-menu-item-settings {
+	right: 25px;
 }