13 files changed, 844 insertions, 423 deletions

diff --git a/views/default/css/elements/buttons.php b/views/default/css/elements/buttons.php
index a6fd2f794..e9c99cf96 100644
--- a/views/default/css/elements/buttons.php
+++ b/views/default/css/elements/buttons.php
@@ -18,7 +18,7 @@
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
-	
+
 	width: auto;
 	padding: 2px 4px;
 	cursor: pointer;
diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php
deleted file mode 100644
index ab142707d..000000000
--- a/views/default/css/elements/chrome.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * Visual styling
- *
- * @package Elgg.Core
- * @subpackage UI
- */
-
-/* Colors:
-
-	#4690D6 - elgg light blue
-	#0054A7 - elgg dark blue
-	#e4ecf5 - elgg very light blue
-*/
-
-?>
-
-a {
-	color: #4690D6;
-}
-a:hover,
-a.selected {
-	color: #555555;
-	text-decoration: underline;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	color: #0054A7;
-}
-p {
-	margin-bottom: 15px;
-}
-p:last-child {
-	margin-bottom: 0;
-}
-
-dt {
-	font-weight: bold;
-}
-dd {
-	margin: 0 0 1em 1em;
-}
-pre, code {
-	background:#EBF5FF;
-	color:#000000;
-	overflow:auto;
-
-	overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
-
-	white-space: pre-wrap;
-	word-wrap: break-word; /* IE 5.5-7 */
-}
-code {
-	padding:2px 3px;
-}
-pre {
-	padding:3px 15px;
-	margin:0px 0 15px 0;
-	line-height:1.3em;
-}
-blockquote {
-	padding:3px 15px;
-	margin:0px 0 15px 0;
-	background:#EBF5FF;
-	border:none;
-	
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-}
-
-h2 {
-	padding-bottom:5px;
-}
-
-.elgg-quiet {
-	color: #666;
-}
-
-.elgg-loud {
-	color: #0054A7;
-}
-
-.elgg-photo {
-	border: 1px solid #ccc;
-	padding: 3px;
-	background-color: white;
-}
-
-.elgg-comments {
-	margin-top: 25px;
-}
-.elgg-comments > form {
-	margin-top: 15px;
-}
-
-/* ***************************************
-	BORDERS AND SEPARATORS
-*************************************** */
-.elgg-border-plain {
-	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;
-}
-
-/* ***************************************
-	USER INPUT DISPLAY RESET
-*************************************** */
-.elgg-output {
-	margin-top: 10px;
-}
-.elgg-output ul, ol {
-	margin: 0 1.5em 1.5em 0;
-	padding-left: 1.5em;
-}
-.elgg-output ul {
-	list-style-type: disc;
-}
-.elgg-output ol {
-	list-style-type: decimal;
-}
-.elgg-output table {
-	border: 1px solid #ccc;
-}
-.elgg-output table td {
-	border: 1px solid #ccc;
-	padding: 3px 5px;
-}
-.elgg-output img {
-	max-width: 100%;
-}
diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index df1632db4..7fe535d57 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -7,37 +7,9 @@
  * @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.
- */
 ?>
 
 /* ***************************************
-	Body
-*************************************** */
-.elgg-body {
-	width: auto;
-	word-wrap: break-word;
-	overflow: hidden;
-}
-.elgg-body:after {
-	display: block;
-	visibility: hidden;
-	height: 0 !important;
-	line-height: 0;
-	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 ";
-}
-
-/* ***************************************
 	Image Block
 *************************************** */
 .elgg-image-block {
@@ -64,10 +36,10 @@
 	border-bottom: 1px dotted #CCCCCC;
 }
 
-.elgg-list-item .elgg-subtext {
+.elgg-item .elgg-subtext {
 	margin-bottom: 5px;
 }
-.elgg-list-content {
+.elgg-item .elgg-content {
 	margin: 10px 5px;
 }
 
@@ -82,9 +54,12 @@
 .elgg-gallery td {
 	padding: 5px;
 }
-.elgg-gallery-fluid li {
+.elgg-gallery-fluid > li {
 	float: left;
 }
+.elgg-gallery-users > li {
+	margin: 0 2px;
+}
 
 /* ***************************************
 	Tables
@@ -110,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;
 }
@@ -160,10 +139,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 {
@@ -178,6 +157,9 @@
 	font-style: italic;
 	line-height: 1.2em;
 }
+
+.elgg-river-attachments,
+.elgg-river-message,
 .elgg-river-content {
 	border-left: 1px solid #CCC;
 	font-size: 85%;
@@ -185,9 +167,8 @@
 	margin: 8px 0 5px 0;
 	padding-left: 5px;
 }
-
-<?php //@todo location-dependent styles ?>
-.elgg-river-content .elgg-avatar {
+.elgg-river-attachments .elgg-avatar,
+.elgg-river-attachments .elgg-icon {
 	float: left;
 }
 .elgg-river-layout .elgg-input-dropdown {
@@ -255,7 +236,6 @@
 	-webkit-border-radius: 5px;
 	border-radius: 5px;
 	
-	display: none;
 	height: 30px;
 }
 .elgg-river-item input[type=text] {
@@ -265,21 +245,40 @@
 	margin: 0 0 0 10px;
 }
 
+
+/* **************************************
+	Comments (from elgg_view_comments)
+************************************** */
+.elgg-comments {
+	margin-top: 25px;
+}
+.elgg-comments > form {
+	margin-top: 15px;
+}
+
+/* ***************************************
+	Image-related
+*************************************** */
+.elgg-photo {
+	border: 1px solid #ccc;
+	padding: 3px;
+	background-color: white;
+}
+
 /* ***************************************
 	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
new file mode 100644
index 000000000..74f21ee59
--- /dev/null
+++ b/views/default/css/elements/core.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Core CSS
+ * 
+ * This file holds all the complicated/hacky stuff that you really
+ * shouldn't touch or override unless you're sure you know what you're doing.
+ * 
+ * Provides classes that implement cross-browser support for the following features:
+ *   * clearfix
+ *   * fluid-width content area that doesn't wrap around floats
+ *   * menu's with separators
+ *   * inline-block
+ *   * horizontal menus
+ *   * fluid gallery without using tables
+ */
+?>
+
+/* Clearfix */
+.clearfix:after,
+.elgg-grid: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;	
+}
+
+/* Fluid width container that does not wrap floats */
+.elgg-body,
+.elgg-col-last {
+	display: block;
+	width: auto;
+	word-wrap: break-word;
+	overflow: hidden;
+	
+	/* IE 6, 7 */
+	zoom:1;
+	*overflow:visible;
+}
+
+<?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;
+	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 ";
+}
+
+/* ***************************************
+ * MENUS
+ *
+ * To add separators to a menu:
+ * .elgg-menu-$menu > li:after {content: '|'; background: ...;}
+ *************************************** */
+/* Enabled nesting of dropdown/flyout menus */
+.elgg-menu > li { position: relative; }
+
+.elgg-menu > li:last-child::after {
+	display: none;
+}
+
+/* Maximize click target */
+.elgg-menu > li > a { display: block }
+
+/* Horizontal menus w/ separator support */
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a,
+.elgg-menu-hz > li > span {
+	vertical-align: middle;
+}
+
+/* Allow inline image blocks in horizontal menus */
+.elgg-menu-hz .elgg-body:after { content: '.'; }
+
+<?php //@todo This isn't going to work as-is.  Needs testing ?>
+/* Inline block */
+.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 {
+	/* Google says do this, but why? */
+	position: relative;
+
+	display: inline-block;
+}
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index d783b5123..068cc8fd6 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -16,6 +16,10 @@ fieldset > div {
 fieldset > div:last-child {
 	margin-bottom: 0;
 }
+.elgg-form-alt > fieldset > .elgg-foot {
+	border-top: 1px solid #CCC;
+	padding: 10px 0;
+}
 
 label {
 	font-weight: bold;
@@ -28,18 +32,16 @@ input, textarea {
 	color: #666;
 	font: 120% Arial, Helvetica, sans-serif;
 	padding: 5px;
-	width: 100%;
-	
+	width: 100%;	
 	-webkit-border-radius: 5px;
 	-moz-border-radius: 5px;
 	border-radius: 5px;
-	
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }
 
-input:focus, textarea:focus {
+input[type=text]:focus, textarea:focus {
 	border: solid 1px #4690d6;
 	background: #e4ecf5;
 	color:#333;
@@ -67,17 +69,25 @@ 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-login, .elgg-form-account {
+	max-width: 450px;
+}
+
 /* ***************************************
 	FRIENDS PICKER
 *************************************** */
+.friends-picker-main-wrapper {
+	margin-bottom: 15px;
+}
 .friends-picker-container h3 {
 	font-size:4em !important;
 	text-align: left;
@@ -95,7 +105,7 @@ input[type="radio"] {
 	margin: 0;
 	padding:0;
 	position: relative;
-	width: 100%;
+	width: 730px;
 }
 .friends-picker {
 	position: relative;
@@ -225,16 +235,141 @@ input[type="radio"] {
 }
 
 /* ***************************************
+	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;
+}
+
+/* ***************************************
+      DATE PICKER
+**************************************** */
+.ui-datepicker {
+	display: none;
+
+	margin-top: 3px;
+	width: 208px;
+	background-color: white;
+	border: 1px solid #0054A7;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	overflow: hidden;
+
+	-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+}
+.ui-datepicker-inline {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
 
-.user-picker .user-picker-entry {
-	clear:both;
-	height:25px;
-	padding:5px;
-	margin-top:5px;
-	border-bottom:1px solid #cccccc;
+.ui-datepicker-header {
+	position: relative;
+	background: #4690D6;
+	color: white;
+	padding: 2px 0;
+	border-bottom: 1px solid #0054A7;
+}
+.ui-datepicker-header a {
+	color: white;
+}
+.ui-datepicker-prev, .ui-datepicker-next {
+	position: absolute;
+	top: 5px;
+	cursor: pointer;
+}
+.ui-datepicker-prev {
+	left: 6px;
+}
+.ui-datepicker-next {
+	right: 6px;
+}
+.ui-datepicker-title {
+	line-height: 1.8em;
+	margin: 0 30px;
+	text-align: center;
+	font-weight: bold;
+}
+.ui-datepicker-calendar {
+	margin: 4px;
+}
+.ui-datepicker th {
+	color: #0054A7;
+	border: none;
+	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;
+	line-height: 1.2em;
+	text-align: right;
+	text-decoration: none;
+}
+.ui-datepicker-calendar .ui-state-default {
+	border: 1px solid #ccc;
+	color: #4690D6;;
+	background: #fafafa;
+}
+.ui-datepicker-calendar .ui-state-hover {
+	border: 1px solid #aaa;
+	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;
+	background: #E4ECF5;
 }
-.user-picker-entry .elgg-button-delete {
-	margin-right:10px;
-}
\ No newline at end of file
diff --git a/views/default/css/elements/grid.php b/views/default/css/elements/grid.php
index 00cd448b9..fdbaf4aca 100644
--- a/views/default/css/elements/grid.php
+++ b/views/default/css/elements/grid.php
@@ -13,14 +13,6 @@
 /* ***************************************
 	GRID
 *************************************** */
-.elgg-grid:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-
 .elgg-col {
 	float: left;
 }
@@ -60,18 +52,3 @@
 .elgg-col-5of6 {
 	width: 83.33%;
 }
-.elgg-col-last {
-	width: auto;
-	float: none;
-	display: table-cell;
-}
-.elgg-col-last:after {
-	clear: both;
-	display: block;
-	visibility: hidden;
-	overflow: hidden;
-	height: 0 !important;
-	line-height: 0;
-	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 ";
-}
diff --git a/views/default/css/elements/helpers.php b/views/default/css/elements/helpers.php
index ac13c0efc..e9a9e0a30 100644
--- a/views/default/css/elements/helpers.php
+++ b/views/default/css/elements/helpers.php
@@ -13,14 +13,6 @@
 	clear: both;
 }
 
-.clearfix:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-
 .hidden {
 	display: none;
 }
@@ -33,27 +25,18 @@
 	text-align: center;
 }
 
-.right {
-	float: right;
+.float {
+	float: left;
 }
 
-.left {
-	float: left;
+.float-alt {
+	float: right;
 }
 
 .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;
 }
@@ -62,6 +45,32 @@
 	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)
 *************************************** */
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index d0d2ea777..9b12e0a57 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -16,73 +16,267 @@
 	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left;
 	width: 16px;
 	height: 16px;
-	display: inline-block;
 	margin: 0 2px;
 }
-.elgg-icon-settings {
-	background-position: -302px -44px;
+.elgg-icon-arrow-left {
+	background-position: 0 -0px;
 }
-.elgg-icon-friends {
-	background-position: 0 -300px;
-	width: 36px;
+.elgg-icon-arrow-right {
+	background-position: 0 -18px;
 }
-.elgg-icon-friends:hover {
-	background-position: 0 -340px;
+.elgg-icon-arrow-two-head {
+	background-position: 0 -36px;
 }
-.elgg-icon-help {
-	background-position: -302px -136px;
+.elgg-icon-attention:hover {
+	background-position: 0 -54px;
 }
-.elgg-icon-delete {
-	background-position: -199px 1px;
+.elgg-icon-attention {
+	background-position: 0 -72px;
+}
+.elgg-icon-calendar {
+	background-position: 0 -90px;
+}
+.elgg-icon-cell-phone {
+	background-position: 0 -108px;
+}
+.elgg-icon-checkmark:hover {
+	background-position: 0 -126px;
+}
+.elgg-icon-checkmark {
+	background-position: 0 -144px;
+}
+.elgg-icon-clip:hover {
+	background-position: 0 -162px;
+}
+.elgg-icon-clip {
+	background-position: 0 -180px;
+}
+.elgg-icon-cursor-drag-arrow {
+	background-position: 0 -198px;
+}
+.elgg-icon-delete-alt:hover {
+	background-position: 0 -216px;
+}
+.elgg-icon-delete-alt {
+	background-position: 0 -234px;
 }
 .elgg-icon-delete:hover {
-	background-position: -199px -15px;
+	background-position: 0 -252px;
 }
-.elgg-icon-thumbs-up {
-	background-position: 0px -101px;
-	width: 20px;
-	height: 20px;
+.elgg-icon-delete {
+	background-position: 0 -270px;
 }
-.elgg-icon-thumbs-up:hover {
-	background-position: 0px -131px;
+.elgg-icon-download:hover {
+	background-position: 0 -288px;
 }
-.elgg-icon-thumbs-up-alt {
-	background-position: 0px -131px;
-	width: 20px;
-	height: 20px;
+.elgg-icon-download {
+	background-position: 0 -306px;
 }
-.elgg-icon-arrow-s {
-	background-position: -146px -56px;
+.elgg-icon-eye {
+	background-position: 0 -324px;
 }
-.elgg-icon-arrow-s:hover {
-	background-position: -146px -76px;
+.elgg-icon-facebook {
+	background-position: 0 -342px;
 }
-.elgg-icon-tag {
-	background-position: 2px -197px;
+.elgg-icon-grid:hover {
+	background-position: 0 -360px;
 }
-.elgg-icon-following {
-	background-position: -35px -100px;
-	width: 22px;
-	height: 20px;
+.elgg-icon-grid {
+	background-position: 0 -378px;
 }
-.elgg-icon-rss {
-	background-position: -249px 1px;
+.elgg-icon-home:hover {
+	background-position: 0 -396px;
 }
-.elgg-icon-hover-menu {
-	background-position: -150px 0;
+.elgg-icon-home {
+	background-position: 0 -414px;
 }
 .elgg-icon-hover-menu:hover {
-	background-position: -150px -32px;
+	background-position: 0 -432px;
+}
+.elgg-icon-hover-menu {
+	background-position: 0 -450px;
+}
+.elgg-icon-info:hover {
+	background-position: 0 -468px;
+}
+.elgg-icon-info {
+	background-position: 0 -486px;
+}
+.elgg-icon-link:hover {
+	background-position: 0 -504px;
+}
+.elgg-icon-link {
+	background-position: 0 -522px;
+}
+.elgg-icon-list {
+	background-position: 0 -540px;
+}
+.elgg-icon-lock-closed {
+	background-position: 0 -558px;
+}
+.elgg-icon-lock-open {
+	background-position: 0 -576px;
+}
+.elgg-icon-mail-alt:hover {
+	background-position: 0 -594px;
+}
+.elgg-icon-mail-alt {
+	background-position: 0 -612px;
+}
+.elgg-icon-mail:hover {
+	background-position: 0 -630px;
+}
+.elgg-icon-mail {
+	background-position: 0 -648px;
+}
+.elgg-icon-photo {
+	background-position: 0 -666px;
+}
+.elgg-icon-print-alt {
+	background-position: 0 -684px;
+}
+.elgg-icon-print {
+	background-position: 0 -702px;
+}
+.elgg-icon-push-pin-alt {
+	background-position: 0 -720px;
+}
+.elgg-icon-push-pin {
+	background-position: 0 -738px;
+}
+.elgg-icon-redo {
+	background-position: 0 -756px;
+}
+.elgg-icon-refresh:hover {
+	background-position: 0 -774px;
+}
+.elgg-icon-refresh {
+	background-position: 0 -792px;
+}
+.elgg-icon-round-arrow-left {
+	background-position: 0 -810px;
+}
+.elgg-icon-round-arrow-right {
+	background-position: 0 -828px;
+}
+.elgg-icon-round-checkmark {
+	background-position: 0 -846px;
 }
-.elgg-icon-dragger {
-	background-position: -302px -186px;
-	width: 21px;
-	height: 21px;
+.elgg-icon-round-minus {
+	background-position: 0 -864px;
 }
-.elgg-icon-gear {
-	background-position: -300px -2px;
+.elgg-icon-round-plus {
+	background-position: 0 -882px;
+}
+.elgg-icon-rss {
+	background-position: 0 -900px;
+}
+.elgg-icon-search-focus {
+	background-position: 0 -918px;
+}
+.elgg-icon-search {
+	background-position: 0 -936px;
+}
+.elgg-icon-settings-alt:hover {
+	background-position: 0 -954px;
+}
+.elgg-icon-settings-alt {
+	background-position: 0 -972px;
+}
+.elgg-icon-settings {
+	background-position: 0 -990px;
+}
+.elgg-icon-share:hover {
+	background-position: 0 -1008px;
+}
+.elgg-icon-share {
+	background-position: 0 -1026px;
+}
+.elgg-icon-shop-cart:hover {
+	background-position: 0 -1044px;
+}
+.elgg-icon-shop-cart {
+	background-position: 0 -1062px;
+}
+.elgg-icon-speech-bubble-alt:hover {
+	background-position: 0 -1080px;
+}
+.elgg-icon-speech-bubble-alt {
+	background-position: 0 -1098px;
+}
+.elgg-icon-speech-bubble:hover {
+	background-position: 0 -1116px;
+}
+.elgg-icon-speech-bubble {
+	background-position: 0 -1134px;
+}
+.elgg-icon-star-alt {
+	background-position: 0 -1152px;
+}
+.elgg-icon-star-empty:hover {
+	background-position: 0 -1170px;
+}
+.elgg-icon-star-empty {
+	background-position: 0 -1188px;
+}
+.elgg-icon-star:hover {
+	background-position: 0 -1206px;
+}
+.elgg-icon-star {
+	background-position: 0 -1224px;
+}
+.elgg-icon-tag:hover {
+	background-position: 0 -1242px;
+}
+.elgg-icon-tag {
+	background-position: 0 -1260px;
+}
+.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 {
 	display: none;
 	position: absolute;
@@ -94,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;
 }
 
 /* ***************************************
@@ -103,6 +297,7 @@
 *************************************** */
 .elgg-avatar {
 	position: relative;
+	display: inline-block;
 }
 .elgg-avatar > a > img {
 	display: block;
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index d512c3602..9d92752b4 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -15,6 +15,10 @@
 	PAGE LAYOUT
 *************************************** */
 /***** DEFAULT LAYOUT ******/
+<?php // the width is on the page rather than topbar to handle small viewports ?>
+.elgg-page-default {
+	min-width: 998px;
+}
 .elgg-page-default .elgg-page-header > .elgg-inner {
 	width: 990px;
 	margin: 0 auto;
@@ -35,7 +39,6 @@
 .elgg-page-topbar {
 	background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
 	border-bottom: 1px solid #000000;
-	min-width: 998px;
 	position: relative;
 	height: 24px;
 	z-index: 9000;
@@ -50,7 +53,7 @@
 	top: 24px;
 	right: 20px;
 	max-width: 500px;
-	z-index: 1000;
+	z-index: 2000;
 }
 .elgg-system-messages li {
 	margin-top: 10px;
@@ -72,23 +75,15 @@
 .elgg-layout {
 	min-height: 360px;
 }
-<?php // elgg-layout gets clearfix ?>
-.elgg-layout:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-.elgg-layout-one-column {
-	padding: 10px 0;
-}
 .elgg-layout-one-sidebar {
 	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif) repeat-y right top;
 }
 .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;
@@ -123,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 c8ba4f735..d9622d34a 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -8,10 +8,6 @@
 	z-index: 100;
 }
 
-#dashboard-info .elgg-inner {
-	border: 2px solid #dedede;
-}
-
 /* ***************************************
 	AVATAR UPLOADING & CROPPING
 *************************************** */
@@ -22,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 bc30548b6..a37ae094b 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -2,6 +2,7 @@
 	Modules
 *************************************** */
 .elgg-module {
+	overflow: hidden;
 	margin-bottom: 20px;
 }
 
@@ -145,54 +146,44 @@
 	background-color: #ccc;
 }
 .elgg-module-widget > .elgg-head {
-	background-color: #dedede;
-	height: 30px;
-	line-height: 30px;
+	background-color: #eeeeee;
+	height: 26px;
 	overflow: hidden;
 }
 .elgg-module-widget > .elgg-head h3 {
 	float: left;
-	padding: 0 45px 0 20px;
-	color: #333;
+	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: 5px;
-	display: inline-block;
-	width: 18px;
-	height: 18px;
-	padding: 2px 2px 0 0;
-	border: 1px solid transparent;
-}
 a.elgg-widget-collapse-button {
-	left: 5px;
-	background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px;
+	color: #c5c5c5;
 }
-a.elgg-widget-collapsed {
-	background-position: 0px -365px;
+a.elgg-widget-collapse-button:hover,
+a.elgg-widget-collapsed:hover {
+	color: #9d9d9d;
+	text-decoration: none;
 }
-a.elgg-widget-delete-button {
-	right: 5px;
+a.elgg-widget-collapse-button:before {
+	content: "\25BC";
 }
-a.elgg-widget-edit-button {
-	right: 25px;
-}
-a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
-	border: 1px solid #ccc;
+a.elgg-widget-collapsed:before {
+	content: "\25BA";
 }
 .elgg-module-widget > .elgg-body {
 	background-color: white;
 	width: 100%;
 	overflow: hidden;
+	border-top: 2px solid #dedede;
 }
 .elgg-widget-edit {
 	display: none;
 	width: 96%;
 	padding: 2%;
 	border-bottom: 2px solid #dedede;
+	background-color: #f9f9f9;
 }
 .elgg-widget-content {
 	padding: 10px;
@@ -200,4 +191,4 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
 .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 a098759a5..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;
@@ -74,7 +75,7 @@
 }
 .elgg-tabs a:hover {
 	background: #dedede;
-	color:#4690D6;
+	color: #4690D6;
 }
 .elgg-tabs .elgg-state-selected {
 	border-color: #ccc;
@@ -87,47 +88,6 @@
 }
 
 /* ***************************************
- * MENUS
- *
- * To add separators to a menu:
- * .elgg-menu-$menu > li:after {content: '|'; background: ...;}
- *************************************** */
-/* For dropdown/flyout menus */
-.elgg-menu > li {
-	position:relative;
-} 
-
-/* For separators */
-.elgg-menu > li:last-child:after {
-	display:none
-} 
-
-/* Maximize click target */
-.elgg-menu > li > a {
-	display:block
-} 
-
-/* Image placement correction */
-.elgg-menu img, 
-.elgg-menu .elgg-icon {
-	vertical-align: middle; 
-	margin-top: -2px;
-} 
-
-/* Horizontal menus w/ separator support */
-.elgg-menu-hz > li,
-.elgg-menu-hz > li:after,
-.elgg-menu-hz > li > a {
-	display:inline-block;
-	vertical-align:middle;
-}
-
-/* Allow inline image blocks in horizontal menus */
-.elgg-menu-hz .elgg-body:after {
-	content: '.';
-}
-
-/* ***************************************
 	BREADCRUMBS
 *************************************** */
 .elgg-breadcrumbs {
@@ -139,7 +99,7 @@
 .elgg-breadcrumbs > li {
 	display: inline-block;
 }
-.elgg-breadcrumbs > li:after{
+.elgg-breadcrumbs > li:after {
 	content: "\003E";
 	padding: 0 4px;
 	font-weight: normal;
@@ -167,30 +127,46 @@
 }
 
 .elgg-menu-topbar > li {
-	float:left;
+	float: left;
 }
 
 .elgg-menu-topbar > li > a {
-	padding: 2px 15px;
+	padding-top: 2px;
 	color: #eee;
-	margin-top: 2px;
-	line-height: 1.1em;
+	margin: 1px 15px 0;
 }
 
 .elgg-menu-topbar > li > a:hover {
-	color: #71cbff;
+	color: #4690D6;
 	text-decoration: none;
 }
 
 .elgg-menu-topbar-alt {
-	float:right;
+	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-menu-site {
-	z-index: 7000;
+	z-index: 1;
 }
 
 .elgg-menu-site > li > a {
@@ -203,7 +179,6 @@
 	text-decoration: none;
 }
 
-
 .elgg-menu-site-default {
 	position: absolute;
 	bottom: 0;
@@ -216,62 +191,68 @@
 	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;
 }
 
 .elgg-menu-site-more {
-	display:none;
-	position:relative;
+	position: relative;
 	left: -1px;
 	width: 100%;
-	z-index: 7000;
 	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);
 }
 
-li:hover > .elgg-menu-site-more {
-	display:block;
-}
-
 .elgg-menu-site-more > li > a {
-	background: white;
+	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;
 }
+
 .elgg-menu-site-more > li:last-child > a,
 .elgg-menu-site-more > li:last-child > a:hover {
 	-webkit-border-radius: 0 0 4px 4px;
@@ -281,7 +262,7 @@ li:hover > .elgg-menu-site-more {
 
 .elgg-more > a:before {
 	content: "\25BC";
-	font-size:smaller;
+	font-size: smaller;
 	margin-right: 4px;
 }
 
@@ -330,7 +311,7 @@ li:hover > .elgg-menu-site-more {
 }
 .elgg-menu-filter > li > a:hover {
 	background: #dedede;
-	color:#4690D6;
+	color: #4690D6;
 }
 .elgg-menu-filter > .elgg-state-selected {
 	border-color: #ccc;
@@ -392,7 +373,10 @@ li:hover > .elgg-menu-site-more {
 	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;
@@ -427,12 +411,12 @@ li:hover > .elgg-menu-site-more {
 }
 
 /* ***************************************
-	FOOTER
+	SITE FOOTER
 *************************************** */
 .elgg-menu-footer > li,
 .elgg-menu-footer > li > a {
 	display: inline-block;
-	color:#999;
+	color: #999;
 }
 
 .elgg-menu-footer > li:after {
@@ -440,26 +424,53 @@ li:hover > .elgg-menu-site-more {
 	padding: 0 4px;
 }
 
-.elgg-menu-footer-alt {
+.elgg-menu-footer-default {
 	float: right;
 }
 
+.elgg-menu-footer-alt {
+	float: left;
+}
+
+/* ***************************************
+	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
+	ENTITY AND ANNOTATION
 *************************************** */
-.elgg-menu-entity {
+<?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 {
-	display: inline-block;
+.elgg-menu-entity > li, .elgg-menu-annotation > li {
 	margin-left: 15px;
 }
-.elgg-menu-entity > li > a {
+.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
@@ -496,7 +507,27 @@ li:hover > .elgg-menu-site-more {
 	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;
 }
 
 /* ***************************************
@@ -504,4 +535,26 @@ li:hover > .elgg-menu-site-more {
 *************************************** */
 .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 82d55cc04..c044cb1cc 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -15,30 +15,78 @@ body {
 	line-height: 1.4em;
 	font-family: "Lucida Grande", Arial, Tahoma, Verdana, sans-serif;
 }
+
+a {
+	color: #4690D6;
+}
+
+a:hover,
+a.selected { <?php //@todo remove .selected ?>
+	color: #555555;
+	text-decoration: underline;
+}
+
+p {
+	margin-bottom: 15px;
+}
+
+p:last-child {
+	margin-bottom: 0;
+}
+
 pre, code {
 	font-family: Monaco, "Courier New", Courier, monospace;
 	font-size: 12px;
+	
+	background:#EBF5FF;
+	color:#000000;
+	overflow:auto;
+
+	overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
+
+	white-space: pre-wrap;
+	word-wrap: break-word; /* IE 5.5-7 */
+	
+}
+
+pre {
+	padding:3px 15px;
+	margin:0px 0 15px 0;
+	line-height:1.3em;
+}
+
+code {
+	padding:2px 3px;
 }
-input, textarea {
-	font: 120% Arial, Helvetica, sans-serif;
+
+.elgg-monospace {
+	font-family: Monaco, "Courier New", Courier, monospace;
 }
+
 blockquote {
 	line-height: 1.3em;
+	padding:3px 15px;
+	margin:0px 0 15px 0;
+	background:#EBF5FF;
+	border:none;
+	
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
 }
+
 h1, h2, h3, h4, h5, h6 {
 	font-weight: bold;
+	color: #0054A7;
 }
+
 h1 { font-size: 1.8em; }
-h2 { font-size: 1.5em; line-height: 1.1em; }
+h2 { font-size: 1.5em; line-height: 1.1em; padding-bottom:5px}
 h3 { font-size: 1.2em; }
 h4 { font-size: 1.0em; }
 h5 { font-size: 0.9em; }
 h6 { font-size: 0.8em; }
 
-.elgg-monospace {
-	font-family: Monaco, "Courier New", Courier, monospace;
-}
-
 .elgg-heading-site, .elgg-heading-site:hover {
 	font-size: 2em;
 	line-height: 1.4em;
@@ -48,6 +96,7 @@ h6 { font-size: 0.8em; }
 	text-shadow: 1px 2px 4px #333333;
 	text-decoration: none;
 }
+
 .elgg-heading-main {
 	float: left;
 	max-width: 530px;
@@ -65,3 +114,49 @@ h6 { font-size: 0.8em; }
 	line-height: 1.2em;
 	font-style: italic;
 }
+
+.elgg-text-help {
+	display: block;
+	font-size: 85%;
+	font-style: italic;
+}
+
+.elgg-quiet {
+	color: #666;
+}
+
+.elgg-loud {
+	color: #0054A7;
+}
+
+/* ***************************************
+	USER INPUT DISPLAY RESET
+*************************************** */
+.elgg-output {
+	margin-top: 10px;
+}
+
+.elgg-output dt { font-weight: bold }
+.elgg-output dd { margin: 0 0 1em 1em }
+
+.elgg-output ul, .elgg-output ol {
+	margin: 0 1.5em 1.5em 0;
+	padding-left: 1.5em;
+}
+.elgg-output ul {
+	list-style-type: disc;
+}
+.elgg-output ol {
+	list-style-type: decimal;
+}
+.elgg-output table {
+	border: 1px solid #ccc;
+}
+.elgg-output table td {
+	border: 1px solid #ccc;
+	padding: 3px 5px;
+}
+.elgg-output img {
+	max-width: 100%;
+	height: auto;
+}