Clean up main/sidebar/body divs.

3 files changed, 15 insertions, 16 deletions

diff --git a/includes/footer.html b/includes/footer.html
index ec33826..7187ed0 100755
--- a/includes/footer.html
+++ b/includes/footer.html
@@ -1,3 +1,4 @@
+			</div>
 		</div>
 		<div class="footer">
 			<p class="copyright">
diff --git a/includes/header.html b/includes/header.html
index dda5024..d48da23 100755
--- a/includes/header.html
+++ b/includes/header.html
@@ -23,14 +23,13 @@
 				</ul>
 			</div>
 		</header>
-		<div class="wrapper sidebar">
-			<div>
+		<div class="main">
+			<div class="sidebar">
 				<h2>News</h2>
 				<ul>
 <!--#include file="news.html" -->
 				</ul>
 			</div>
-		</div>
-		<div class="wrapper main">
-			<a id="body"></a>
-			<h1><!--#echo var="pagetitle" --></h1>
+			<div class="body">
+				<a id="body"></a>
+				<h1><!--#echo var="pagetitle" --></h1>
diff --git a/main.css b/main.css
index 6fdcb3a..327589f 100644
--- a/main.css
+++ b/main.css
@@ -82,26 +82,25 @@ header div.nav ul li a:hover {
 	color: #CCCC33;
 }
 
-div.wrapper div {
+div.main {
+	margin: 16px 24px 16px 24px;
+}
+div.sidebar {
+	float: right;
 	border: 2px solid #333333;
-	margin: 8px;
+	width: 300px;
 }
-div.wrapper div h3 {
+div.sidebar h3 {
 	background-color: #333333;
 	color: #FFFFFF;
 	padding: 2px;
 }
-div.wrapper div p, div.wrapper div ul {
+div.sidebar p, div.sidebar ul {
 	padding: 8px;
 }
-
-div.main {
+div.body {
 	margin-right: 292px;
 }
-div.sidebar {
-	float: right;
-	width: 300px;
-}
 
 footer {
 	margin: 8px;