refining the elgg-alt pattern

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

diff --git a/views/default/css/elements/skin.php b/views/default/css/elements/skin.php
index 693e6e56e874c918cda23fb11285ed8835f40d20..e6e238dc425b1d9eb5b72261839d736ccca2480d 100644 (file)
--- 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 5a033e0917f79e97336582f211034550a770047e..1ea527419e9d078071aa51accb476e68d7a74835 100644 (file)
--- 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 134cfec5506f4258abc2506a3f0b2781714cb67f..31d709b7b60ab988919fa249c151cc8a04c6f7ec 100644 (file)
--- 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',
        ));
 }