2 files changed, 32 insertions, 78 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 6b1bdb9fb..4817494f9 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -43,7 +43,7 @@
 }
 
 #profile-rotator {
-	margin: 16px 0px 0px 16px;
+	margin: 16px;
 }
 
 /* this is referenced in js/acl.js - not sure if it is still needed. */
@@ -57,28 +57,13 @@
 /* conversation */
 
 .thread-wrapper.toplevel_item {
-	width: 90%;
 	margin-bottom: 10px;
 }
 
 /* conv_item */
 
 .hide-comments-outer {
-	margin-left: 60px;
-	padding: 15px 10px 15px 7px;
-}
-
-.wall-item-content-wrapper {
-	margin-top: 10px;
-	position: relative;
-}
-
-.wall-item-content-wrapper .wall-item-delete-wrapper {
-	opacity: 0;
-}
-
-.wall-item-content-wrapper:hover .wall-item-delete-wrapper {
-	opacity: 1;
+	padding: 10px 10px 10px 7px;
 }
 
 .wall-item-info {
@@ -105,14 +90,17 @@
 
 .wall-item-photo-wrapper {
 	margin-top: 0px;
-	margin-left: 10px;
-	margin-bottom: 10px;
+	margin-bottom: 20px;
+}
+
+.comment .wall-item-photo-wrapper {
+	margin-bottom: 15px;
 }
 
 .wall-item-photo-menu-button {
 	left:10px;
 	display: block;
-	position: absolute;
+	position: absoulte;
 	margin: 0px;
 	padding: 0px;
 	width: 16px;
@@ -125,7 +113,7 @@
 .wall-item-photo-menu {
 	left:10px;
 	width: auto;
-	position: absolute;
+	position: absoulte;
 	display: none;
 	z-index: 10000;
 }
@@ -140,20 +128,10 @@
 	padding: 2px;
 }
 
-.wall-item-arrowphoto-wrapper {
-	position: absolute;
-	z-index: 99;
-	left: 75px;
-}
-
 .wall-item-wrapper {
 	margin-left:10px;
 }
 
-.wall-item-arrowphoto-wrapper {
-
-}
-
 .lockview {
 	cursor: pointer;
 }
@@ -162,17 +140,21 @@
 	padding: 3px 20px;
 }
 
-.wall-item-author {
-	margin-top: 10px;
+.wall-item-lock {
+	float: left;
 }
 
+.wall-item-author {
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
 
 .wall-item-ago .icon-ok {
 	cursor: pointer;
 }
 
 .wall-item-content {
-	margin-left: 10px;
 	overflow: auto;
 }
 
@@ -180,9 +162,12 @@
     max-width: 95%;
 }
 
-.wall-item-title {
-	float: left;
+.wall-item-title h3 {
 	font-weight: bold;
+	margin: 0px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .wall-item-title-end {
@@ -190,14 +175,9 @@
 }
 
 .wall-item-body {
-	margin-top: 10px;
 	word-wrap: break-word;
 }
 
-.wall-item-body.divmore {
-        padding-bottom: 15px;
-}
-
 .body-tag, .filesavetags, .categorytags {
 	opacity: 0.5;
 	filter:alpha(opacity=50);
@@ -209,41 +189,25 @@
 }
 
 .body-tag {
-	margin-top: 15px;
+	margin-top: 10px;
 }
 
-.wall-item-tools {
-	clear: both;
-	padding: 5px 10px;
-	margin-left: 60px;
-}
-.wall-item-tools-bs {
-clear: both;
-	padding: 5px 10px;
-	margin-left: 40px;
-}
-.comment .wall-item-tools {
-	margin-left: 0;
+.categorytags {
+	margin-top: 10px;
 }
-.comment .wall-item-tools-bs {
-	padding: 0px 0px;
-	margin-left: 35px;
+
+.wall-item-tools {
+	width: 100%;
+	margin-top: 10px;
 }
+
 .item-tool {
 	cursor: pointer;
 }
 
 .like-rotator {
-	float: left;
-	margin: 8px;
-}
-
-.wall-item-delete-wrapper {
 	float: right;
-}
-
-.wall-item-delete-end {
-	clear: both;
+	margin: 16px;
 }
 
 .item-select {
@@ -260,16 +224,6 @@ clear: both;
 	filter:alpha(opacity=100);
 }
 
-.wall-item-like,
-.wall-item-dislike {
-	margin-top: 5px;
-	margin-left: 65px;
-}
-.comment .wall-item-like,
-.comment .wall-item-dislike {
-	margin-top: 5px;
-	margin-left: 50px;
-}
 .wall-item-wrapper-end {
 	clear: both;
 }
@@ -289,7 +243,7 @@ clear: both;
 }
 
 .comment-edit-photo {
-	margin: 10px;
+	margin: 10px 10px 10px 7px;
 	float: left;
 }
 
diff --git a/view/css/default.css b/view/css/default.css
index 793148019..d47fdfe80 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -31,5 +31,5 @@ section {
 	width: 100%;
 	display: table-cell;
 	vertical-align: top;
-	padding: 65px 13px 200px 13px;
+	padding: 65px 10px 200px 10px;
 }