diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-12-08 12:35:56 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-12-08 12:35:56 +0000 |
| commit | 62605a939ca3d8084b049e7c652aa7d8c735938c (patch) | |
| tree | c158fb80575657cd6f48593bb23cfbe1c77a4dd8 /views/default | |
| parent | 2dbf5aad22164b73be4bbafdb0bb230947762e80 (diff) | |
| download | elgg-62605a939ca3d8084b049e7c652aa7d8c735938c.tar.gz elgg-62605a939ca3d8084b049e7c652aa7d8c735938c.tar.bz2 | |
fixes #537 - missing area3 added to two_column_right_sidebar - also added enough css so that the login page works with right sidebar
git-svn-id: http://code.elgg.org/elgg/trunk@3740 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/canvas/layouts/two_column_right_sidebar.php | 4 | ||||
| -rw-r--r-- | views/default/css.php | 33 |
2 files changed, 35 insertions, 2 deletions
diff --git a/views/default/canvas/layouts/two_column_right_sidebar.php b/views/default/canvas/layouts/two_column_right_sidebar.php index feaa993b5..fb561dd43 100644 --- a/views/default/canvas/layouts/two_column_right_sidebar.php +++ b/views/default/canvas/layouts/two_column_right_sidebar.php @@ -9,7 +9,7 @@ */ ?> <!-- main content --> -<div id="two_column_right_sidebar_maincontent"> +<div id="two_column_left_sidebar_maincontent"> <?php @@ -23,4 +23,6 @@ if (isset($vars['area2'])) echo $vars['area2']; ?> <?php if (isset($vars['area1'])) echo $vars['area1']; ?> +<?php if (isset($vars['area3'])) echo $vars['area3']; ?> + </div><!-- /two_column_right_sidebar -->
\ No newline at end of file diff --git a/views/default/css.php b/views/default/css.php index 4c37ed340..cbfb916a0 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -292,6 +292,21 @@ blockquote p { color:#0054A7; } +/* canvas layout: 2 column right sidebar */ +#two_column_right_sidebar { + width:210px; + margin:0 0 0 20px; + min-height:360px; + float:left; + background: #dedede; + padding:0px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-bottom:1px solid #cccccc; + border-right:1px solid #cccccc; +} + + .contentWrapper { background:white; -webkit-border-radius: 8px; @@ -971,7 +986,23 @@ input[type="submit"] { #two_column_left_sidebar #login-box .login-textarea { width:158px; } - +/* login and openID boxes when not running custom_index mod */ +#two_column_right_sidebar #login-box { + width:auto; + background: none; +} +#two_column_right_sidebar #login-box form { + width:auto; + margin:10px 10px 0 10px; + padding:5px 0 5px 10px; +} +#two_column_right_sidebar #login-box h2 { + margin:0 0 0 5px; + padding:5px 5px 0 5px; +} +#two_column_right_sidebar #login-box .login-textarea { + width:158px; +} /* *************************************** PROFILE |