river updated, widget layout fixed, page block tweaked,

git-svn-id: https://code.elgg.org/elgg/trunk@1655 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 30 insertions, 39 deletions

diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
index 0815242c8..bcd939dbb 100644
--- a/views/default/canvas/layouts/widgets.php
+++ b/views/default/canvas/layouts/widgets.php
@@ -258,11 +258,11 @@ Choose the features you want to add to your page by dragging them from the <b>Wi
 
 <table cellspacing="0" id="widget_table">
   <tr>
-    <td colspan="2" align="left" valign="top">
+    <td colspan="2" align="left" valign="top" height="1px">
 		<!-- profile box or 'dashboard info' notice -->
 		<?php if (isset($vars['area1'])) echo $vars['area1']; ?>
 	</td>
-    <td rowspan="2" align="left" valign="top">
+    <td rowspan="2" align="left" valign="top" height="100%">
 		<?php 
 		if($_SESSION['user']->guid == page_owner()){
 		?>
diff --git a/views/default/css.php b/views/default/css.php
index d22e8f9f3..1ff66c24d 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -230,34 +230,30 @@ h6 { font-size: 0.8em; }
 	width:306px;
 	margin:20px;
 	min-height:360px;
-/*
-	background: white;
-
-*/	padding:0;
+	/* background: white; */
+	padding:0;
 }
 #widgets_middle {
 	width:306px;
 	margin:20px 0 20px 0;
-	min-height:360px;
-/*
-	background: white;
-
-*/	padding:0;
+	/* min-height:360px; */
+	/* background: white; */
+	padding:0;
 }
 #widgets_right {
 	width:306px;
 	margin:20px 20px 20px 20px;
-	min-height:360px;
+	/* min-height:360px; */
 	float:left;
-/*
-	background: white;
-
-*/	padding:0;
+	/* background: white; */
+	padding:0;
 }
 #widget_table td {
 	border:0;
 	padding:0;
 	margin:0;
+	text-align: left;
+	vertical-align: top;
 }
 
 
@@ -315,23 +311,6 @@ h6 { font-size: 0.8em; }
 	width:958px;
 }
 
-
-/* ***************************************
-  PAGE-OWNER BLOCK
-*************************************** */
-#owner_block {
-	background:#FDFFC3;
-	padding:10px;
-}
-
-
-
-
-
-
-
-
-
 #layout_spotlight {
 	padding:0;
 	margin:0;
@@ -1120,7 +1099,7 @@ input[type="submit"] {
 }
 #profile_info_column_middle {
 	float:left;
-	width:100%;
+	width:368px;
 	padding: 0;
 }
 #profile_info_column_right {
@@ -1199,10 +1178,14 @@ p.user_menu_friends_of {
 /* ***************************************
 	RIVER
 *************************************** */
+#river {
+	border-top:1px solid #dddddd;
+}
 .river_item p {
 	margin:0;
-	padding:0 0 0 20px;
-	line-height:1.3em;
+	padding:2px 0 0 20px;
+	line-height:1.1em;
+	min-height:17px;
 }
 .river_item {
 	border-bottom:1px solid #dddddd;
@@ -1499,19 +1482,27 @@ table.search_gallery {
 }	
 	
 /* ***************************************
-	owner block
+  PAGE-OWNER BLOCK
 *************************************** */
+#owner_block {
+	/* background:#FDFFC3; */
+	padding:10px;
+	border-bottom:1px dashed #cccccc;
+}
 #owner_block_icon {
 	float:left;
 	margin:0 10px 0 0;
 }	
 #owner_block_content {
 	margin:0 0 10px 0;
-	padding:0 0 5px 0;
+	padding:3px 0 0 0;
+	min-height:30px;
 	border-bottom:1px solid #4690d6;
+	
+	font-weight: bold;
 }
 #owner_block_submenu {
-	margin:10px 0 10px 0;
+	margin:20px 0 20px 0;
 	padding: 0;
 	border-bottom: 1px solid #cccccc;
 /*