updated page layout

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

2 files changed, 14 insertions, 7 deletions

diff --git a/views/default/canvas/layouts/narrow_right_sidebar.php b/views/default/canvas/layouts/narrow_right_sidebar.php
index bc6c54725..d2b109dd8 100644
--- a/views/default/canvas/layouts/narrow_right_sidebar.php
+++ b/views/default/canvas/layouts/narrow_right_sidebar.php
@@ -14,20 +14,18 @@
 ?>

 

 <!-- right sidebar -->

-<div id="layout_sidebar_right" style="width:160px;">

+<div id="layout_sidebar_right_narrow">

 <div id="wrapper_sidebar_right">

 

-	<div style="border:1px solid silver;">

 	<?php echo $vars['area2']; ?>

-	</div>

 

 </div><!-- /#wrapper_sidebar_right -->

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

-</div><!-- /#layout_sidebar_right -->

+</div><!-- /#layout_sidebar_right_narrow -->

 

     

 <!-- main content -->

-<div id="layout_maincontent" class="has_sidebar_right" style="width:600px;">

+<div id="layout_maincontent" class="has_narrow_sidebar_right">

 <div id="wrapper_maincontent">

 

     <?php echo $vars['area1']; ?>

diff --git a/views/default/css.php b/views/default/css.php
index d81e9d379..8622e44ba 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -182,6 +182,12 @@ h6 { font-size: 0.8em; }
 #wrapper_sidebar_right {
 	margin:0;
 }
+#layout_sidebar_right_narrow {
+	width:160px;
+	min-height: 260px;
+	float:right;
+	padding:0px 0px 20px 10px;
+}
 
 #layout_maincontent {
     padding:0px 10px 20px 20px;
@@ -194,6 +200,9 @@ h6 { font-size: 0.8em; }
 .has_sidebar_right {
     margin:0 260px 0 0 !important;
 }
+.has_narrow_sidebar_right {
+    margin:0 190px 0 0 !important;
+}
 /* IE6 fix */
 * html #layout_maincontent { 
 	height:360px;
@@ -376,11 +385,11 @@ h6 { font-size: 0.8em; }
 #topmenu .usericon {
 	float:right;
 }
-/* temp fix - force user avatar to mini size */
+/* temp fix - force user avatar to mini size 
 #topmenu .usericon img {
 	width:40px;
 	height:40px;
-}
+}*/
 
 /* ***************************************
   COLLAPSABLE BOXES