4 files changed, 9 insertions, 11 deletions
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 730278399..e7b99dd4b 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -112,8 +112,8 @@
 }
 .elgg-main .elgg-breadcrumbs {
 	position: relative;
-	top:-6px;
-	left:0;
+	top: -6px;
+	left: 0;
 }
 /* ***************************************
 	SITE MENU
diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php
index 37ae6a7c3..e7d3ac59a 100644
--- a/views/default/css/elements/page_layout.php
+++ b/views/default/css/elements/page_layout.php
@@ -29,7 +29,6 @@
 }
 
 /***** TOPBAR ******/
-
 .elgg-page-topbar {
 	background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
 	border-bottom: 1px solid #000000;
@@ -87,7 +86,7 @@
 .elgg-page-header > .elgg-inner {
 	position: relative;
 }
-.elgg-site-title, .elgg-site-title:hover {
+.elgg-heading-site, .elgg-heading-site:hover {
 	font-size: 2em;
 	line-height: 1.4em;
 	color: white;
@@ -134,18 +133,17 @@
 	min-height: 360px;
 	padding: 10px;
 }
-.elgg-main .elgg-header {
+.elgg-main > .elgg-head {
 	padding-bottom: 3px;
 	border-bottom: 1px solid #CCCCCC;
 	margin-bottom: 10px;
 }
-<?php //@todo location-dependent styles ?>
-.elgg-main .elgg-header h2 {
+.elgg-heading-main {
 	float: left;
 	max-width: 530px;
 	margin-right: 10px;
 }
-.elgg-main > .elgg-header a {
+.elgg-main > .elgg-head a {
 	float: right;
 }
 
diff --git a/views/default/layout/shells/content/header.php b/views/default/layout/shells/content/header.php
index 2b2d748a8..b0bab9dc9 100644
--- a/views/default/layout/shells/content/header.php
+++ b/views/default/layout/shells/content/header.php
@@ -42,8 +42,8 @@ if ($context) {
 		}
 	}
 	echo <<<HTML
-<div class="elgg-header clearfix">
-	<h2>$title</h2>$buttons
+<div class="elgg-head clearfix">
+	<h2 class="elgg-heading-main">$title</h2>$buttons
 </div>
 HTML;
 }
diff --git a/views/default/page/elements/header_logo.php b/views/default/page/elements/header_logo.php
index 041c0dd00..4295deaa4 100644
--- a/views/default/page/elements/header_logo.php
+++ b/views/default/page/elements/header_logo.php
@@ -9,5 +9,5 @@ $site_name = $site->name;
 ?>
 
 <h1>
-	<a class="elgg-site-title" href="<?php echo elgg_get_site_url(); ?>"><?php echo $site_name; ?></a>
+	<a class="elgg-heading-site" href="<?php echo elgg_get_site_url(); ?>"><?php echo $site_name; ?></a>
 </h1>