updated profile box

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

5 files changed, 57 insertions, 8 deletions

diff --git a/views/default/canvas/layouts/narrow_right_sidebar.php b/views/default/canvas/layouts/narrow_right_sidebar.php
index d2b109dd8..abb1ca733 100644
--- a/views/default/canvas/layouts/narrow_right_sidebar.php
+++ b/views/default/canvas/layouts/narrow_right_sidebar.php
@@ -32,7 +32,7 @@
 	

 </div><!-- /#wrapper_maincontent -->

 <p></p><!-- necessary to avoid an ie7 bug? -->

-</div><!-- /#layout_maincontent -->	

+</div><!-- /#layout_maincontent .has_narrow_sidebar_right -->	

 	

 <!-- This clearing element should immediately follow the #layout_maincontent to force the #container to contain all child floats -->

 <div class="clearfloat"></div>
\ No newline at end of file
diff --git a/views/default/canvas/layouts/two_column.php b/views/default/canvas/layouts/two_column.php
index ccc2fee6a..a8b607f1f 100644
--- a/views/default/canvas/layouts/two_column.php
+++ b/views/default/canvas/layouts/two_column.php
@@ -32,7 +32,7 @@
 	
 </div><!-- /#wrapper_maincontent -->
 <p></p><!-- necessary to avoid an ie7 bug? -->
-</div><!-- /#layout_maincontent -->	
+</div><!-- /#layout_maincontent .has_sidebar_right -->	
 	
 <!-- This clearing element should immediately follow the #layout_maincontent to force the #container to contain all child floats -->
 <div class="clearfloat"></div>
\ No newline at end of file
diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
index 1ef87d2f6..dcc969b9e 100644
--- a/views/default/canvas/layouts/widgets.php
+++ b/views/default/canvas/layouts/widgets.php
@@ -201,7 +201,7 @@
 	
 </div><!-- /#wrapper_maincontent -->
 <p></p><!-- necessary to avoid an ie7 bug? -->
-</div><!-- /#layout_maincontent -->	
+</div><!-- /#layout_maincontent .has_sidebar_right -->	
 
 <!-- This clearing element should immediately follow the #layout_maincontent to force the #container to contain all child floats -->
 <div class="clearfloat"></div>
\ No newline at end of file
diff --git a/views/default/css.php b/views/default/css.php
index 4bdb24256..a8b33085d 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -714,8 +714,52 @@ input[type="submit"] {
 	margin:0;
 }
 
-.page_title {
-	padding:0px 10px 20px 20px;
+/* ***************************************
+	PROFILE
+*************************************** */
+#profile_info {
+	margin:0 0 20px 0;
+	border-bottom:1px solid #cccccc;
+}
+#profile_menu_wrapper p {
+	border-bottom:1px solid #cccccc;
+	padding:0 0 0 3px;
+}
+#profile_menu_wrapper p:first-child {
+	border-top:1px solid #cccccc;
+}
+#profile_menu_wrapper p:hover {
+	background:#4690d6;
+}
+#profile_menu_wrapper a:hover {
+	color:#ffffff;
+	text-decoration:none;
+}
+p.user_menu_friends {
+	margin:0;
+}
+#profile_info_column_left {
+	float:left;
+	width:200px;
+	margin: 0 20px 0 0;
+}
+#profile_info_column_right {
+	float:left;
+	width:305px;
+}
+#profile_info_column_left img {
+	padding:0 0 20px 0;
+}
+#profile_info_column_right p {
+	margin:7px 0 7px 0;
+	line-height:1.3em;
+}
+#profile_info_wide p {
+	margin:7px 0 7px 0;
+	line-height:1.4em;
+}
+#profile_info_wide .profile_info_edit_buttons {
+	margin:0;
 }
 
 
@@ -747,7 +791,9 @@ input[type="submit"] {
 	END
 *************************************** */
 
-
+.page_title {
+	padding:0px 10px 20px 20px;
+}
 	
 	
 	
diff --git a/views/default/pageshells/pageshell.php b/views/default/pageshells/pageshell.php
index 6d81d134a..e8e262e95 100644
--- a/views/default/pageshells/pageshell.php
+++ b/views/default/pageshells/pageshell.php
@@ -58,8 +58,11 @@
 
 
 <!-- canvas -->
-<div id="layout_canvas">

-<h2 class="page_title"><?php echo $vars['title']; ?></h2>
+<div id="layout_canvas">
+
+<!-- temporarily disabled page headers -->
+<!-- <h2 class="page_title"><?php echo $vars['title']; ?></h2> -->
+
 <?php echo $vars['body']; ?>
 <div class="clearfloat"></div>
 </div><!-- /#layout_canvas -->