diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/css/elements/skin.php | 8 | ||||
| -rw-r--r-- | views/default/layout/shells/two_sidebar.php | 6 | ||||
| -rw-r--r-- | views/default/page/elements/topbar.php | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/views/default/css/elements/skin.php b/views/default/css/elements/skin.php index 693e6e56e..e6e238dc4 100644 --- a/views/default/css/elements/skin.php +++ b/views/default/css/elements/skin.php @@ -48,7 +48,7 @@ a.selected { margin: 2px 30px 0 0; line-height: 1.1em; } -.elgg-page-topbar a.alt { +.elgg-page-topbar a.elgg-alt { float: right; margin: 2px 0 0 30px; } @@ -119,12 +119,12 @@ a.selected { .elgg-sidebar { float: right; width: 210px; - margin-left: 10px; + margin: 0 0 0 10px; } -.elgg-sidebar-alt { +.elgg-sidebar.elgg-alt { float: left; width: 160px; - margin-right: 10px; + margin: 0 10px 0 0; } .elgg-main-header { border-bottom: 1px solid #CCCCCC; diff --git a/views/default/layout/shells/two_sidebar.php b/views/default/layout/shells/two_sidebar.php index 5a033e091..1ea527419 100644 --- a/views/default/layout/shells/two_sidebar.php +++ b/views/default/layout/shells/two_sidebar.php @@ -7,7 +7,7 @@ * * @uses $vars['content'] The content string for the main column * @uses $vars['sidebar'] Optional content that is displayed in the sidebar - * @uses $vars['sidebar-alt'] Optional content that is displayed in the alternate sidebar + * @uses $vars['sidebar_alt'] Optional content that is displayed in the alternate sidebar * @uses $vars['class'] Additional class to apply to layout */ @@ -23,10 +23,10 @@ if (isset($vars['class'])) { echo elgg_view('layout/elements/sidebar', $vars); ?> </div> - <div class="elgg-sidebar-alt elgg-aside"> + <div class="elgg-sidebar elgg-alt elgg-aside"> <?php //$params = $vars; - //$params['sidebar'] = $vars['sidebar-alt']; + //$params['sidebar'] = $vars['sidebar_alt']; $params = array( 'sidebar' => elgg_view('layout/objects/module', array('title' => 'Testing', 'body' => 'Hello, world!')) ); diff --git a/views/default/page/elements/topbar.php b/views/default/page/elements/topbar.php index 134cfec55..31d709b7b 100644 --- a/views/default/page/elements/topbar.php +++ b/views/default/page/elements/topbar.php @@ -41,7 +41,7 @@ echo elgg_view('output/url', array( 'href' => "action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE, - 'class' => 'alt', + 'class' => 'elgg-alt', )); // elgg tools menu @@ -55,7 +55,7 @@ echo elgg_view('elgg_topbar/extend', $vars); echo elgg_view('output/url', array( 'href' => elgg_get_site_url() . "pg/settings/user/{$user->username}", 'text' => '<span class="elgg-icon elgg-icon-settings"></span>' . elgg_echo('settings'), - 'class' => 'alt', + 'class' => 'elgg-alt', )); // The administration link is for admin or site admin users only @@ -63,7 +63,7 @@ if ($user->isAdmin()) { echo elgg_view('output/url', array( 'href' => elgg_get_site_url() . 'pg/admin/', 'text' => '<span class="elgg-icon elgg-icon-settings"></span>' . elgg_echo('admin'), - 'class' => 'alt', + 'class' => 'elgg-alt', )); } |