14 files changed, 717 insertions, 277 deletions

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 90d151bc6..c435621b2 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -25,7 +25,6 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 	margin: 0;
 	padding: 0;
 	border: 0;
-	outline: 0;
 	font-weight: inherit;
 	font-style: inherit;
 	font-size: 100%;
@@ -41,9 +40,6 @@ img {
 	border-width: 0;
 	border-color: transparent;
 }
-:focus {
-	outline: 0 none;
-}
 ol, ul {
 	list-style: none;
 }
@@ -106,7 +102,14 @@ a:hover {
 	text-decoration: underline;
 }
 pre, code {
-	background: #EBF5FF;
+	background-color: #EEE;
+	border: 1px solid #DDD;
+	color: #444;
+	font-family: Monaco, "Courier New", Courier, monospace;
+	font-size: 13px;
+	overflow: auto;
+	margin: 15px 0;
+	padding: 5px;
 }
 blockquote {
 	background: #EBF5FF;
@@ -120,14 +123,23 @@ p {
 }
 
 /* Clearfix! */
+.clearfix:after,
 .elgg-grid:after,
-.clearfix:after {
+.elgg-layout:after,
+.elgg-inner:after,
+.elgg-page-header:after,
+.elgg-page-footer:after,
+.elgg-head:after,
+.elgg-foot:after,
+.elgg-col:after,
+.elgg-image-block:after {
 	content: ".";
 	display: block;
 	height: 0;
 	clear: both;
 	visibility: hidden;
 }
+
 .elgg-body {
 	width: auto;
 	word-wrap: break-word;
@@ -138,27 +150,10 @@ p {
 	visibility: hidden;
 	height: 0 !important;
 	line-height: 0;
+	overflow: hidden;
 	font-size: xx-large;
 	content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
 }
-.hidden {
-	display: none;
-}
-.centered {
-	margin: 0 auto;
-}
-.center {
-	text-align: center;
-}
-.float {
-	float: left;
-}
-.float-alt {
-	float: right;
-}
-.elgg-toggle {
-	cursor: pointer;
-}
 
 /* ***************************************
 	PAGE WRAPPER
@@ -264,8 +259,13 @@ p {
 	-moz-border-radius: 4px;
 	border-radius: 4px;
 }
-.elgg-admin-notices a {
+.elgg-admin-notices a.elgg-admin-notice {
 	float: right;
+	text-decoration: none;
+}
+
+.elgg-admin-notices a {
+	text-decoration: underline;
 }
 
 /* ***************************************
@@ -292,14 +292,6 @@ p {
 .elgg-main h2 {
 	color: #333333;
 }
-<?php // elgg-layout gets clearfix ?>
-.elgg-layout:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
 
 /* ***************************************
 	FOOTER
@@ -333,6 +325,9 @@ p {
 .elgg-module-main > .elgg-head {
 	margin-bottom: 5px;
 }
+.elgg-module-info > .elgg-head {
+	margin-bottom: 10px;
+}
 .elgg-module-inline {
 	margin: 20px 0;
 }
@@ -360,6 +355,8 @@ p {
 .elgg-table td, .elgg-table th {
 	background: white;
 	border: 1px solid #ccc;
+	padding: 4px 8px;
+	vertical-align: middle;
 }
 .elgg-table th {
 	background-color: #ddd;
@@ -367,10 +364,10 @@ p {
 .elgg-table .alt td {
 	background: #eee;
 }
-.elgg-table td {
-	padding: 4px 8px;
-	border-bottom: 1px solid #ccc;
+.elgg-table input[type=checkbox] {
+	margin-top: 3px;
 }
+
 .elgg-table-alt {
 	width: 100%;
 	border-top: 1px solid #ccc;
@@ -407,9 +404,17 @@ p {
 .elgg-item {
 	margin: 3px;
 }
-.elgg-simple-list li {
+.elgg-list-simple li {
 	margin-bottom: 5px;
 }
+.elgg-list-distinct {
+	border-top: 1px dotted #CCCCCC;
+	margin: 5px 0;
+	clear: both;
+}
+.elgg-list-distinct > li {
+	border-bottom: 1px dotted #CCCCCC;
+}
 
 /* ***************************************
 	FORMS AND INPUT
@@ -434,12 +439,15 @@ input {
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
+	margin: 0;
 }
+
 /* default elgg core input field classes */
 .elgg-input-text,
 .elgg-input-tags,
 .elgg-input-url,
-.elgg-input-plaintext {
+.elgg-input-plaintext,
+.elgg-input-longtext {
 	width: 98%;
 }
 textarea {
@@ -448,6 +456,9 @@ textarea {
 .elgg-input-thin {
 	width: 400px;
 }
+.elgg-input-natural {
+	width: auto;
+}
 
 .elgg-button {
 	font-size: 14px;
@@ -461,7 +472,6 @@ textarea {
 	width: auto;
 	padding: 2px 4px;
 	cursor: pointer;
-	outline: none;
 }
 a.elgg-button {
 	padding: 3px 6px;
@@ -501,6 +511,15 @@ a.elgg-button {
 	text-decoration: none;
 }
 
+.elgg-form-useradd input[type=text],
+.elgg-form-useradd input[type=password] {
+	width: 300px;
+}
+
+.elgg-form-settings {
+	max-width: 800px;
+}
+
 /* **************************************
      DATE PICKER
 *************************************** */
@@ -519,20 +538,20 @@ a.elgg-button {
 	-webkit-border-radius: 5px;
 }
 .ui-datepicker-prev, .ui-datepicker-next {
-    position: absolute;
-    top: 9px;
+	position: absolute;
+	top: 9px;
 	cursor: pointer;
 }
 .ui-datepicker-prev {
-    left: 6px;
+	left: 6px;
 }
 .ui-datepicker-next {
-    right: 6px;
+	right: 6px;
 }
 .ui-datepicker-title {
-    line-height: 1.8em;
-    margin: 0 30px;
-    text-align: center;
+	line-height: 1.8em;
+	margin: 0 30px;
+	text-align: center;
 	font-weight: bold;
 }
 .ui-datepicker-calendar {
@@ -540,39 +559,241 @@ a.elgg-button {
 }
 .ui-datepicker th {
 	border: none;
-    font-weight: bold;
-    padding: 5px 6px;
-    text-align: center;
+	font-weight: bold;
+	padding: 5px 6px;
+	text-align: center;
 }
 .ui-datepicker td {
 	padding: 1px;
 }
 .ui-datepicker td span, .ui-datepicker td a {
-    display: block;
-    padding: 2px;
+	display: block;
+	padding: 2px;
 	line-height: 1.2em;
-    text-align: right;
-    text-decoration: none;
+	text-align: right;
+	text-decoration: none;
 }
 .ui-datepicker-calendar .ui-state-default {
 	border: 1px solid #ccc;
-    color: #555;
+	color: #555;
 	background: #fafafa;
 }
 .ui-datepicker-calendar .ui-state-hover {
 	border: 1px solid #aaa;
-    color: #333;
+	color: #333;
 	background: #ccc;
 }
 .ui-datepicker-calendar .ui-state-active,
 .ui-datepicker-calendar .ui-state-active.ui-state-hover {
 	font-weight: bold;
-    border: 1px solid #999;
-    color: #333;
+	border: 1px solid #999;
+	color: #333;
 	background: #ddd;
 }
 
 /* ***************************************
+	AUTOCOMPLETE
+*************************************** */
+<?php //autocomplete will expand to fullscreen without max-width ?>
+.ui-autocomplete {
+	position: absolute;
+	cursor: default;
+}
+.elgg-autocomplete-item .elgg-body {
+	max-width: 600px;
+}
+.ui-autocomplete {
+	background-color: white;
+	border: 1px solid #ccc;
+	overflow: hidden;
+
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.ui-autocomplete .ui-menu-item {
+	padding: 0px 4px;
+
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.ui-autocomplete .ui-menu-item:hover {
+	background-color: #eee;
+}
+.ui-autocomplete a:hover {
+	text-decoration: none;
+	color: #4690D6;
+}
+.ui-autocomplete a.ui-state-hover {
+	background-color: #eee;
+	display: block;
+}
+
+/* ***************************************
+	USER PICKER
+*************************************** */
+.elgg-user-picker-list li:first-child {
+	border-top: 1px dotted #ccc;
+	margin-top: 5px;
+}
+.elgg-user-picker-list > li {
+	border-bottom: 1px dotted #ccc;
+}
+
+/* ***************************************
+	FRIENDS PICKER
+*************************************** */
+.friends-picker-main-wrapper {
+	margin-bottom: 15px;
+}
+.friends-picker-container h3 {
+	font-size:4em !important;
+	text-align: left;
+	margin:10px 0 20px !important;
+	color:#999 !important;
+	background: none !important;
+	padding:0 !important;
+}
+.friends-picker .friends-picker-container .panel ul {
+	text-align: left;
+	margin: 0;
+	padding:0;
+}
+.friends-picker-wrapper {
+	margin: 0;
+	padding:0;
+	position: relative;
+	width: 730px;
+}
+.friends-picker {
+	position: relative;
+	overflow: hidden;
+	margin: 0;
+	padding:0;
+	width: 730px;
+	height: auto;
+	background-color: #dedede;
+
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+}
+.friendspicker-savebuttons {
+	background: white;
+
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+
+	margin:0 10px 10px;
+}
+.friends-picker .friends-picker-container { /* long container used to house end-to-end panels. Width is calculated in JS  */
+	position: relative;
+	left: 0;
+	top: 0;
+	width: 100%;
+	list-style-type: none;
+}
+.friends-picker .friends-picker-container .panel {
+	float:left;
+	height: 100%;
+	position: relative;
+	width: 730px;
+	margin: 0;
+	padding:0;
+}
+.friends-picker .friends-picker-container .panel .wrapper {
+	margin: 0;
+	padding:4px 10px 10px 10px;
+	min-height: 230px;
+}
+.friends-picker-navigation {
+	margin: 0 0 10px;
+	padding:0 0 10px;
+	border-bottom:1px solid #ccc;
+}
+.friends-picker-navigation ul {
+	list-style: none;
+	padding-left: 0;
+}
+.friends-picker-navigation ul li {
+	float: left;
+	margin:0;
+	background:white;
+}
+.friends-picker-navigation a {
+	font-weight: bold;
+	text-align: center;
+	background: white;
+	color: #999;
+	text-decoration: none;
+	display: block;
+	padding: 0;
+	width:20px;
+
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.tabHasContent {
+	background: white;
+	color:#333 !important;
+}
+.friends-picker-navigation li a:hover {
+	background: #333;
+	color:white !important;
+}
+.friends-picker-navigation li a.current {
+	background: #4690D6;
+	color:white !important;
+}
+.friends-picker-navigation-l, .friends-picker-navigation-r {
+	position: absolute;
+	top: 46px;
+	text-indent: -9000em;
+}
+.friends-picker-navigation-l a, .friends-picker-navigation-r a {
+	display: block;
+	height: 40px;
+	width: 40px;
+}
+.friends-picker-navigation-l {
+	right: 48px;
+	z-index:1;
+}
+.friends-picker-navigation-r {
+	right: 0;
+	z-index:1;
+}
+.friends-picker-navigation-l {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left top;
+}
+.friends-picker-navigation-r {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px top;
+}
+.friends-picker-navigation-l:hover {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left -44px;
+}
+.friends-picker-navigation-r:hover {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px -44px;
+}
+.friendspicker-savebuttons .elgg-button-submit,
+.friendspicker-savebuttons .elgg-button-cancel {
+	margin:5px 20px 5px 5px;
+}
+.friendspicker-members-table {
+	background: #dedede;
+
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+
+	margin:10px 0 0;
+	padding:10px 10px 0;
+}
+
+/* ***************************************
 	PAGINATION
 *************************************** */
 .elgg-pagination {
@@ -723,6 +944,20 @@ a.elgg-button {
 }
 
 /* ***************************************
+	GENERAL MENU
+*************************************** */
+.elgg-menu-general > li,
+.elgg-menu-general > li > a {
+	display: inline-block;
+	color: #999;
+}
+
+.elgg-menu-general > li:after {
+	content: "\007C";
+	padding: 0 4px;
+}
+
+/* ***************************************
 	HOVER MENU
 *************************************** */
 .elgg-menu-hover {
@@ -769,7 +1004,7 @@ a.elgg-button {
 	ENTITY MENU
 *************************************** */
 <?php // height depends on line height/font size ?>
-.elgg-menu-entity, elgg-menu-annotation {
+.elgg-menu-entity, .elgg-menu-annotation {
 	float: right;
 	margin-left: 15px;
 	font-size: 90%;
@@ -792,6 +1027,27 @@ a.elgg-button {
 }
 
 /* ***************************************
+	WIDGET MENU
+*************************************** */
+.elgg-menu-widget > li {
+	position: absolute;
+	top: 4px;
+	display: inline-block;
+	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-menu-widget > .elgg-menu-item-settings {
+	right: 25px;
+}
+
+/* ***************************************
 	MORE MENUS
 *************************************** */
 /* Horizontal menus w/ separator support */
@@ -805,6 +1061,9 @@ a.elgg-button {
 .elgg-menu-hz .elgg-body:after {
 	content: '.';
 }
+.elgg-menu > li:last-child::after {
+	display: none;
+}
 .elgg-menu-admin-footer a {
 	color: #eee;
 }
@@ -887,22 +1146,16 @@ a.elgg-button {
 	height: 26px;
 	overflow: hidden;
 }
+.elgg-module-widget.elgg-state-draggable .elgg-widget-handle {
+	cursor: move;
+}
 .elgg-module-widget > .elgg-head h3 {
 	float: left;
 	padding: 4px 45px 0 20px;
 	color: #333;
 }
-.elgg-module-widget > .elgg-head a {
-	position: absolute;
-	top: 4px;
-	display: inline-block;
-	width: 18px;
-	height: 18px;
-	padding: 2px 2px 0 0;
-}
 
 .elgg-widget-collapse-button {
-	left: 5px;
 	color: #c5c5c5;
 	text-decoration: none;
 }
@@ -917,12 +1170,6 @@ a.elgg-widget-collapse-button:before {
 a.elgg-widget-collapsed:before {
 	content: "\25BA";
 }
-.elgg-widget-delete-button {
-	right: 5px;
-}
-.elgg-widget-edit-button {
-	right: 25px;
-}
 .elgg-module-widget > .elgg-body {
 	border-top: 1px solid #dedede;
 	background-color: white;
@@ -988,66 +1235,6 @@ a.elgg-widget-collapsed:before {
 }
 
 /* ***************************************
-	SPACING (from OOCSS)
-*************************************** */
-.pan{padding:0}
-.pas{padding:5px}
-.pam{padding:10px}
-.pal{padding:20px}
-.ptn{padding-top:0}
-.pts{padding-top:5px}
-.ptm{padding-top:10px}
-.ptl{padding-top:20px}
-.prn{padding-right:0}
-.prs{padding-right:5px}
-.prm{padding-right:10px}
-.prl{padding-right:20px}
-.pbn{padding-bottom:0}
-.pbs{padding-bottom:5px}
-.pbm{padding-bottom:10px}
-.pbl{padding-bottom:20px}
-.pln{padding-left:0}
-.pls{padding-left:5px}
-.plm{padding-left:10px}
-.pll{padding-left:20px}
-.phn{padding-left:0;padding-right:0}
-.phs{padding-left:5px;padding-right:5px}
-.phm{padding-left:10px;padding-right:10px}
-.phl{padding-left:20px;padding-right:20px}
-.pvn{padding-top:0;padding-bottom:0}
-.pvs{padding-top:5px;padding-bottom:5px}
-.pvm{padding-top:10px;padding-bottom:10px}
-.pvl{padding-top:20px;padding-bottom:20px}
-.man{margin:0}
-.mas{margin:5px}
-.mam{margin:10px}
-.mal{margin:20px}
-.mtn{margin-top:0}
-.mts{margin-top:5px}
-.mtm{margin-top:10px}
-.mtl{margin-top:20px}
-.mrn{margin-right:0}
-.mrs{margin-right:5px}
-.mrm{margin-right:10px}
-.mrl{margin-right:20px}
-.mbn{margin-bottom:0}
-.mbs{margin-bottom:5px}
-.mbm{margin-bottom:10px}
-.mbl{margin-bottom:20px}
-.mln{margin-left:0}
-.mls{margin-left:5px}
-.mlm{margin-left:10px}
-.mll{margin-left:20px}
-.mhn{margin-left:0;margin-right:0}
-.mhs{margin-left:5px;margin-right:5px}
-.mhm{margin-left:10px;margin-right:10px}
-.mhl{margin-left:20px;margin-right:20px}
-.mvn{margin-top:0;margin-bottom:0}
-.mvs{margin-top:5px;margin-bottom:5px}
-.mvm{margin-top:10px;margin-bottom:10px}
-.mvl{margin-top:20px;margin-bottom:20px}
-
-/* ***************************************
 	ICONS
 *************************************** */
 .elgg-icon {
@@ -1056,6 +1243,10 @@ a.elgg-widget-collapsed:before {
 	height: 16px;
 	display: inline-block;
 	margin: 0 2px;
+	vertical-align: text-bottom;
+}
+.elgg-module .elgg-head .elgg-icon {
+	vertical-align: baseline;
 }
 .elgg-icon-delete:hover,
 .elgg-icon-delete-alt:hover {
@@ -1278,6 +1469,14 @@ a.elgg-widget-collapsed:before {
 	padding: 5px 10px;
 	margin: 4px 0;
 }
+ul.elgg-plugin-categories, ul.elgg-plugin-categories > li,
+ul.elgg-plugin-resources, ul.elgg-plugin-resources > li {
+	display: inline;
+}
+.elgg-plugin-category-bundled {
+	border-width: 2px;
+	border-color: #0054A7;
+}
 
 /****************************************
 	MARKDOWN
@@ -1321,6 +1520,12 @@ a.elgg-widget-collapsed:before {
 	margin-bottom: 5px;
 }
 
+.elgg-text-help {
+	display: block;
+	font-size: 85%;
+	font-style: italic;
+}
+
 .elgg-longtext-control {
 	margin-left: 14px;
 	font-size: 80%;
@@ -1337,3 +1542,136 @@ table.mceLayout {
 .elgg-output dd {
 	margin: 0 0 1em 2em;
 }
+
+/* ***************************************
+    SITE SECRET
+*************************************** */
+.elgg-form-admin-site-regenerate-secret table {
+	width: 60%;
+	margin: 1em auto;
+}
+td.elgg-strength-strong,
+td.elgg-strength-strong h4 {
+	background: #DFF0D8; color: #468847;
+}
+td.elgg-strength-moderate,
+td.elgg-strength-moderate h4 {
+	background: #FCF8E3; color: #C09853;
+}
+td.elgg-strength-weak,
+td.elgg-strength-weak h4 {
+	background: #F2DEDE; color: #B94A48;
+}
+
+/* ***************************************
+	HELPERS
+*************************************** */
+.hidden {
+	display: none;
+}
+.centered {
+	margin: 0 auto;
+}
+.center {
+	text-align: center;
+}
+.float {
+	float: left;
+}
+.float-alt {
+	float: right;
+}
+.elgg-toggle {
+	cursor: pointer;
+}
+.elgg-discover .elgg-discoverable {
+	display: none;
+}
+.elgg-discover:hover .elgg-discoverable {
+	display: block;
+}
+.elgg-transition:hover {
+	opacity: .7;
+}
+
+/* ***************************************
+	BORDERS AND SEPARATORS
+*************************************** */
+.elgg-border-plain {
+	border: 1px solid #eeeeee;
+}
+.elgg-border-transition {
+	border: 1px solid #eeeeee;
+}
+.elgg-divide-top {
+	border-top: 1px solid #CCCCCC;
+}
+.elgg-divide-bottom {
+	border-bottom: 1px solid #CCCCCC;
+}
+.elgg-divide-left {
+	border-left: 1px solid #CCCCCC;
+}
+.elgg-divide-right {
+	border-right: 1px solid #CCCCCC;
+}
+
+/* ***************************************
+	SPACING (from OOCSS)
+*************************************** */
+.pan{padding:0}
+.pas{padding:5px}
+.pam{padding:10px}
+.pal{padding:20px}
+.ptn{padding-top:0}
+.pts{padding-top:5px}
+.ptm{padding-top:10px}
+.ptl{padding-top:20px}
+.prn{padding-right:0}
+.prs{padding-right:5px}
+.prm{padding-right:10px}
+.prl{padding-right:20px}
+.pbn{padding-bottom:0}
+.pbs{padding-bottom:5px}
+.pbm{padding-bottom:10px}
+.pbl{padding-bottom:20px}
+.pln{padding-left:0}
+.pls{padding-left:5px}
+.plm{padding-left:10px}
+.pll{padding-left:20px}
+.phn{padding-left:0;padding-right:0}
+.phs{padding-left:5px;padding-right:5px}
+.phm{padding-left:10px;padding-right:10px}
+.phl{padding-left:20px;padding-right:20px}
+.pvn{padding-top:0;padding-bottom:0}
+.pvs{padding-top:5px;padding-bottom:5px}
+.pvm{padding-top:10px;padding-bottom:10px}
+.pvl{padding-top:20px;padding-bottom:20px}
+.man{margin:0}
+.mas{margin:5px}
+.mam{margin:10px}
+.mal{margin:20px}
+.mtn{margin-top:0}
+.mts{margin-top:5px}
+.mtm{margin-top:10px}
+.mtl{margin-top:20px}
+.mrn{margin-right:0}
+.mrs{margin-right:5px}
+.mrm{margin-right:10px}
+.mrl{margin-right:20px}
+.mbn{margin-bottom:0}
+.mbs{margin-bottom:5px}
+.mbm{margin-bottom:10px}
+.mbl{margin-bottom:20px}
+.mln{margin-left:0}
+.mls{margin-left:5px}
+.mlm{margin-left:10px}
+.mll{margin-left:20px}
+.mhn{margin-left:0;margin-right:0}
+.mhs{margin-left:5px;margin-right:5px}
+.mhm{margin-left:10px;margin-right:10px}
+.mhl{margin-left:20px;margin-right:20px}
+.mvn{margin-top:0;margin-bottom:0}
+.mvs{margin-top:5px;margin-bottom:5px}
+.mvm{margin-top:10px;margin-bottom:10px}
+.mvl{margin-top:20px;margin-bottom:20px}
diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index f675ab7cb..7fe535d57 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -7,17 +7,6 @@
  * @package Elgg.Core
  * @subpackage UI
  */
-/**
- * elgg-body fills the space available to it.
- * It uses hidden text to expand itself. The combination of auto width, overflow
- * hidden, and the hidden text creates this effect.
- *
- * This allows us to float fixed width divs to either side of an .elgg-body div
- * without having to specify the body div's width.
- *
- * @todo check what happens with long <pre> tags or large images
- * @todo Move this to its own file -- it is very complicated and should not have to be overridden.
- */
 ?>
 
 /* ***************************************
@@ -96,7 +85,11 @@
 	width: 100%;
 	border-top: 1px solid #ccc;
 }
-.elgg-table-alt td {
+.elgg-table-alt th {
+	background-color: #eee;
+	font-weight: bold;
+}
+.elgg-table-alt td, .elgg-table-alt th {
 	padding: 2px 4px 2px 4px;
 	border-bottom: 1px solid #ccc;
 }
@@ -276,17 +269,16 @@
 	Tags
 *************************************** */
 .elgg-tags {
-	display: inline;
 	font-size: 85%;
 }
-.elgg-tags li {
-	display: inline;
+.elgg-tags > li {
+	float:left;
 	margin-right: 5px;
 }
-.elgg-tags li:after {
+.elgg-tags li.elgg-tag:after {
 	content: ",";
 }
-.elgg-tags li:last-child:after {
+.elgg-tags li.elgg-tag:last-child:after {
 	content: "";
 }
 .elgg-tagcloud {
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index 627cae55c..74f21ee59 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -46,13 +46,28 @@
 	*overflow:visible;
 }
 
-<?php //@todo isn't this only needed if we use display:table-cell? ?>
+<?php
+/**
+ * elgg-body fills the space available to it.
+ * It uses hidden text to expand itself. The combination of auto width, overflow
+ * hidden, and the hidden text creates this effect.
+ *
+ * This allows us to float fixed width divs to either side of an .elgg-body div
+ * without having to specify the body div's width.
+ *
+ * @todo check what happens with long <pre> tags or large images
+ * @todo Move this to its own file -- it is very complicated and should not have to be overridden.
+ */
+
+//@todo isn't this only needed if we use display:table-cell?
+?>
 .elgg-body:after,
 .elgg-col-last:after {
 	display: block;
 	visibility: hidden;
 	height: 0 !important;
 	line-height: 0;
+	overflow: hidden;
 	
 	/* Stretch to fill up available space */
 	font-size: xx-large;
@@ -68,8 +83,9 @@
 /* Enabled nesting of dropdown/flyout menus */
 .elgg-menu > li { position: relative; }
 
-/* Separators should only come between list items */
-.elgg-menu > li:last-child:after { display: none } 
+.elgg-menu > li:last-child::after {
+	display: none;
+}
 
 /* Maximize click target */
 .elgg-menu > li > a { display: block }
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 83ec2f602..068cc8fd6 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -41,7 +41,7 @@ input, textarea {
 	box-sizing: border-box;
 }
 
-input:focus, textarea:focus {
+input[type=text]:focus, textarea:focus {
 	border: solid 1px #4690d6;
 	background: #e4ecf5;
 	color:#333;
@@ -69,17 +69,17 @@ input[type="radio"] {
 	margin:0 3px 0 0;
 	padding:0;
 	border:none;
+	border-radius:0;
 	width:auto;
 }
 .elgg-input-checkboxes.elgg-horizontal li,
-.elgg-input-radio.elgg-horizontal li {
+.elgg-input-radios.elgg-horizontal li {
 	display: inline;
 	padding-right: 10px;
 }
 
-.elgg-form-account input[type="text"],
-.elgg-form-account input[type="password"] {
-	width: 300px;
+.elgg-form-login, .elgg-form-account {
+	max-width: 450px;
 }
 
 /* ***************************************
@@ -105,7 +105,7 @@ input[type="radio"] {
 	margin: 0;
 	padding:0;
 	position: relative;
-	width: 100%;
+	width: 730px;
 }
 .friends-picker {
 	position: relative;
@@ -235,19 +235,55 @@ input[type="radio"] {
 }
 
 /* ***************************************
-	USER PICKER
+	AUTOCOMPLETE
 *************************************** */
+<?php //autocomplete will expand to fullscreen without max-width ?>
+.ui-autocomplete {
+	position: absolute;
+	cursor: default;
+}
+.elgg-autocomplete-item .elgg-body {
+	max-width: 600px;
+}
+.ui-autocomplete {
+	background-color: white;
+	border: 1px solid #ccc;
+	overflow: hidden;
 
-.user-picker .user-picker-entry {
-	clear:both;
-	height:25px;
-	padding:5px;
-	margin-top:5px;
-	border-bottom:1px solid #cccccc;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
 }
-.user-picker-entry .elgg-button-delete {
-	margin-right:10px;
+.ui-autocomplete .ui-menu-item {
+	padding: 0px 4px;
+	
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.ui-autocomplete .ui-menu-item:hover {
+	background-color: #eee;
+}
+.ui-autocomplete a:hover {
+	text-decoration: none;
+	color: #4690D6;
 }
+.ui-autocomplete a.ui-state-hover {
+	background-color: #eee;
+	display: block;
+}
+
+/* ***************************************
+	USER PICKER
+*************************************** */
+.elgg-user-picker-list li:first-child {
+	border-top: 1px dotted #ccc;
+	margin-top: 5px;
+}
+.elgg-user-picker-list > li {
+	border-bottom: 1px dotted #ccc;
+}
+
 /* ***************************************
       DATE PICKER
 **************************************** */
@@ -284,20 +320,20 @@ input[type="radio"] {
 	color: white;
 }
 .ui-datepicker-prev, .ui-datepicker-next {
-    position: absolute;
-    top: 5px;
+	position: absolute;
+	top: 5px;
 	cursor: pointer;
 }
 .ui-datepicker-prev {
-    left: 6px;
+	left: 6px;
 }
 .ui-datepicker-next {
-    right: 6px;
+	right: 6px;
 }
 .ui-datepicker-title {
-    line-height: 1.8em;
-    margin: 0 30px;
-    text-align: center;
+	line-height: 1.8em;
+	margin: 0 30px;
+	text-align: center;
 	font-weight: bold;
 }
 .ui-datepicker-calendar {
@@ -306,34 +342,34 @@ input[type="radio"] {
 .ui-datepicker th {
 	color: #0054A7;
 	border: none;
-    font-weight: bold;
-    padding: 5px 6px;
-    text-align: center;
+	font-weight: bold;
+	padding: 5px 6px;
+	text-align: center;
 }
 .ui-datepicker td {
 	padding: 1px;
 }
 .ui-datepicker td span, .ui-datepicker td a {
-    display: block;
-    padding: 2px;
+	display: block;
+	padding: 2px;
 	line-height: 1.2em;
-    text-align: right;
-    text-decoration: none;
+	text-align: right;
+	text-decoration: none;
 }
 .ui-datepicker-calendar .ui-state-default {
 	border: 1px solid #ccc;
-    color: #4690D6;;
+	color: #4690D6;;
 	background: #fafafa;
 }
 .ui-datepicker-calendar .ui-state-hover {
 	border: 1px solid #aaa;
-    color: #0054A7;
+	color: #0054A7;
 	background: #eee;
 }
 .ui-datepicker-calendar .ui-state-active,
 .ui-datepicker-calendar .ui-state-active.ui-state-hover {
 	font-weight: bold;
-    border: 1px solid #0054A7;
-    color: #0054A7;
+	border: 1px solid #0054A7;
+	color: #0054A7;
 	background: #E4ECF5;
 }
diff --git a/views/default/css/elements/helpers.php b/views/default/css/elements/helpers.php
index e6f59260d..e9a9e0a30 100644
--- a/views/default/css/elements/helpers.php
+++ b/views/default/css/elements/helpers.php
@@ -33,27 +33,10 @@
 	float: right;
 }
 
-.right {
-	float: right;
-}
-
-.left {
-	float: left;
-}
-
 .link {
 	cursor: pointer;
 }
 
-<?php @todo // do we need something like large and small? ?>
-.large {
-	font-size: 120%;
-}
-
-.small {
-	font-size: 80%;
-}
-
 .elgg-discover .elgg-discoverable {
 	display: none;
 }
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index f7c789e33..9b12e0a57 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -288,8 +288,8 @@
 
 .elgg-ajax-loader {
 	background: white url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif) no-repeat center center;
-	min-height: 33px;
-	min-width: 33px;
+	min-height: 31px;
+	min-width: 31px;
 }
 
 /* ***************************************
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index 42d898439..9d92752b4 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -81,6 +81,9 @@
 .elgg-layout-two-sidebar {
 	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/two_sidebar_background.gif) repeat-y right top;
 }
+.elgg-layout-error {
+	margin-top: 20px;
+}
 .elgg-sidebar {
 	position: relative;
 	padding: 20px 10px;
@@ -115,4 +118,4 @@
 }
 .elgg-page-footer a:hover {
 	color: #666;
-}
\ No newline at end of file
+}
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index ebac2b91f..d9622d34a 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -18,7 +18,7 @@
 #avatar-croppingtool {
 	border-top: 1px solid #ccc;
 }
-#user-avatar {
+#user-avatar-cropper {
 	float: left;
 }
 #user-avatar-preview {
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index ef85d4dd5..a37ae094b 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -155,19 +155,10 @@
 	padding: 4px 45px 0 20px;
 	color: #666;
 }
-.elgg-module-widget.elgg-state-draggable > .elgg-head {
+.elgg-module-widget.elgg-state-draggable .elgg-widget-handle {
 	cursor: move;
 }
-.elgg-module-widget > .elgg-head a {
-	position: absolute;
-	top: 4px;
-	display: inline-block;
-	width: 18px;
-	height: 18px;
-	padding: 2px 2px 0 0;
-}
 a.elgg-widget-collapse-button {
-	left: 5px;
 	color: #c5c5c5;
 }
 a.elgg-widget-collapse-button:hover,
@@ -181,12 +172,6 @@ a.elgg-widget-collapse-button:before {
 a.elgg-widget-collapsed:before {
 	content: "\25BA";
 }
-a.elgg-widget-delete-button {
-	right: 5px;
-}
-a.elgg-widget-edit-button {
-	right: 25px;
-}
 .elgg-module-widget > .elgg-body {
 	background-color: white;
 	width: 100%;
@@ -206,4 +191,4 @@ a.elgg-widget-edit-button {
 .elgg-widget-placeholder {
 	border: 2px dashed #dedede;
 	margin-bottom: 15px;
-}
\ No newline at end of file
+}
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index bee1312ec..6b29e4c19 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -16,7 +16,7 @@
 	text-align: center;
 }
 .elgg-pagination li {
-	display: inline;
+	display: inline-block;
 	margin: 0 6px 0 0;
 	text-align: center;
 }
@@ -24,7 +24,8 @@
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
 	border-radius: 4px;
-	
+
+	display: block;
 	padding: 2px 6px;
 	color: #4690d6;
 	border: 1px solid #4690d6;
@@ -130,9 +131,9 @@
 }
 
 .elgg-menu-topbar > li > a {
-	padding: 2px 15px 0;
+	padding-top: 2px;
 	color: #eee;
-	margin-top: 1px;
+	margin: 1px 15px 0;
 }
 
 .elgg-menu-topbar > li > a:hover {
@@ -372,7 +373,10 @@
 	position: absolute;
 	z-index: 10000;
 
-	width: 165px;
+	overflow: hidden;
+
+	min-width: 165px;
+	max-width: 250px;
 	border: solid 1px;
 	border-color: #E5E5E5 #999 #999 #E5E5E5;
 	background-color: #FFF;
@@ -407,7 +411,7 @@
 }
 
 /* ***************************************
-	FOOTER
+	SITE FOOTER
 *************************************** */
 .elgg-menu-footer > li,
 .elgg-menu-footer > li > a {
@@ -429,10 +433,24 @@
 }
 
 /* ***************************************
+	GENERAL MENU
+*************************************** */
+.elgg-menu-general > li,
+.elgg-menu-general > li > a {
+	display: inline-block;
+	color: #999;
+}
+
+.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 {
+.elgg-menu-entity, .elgg-menu-annotation {
 	float: right;
 	margin-left: 15px;
 	font-size: 90%;
@@ -517,4 +535,26 @@
 *************************************** */
 .elgg-menu-extras {
 	margin-bottom: 15px;
-}
\ No newline at end of file
+}
+
+/* ***************************************
+	WIDGET MENU
+*************************************** */
+.elgg-menu-widget > li {
+	position: absolute;
+	top: 4px;
+	display: inline-block;
+	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-menu-widget > .elgg-menu-item-settings {
+	right: 25px;
+}
diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index f080a29b2..c044cb1cc 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -139,7 +139,7 @@ h6 { font-size: 0.8em; }
 .elgg-output dt { font-weight: bold }
 .elgg-output dd { margin: 0 0 1em 1em }
 
-.elgg-output ul, ol {
+.elgg-output ul, .elgg-output ol {
 	margin: 0 1.5em 1.5em 0;
 	padding-left: 1.5em;
 }
@@ -158,4 +158,5 @@ h6 { font-size: 0.8em; }
 }
 .elgg-output img {
 	max-width: 100%;
-}
\ No newline at end of file
+	height: auto;
+}
diff --git a/views/default/css/ie.php b/views/default/css/ie.php
index 4bddd4d55..34ececa89 100644
--- a/views/default/css/ie.php
+++ b/views/default/css/ie.php
@@ -6,3 +6,11 @@
 .elgg-avatar {
 	display: block;
 }
+
+/* ie8 adds space to the top of .elgg-gallery which causes jumpiness if this is display: block; */
+.elgg-gallery .elgg-avatar > a > img {
+    display: inline-block;
+}
+.elgg-gallery .elgg-avatar > .elgg-icon-hover-menu {
+    bottom: 4px;
+}
diff --git a/views/default/css/ie7.php b/views/default/css/ie7.php
index 56047b954..90274797d 100644
--- a/views/default/css/ie7.php
+++ b/views/default/css/ie7.php
@@ -22,7 +22,10 @@
 .elgg-menu-hz > li > span,
 .elgg-breadcrumbs > li,
 .elgg-menu-footer > li > a,
-.elgg-menu-footer li {
+.elgg-menu-footer li,
+.elgg-menu-general > li > a,
+.elgg-pagination li,
+.elgg-menu-general li {
 	display: inline;
 }
 
@@ -34,7 +37,8 @@
 	border-right: 1px solid #bababa;
 }
 .elgg-menu-footer li,
-.elgg-menu-user li {
+.elgg-menu-user li,
+.elgg-menu-general li {
 	padding-left: 4px;
 	padding-right: 4px;
 }
@@ -50,4 +54,22 @@
 
 .elgg-avatar {
 	display: inline;
-}
\ No newline at end of file
+}
+
+.elgg-body-walledgarden .elgg-col-1of2 {
+	width: 255px;
+}
+
+.elgg-module-walledgarden > .elgg-head,
+.elgg-module-walledgarden > .elgg-foot {
+	width: 530px;
+}
+
+input, textarea {
+	width: 98%;
+}
+
+.elgg-tag a {
+	/* IE7 had a weird wrapping issue for tags */
+	word-wrap: normal;
+}
diff --git a/views/default/css/walled_garden.php b/views/default/css/walled_garden.php
index 75bf0f29e..f6f7f97dc 100644
--- a/views/default/css/walled_garden.php
+++ b/views/default/css/walled_garden.php
@@ -6,60 +6,76 @@
 $url = elgg_get_site_url();
 
 ?>
-#elgg-walledgarden {
+.elgg-body-walledgarden {
 	margin: 100px auto 0 auto;
-	width: 563px;
-	min-height: 230px;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_background_top.gif) no-repeat left top;
-	padding: 0;
 	position: relative;
+	width: 530px;
+}
+.elgg-module-walledgarden {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+.elgg-module-walledgarden > .elgg-head {
+	height: 17px;
+}
+.elgg-module-walledgarden > .elgg-body {
+	padding: 0 10px;
+}
+.elgg-module-walledgarden > .elgg-foot {
+	height: 17px;
+}
+.elgg-walledgarden-double > .elgg-head {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_top.png) no-repeat left top;
+}
+.elgg-walledgarden-double > .elgg-body {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_middle.png) repeat-y left top;
+}
+.elgg-walledgarden-double > .elgg-foot {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_bottom.png) no-repeat left top;
+}
+.elgg-walledgarden-single > .elgg-head {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_top.png) no-repeat left top;
+}
+.elgg-walledgarden-single > .elgg-body {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_middle.png) repeat-y left top;
+}
+.elgg-walledgarden-single > .elgg-foot {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_bottom.png) no-repeat left top;
 }
 
-#elgg-walledgarden-bottom {
-	margin:0 auto;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_background_bottom.gif) no-repeat left bottom;
-	width:563px;
-	height:54px;
+.elgg-col > .elgg-inner {
+	margin: 0 0 0 5px;
+}
+.elgg-col:first-child > .elgg-inner {
+	margin: 0 5px 0 0;
+}
+.elgg-col > .elgg-inner {
+	padding: 0 8px;
 }
 
-#elgg-walledgarden-intro {
-	width: 230px;
-	float: left;
-	margin: 35px 15px 15px 35px;
+.elgg-walledgarden-single > .elgg-body {
+	padding: 0 18px;
 }
 
-#elgg-walledgarden-login {
-	width: 230px;
-	float: left;
-	margin: 30px 15px 45px 19px;
+.elgg-module-walledgarden-login {
+	margin: 0;
+}
+.elgg-body-walledgarden h3 {
+	font-size: 1.5em;
+	line-height: 1.1em;
+	padding-bottom: 5px;
 }
 
 .elgg-heading-walledgarden {
-	color: #666666;
 	margin-top: 60px;
 	line-height: 1.1em;
 }
 
-#elgg-walledgarden-lostpassword,
-#elgg-walledgarden-registration {
-	position: absolute;
-	right: 0;
-	top: 0;
-	width: 563px;
-	background-color: white;
-	padding: 0;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_backgroundfull_top.gif) no-repeat left top;
-	height: auto;
+h1, h2, h3, h4, h5, h6 {
+	color: #666;
 }
 
-.elgg-hiddenform-body {
-	padding: 30px 40px 0 40px;
-	height: auto;
-}
-.elgg-hiddenform-bottom {
-	margin: 0 auto;
-	background: url(<?php echo $url; ?>_graphics/walled_garden_backgroundfull_bottom.gif) no-repeat left bottom;
-	width: 563px;
-	height: 54px;
-	position: relative;
-}
+a {
+	color: #999;
+}
\ No newline at end of file