2 files changed, 16 insertions, 12 deletions
diff --git a/cgit.css b/cgit.css
index d2c0d0b..63acd78 100644
--- a/cgit.css
+++ b/cgit.css
@@ -1,18 +1,18 @@
 body {
 	font-family: arial;
 	font-size: normal;
 	background: white;
 	padding: 0em;
-	margin: 0.5em 1em;
+	margin: 0em;
 }
 
 
 h2 {
 	font-size: 120%;
 	font-weight: bold;
 	margin-bottom: 0.5em;
 }
 
 a {
 	color: blue;
 	text-decoration: none;
@@ -39,48 +39,51 @@ table.list th {
 	font-weight: normal;
 	border-bottom: solid 1px #777;
 	padding: 0.1em 0.5em 0.1em 0.5em;
 	vertical-align: baseline;
 }
 table.list td {
 	border: none;
 	padding: 0.1em 0.5em 0.1em 0.5em;
 }
 img {
 	border: none;
 }
-
-div#header {
+table#layout {
+	width: 100%;
+	border-collapse: collapse;
+	margin: 0px;
+}
+td#header {
 	background-color: #ddd;
 	padding: 0.25em 0.25em 0.25em 0.5em;
 	font-size: 150%;
 	font-weight: bold;
-	border: solid 1px #aaa;
+	border-bottom: solid 1px #aaa;
 	vertical-align: middle;
-	margin-bottom: 2em;
 }
-div#header img#logo {
+td#header img#logo {
 	float: right;
 }
 
-div#header input {
+td#header input {
 	float: right;
 	margin: 0.25em 1em;
 }
-div#header a {
+td#header a {
 	color: black;
 }
 
-div#content {
-	margin: 0.5em 0.5em;
+td#content {
+	padding: 1em 0.5em;
 }
 
 div#blob {
 	border: solid 1px black;
 }
 
 div.error {
 	color: red;
 	font-weight: bold;
 	margin: 1em 2em;
 }
 div.ls-blob, div.ls-dir {
diff --git a/ui-shared.c b/ui-shared.c
index bebd3e0..6300516 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -98,42 +98,43 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
 	html_txt(title);
 	html("</title>\n");
 	htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
 	html("<link rel='stylesheet' type='text/css' href='");
 	html_attr(cgit_css);
 	html("'/>\n");
 	html("</head>\n");
 	html("<body>\n");
 }
 
 void cgit_print_docend()
 {
+	html("</td></tr></table>");
 	html("</body>\n</html>\n");
 }
 
 void cgit_print_pageheader(char *title, int show_search)
 {
-	html("<div id='header'>");
+	html("<table id='layout'><tr><td id='header'>");
 	htmlf("<a href='%s'>", cgit_logo_link);
 	htmlf("<img id='logo' src='%s'/>\n", cgit_logo);
 	htmlf("</a>");
 	if (show_search) {
 		html("<form method='get' href='");
 		html_attr(cgit_currurl());
 		html("'>");
 		if (cgit_query_head)
 			html_hidden("h", cgit_query_head);
 		if (cgit_query_sha1)
 			html_hidden("id", cgit_query_sha1);
 		if (cgit_query_sha2)
 			html_hidden("id2", cgit_query_sha2);
 		html("<input type='text' name='q' value='");
 		html_attr(cgit_query_search);
 		html("'/></form>");
 	}
 	if (cgit_query_repo)
 		htmlf("<a href='%s'>", cgit_repourl(cgit_query_repo));
 	html_txt(title);
 	if (cgit_query_repo)
 		html("</a>");
-	html("</div>");
+	html("</td></tr><tr><td id='content'>");
 }