Merge branch 'master' of git://gitorious.org/lorea/n1_theme

2 files changed, 11 insertions, 8 deletions

diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index e475ea5..31d3b49 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -81,19 +81,18 @@ body {
 .elgg-page-body .elgg-inner {
 	position: relative;	/* This fixes the IE7 overflow hidden bug */
 	clear: both;
-	float: left;
-	width: 100%;		/* width of whole page */
 	overflow: hidden;	/* This chops off any overhanging divs */
 	background-color: #dedede;
 }
 .elgg-layout {
-	right: 25%;
 	background-color: #eee;
 	float: left;
 	position: relative;
-	width: 100%;
 	min-height: 500px;
 }
+.elgg-layout-one-sidebar {
+	right: 25%;
+}
 .elgg-sidebar {
 	left: 31%;
 	width: 21%;
@@ -107,10 +106,12 @@ body {
 	margin: 0 10px 0 0;
 }
 .elgg-main {
+	left: 2%;
+	width: 96%;
+}
+.elgg-layout-one-sidebar .elgg-main {
 	left: 27%;
 	width: 71%;
-	padding: 10px;
-	padding-left: 20px;
 }
 .elgg-main > .elgg-head {
 	padding-bottom: 3px;
diff --git a/views/default/css/n1_theme/landing.php b/views/default/css/n1_theme/landing.php
index 1343d51..965a1a5 100644
--- a/views/default/css/n1_theme/landing.php
+++ b/views/default/css/n1_theme/landing.php
@@ -3,7 +3,8 @@
 	background-image: url('<?php echo elgg_get_site_url(); ?>mod/n1_theme/_graphics/n1.png');
 	background-repeat: no-repeat;
 	display: table;
-	margin: 30px 0 50px 0;
+	margin: 30px auto 50px;
+	min-width: 80%;
 }
 
 #n1-landing-inner {
@@ -14,8 +15,9 @@
 }
 
 #n1-landing-title {
-	font-size: 1.7em;
+	font-size: 2.1em;
 	font-weight: bold;
+	line-height: 0.9em;
 }
 
 #n1-landing-subtitle {