1 files changed, 42 insertions, 43 deletions

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 {