2 files changed, 41 insertions, 30 deletions

diff --git a/cgit.css b/cgit.css
index 565427f..17c2712 100644
--- a/cgit.css
+++ b/cgit.css
@@ -10,3 +10,3 @@ body {
         background: white;
-        padding-left: 4px;
+        padding: 4px;
 }
@@ -80,3 +80,9 @@ img {
 
-div#sidebar {
+table#layout {
+        border-collapse: collapse;
+        border: none;
+        margin: 0px;
+}
+
+td#sidebar {
         vertical-align: top;
@@ -84,11 +90,15 @@ div#sidebar {
         padding: 0px 0px 0px 0px;
-        margin: 4px;
-        float: left;
+        margin: 0px;
 }
 
-div#logo {
+td#sidebar table {
+        border-collapse: separate;
+        border-spacing: 0px;
         margin: 0px;
-        padding: 4px 0px 4px 0px;
-        text-align: center;
+        padding: 0px;
         background-color: #ccc;
+}
+
+td#sidebar table.sidebar td.sidebar {
+        padding: 4px;
         border-top: solid 1px #eee;
@@ -99,6 +109,6 @@ div#logo {
 
-div#sidebar div.infobox {
-        margin: 0px 0px 0px 0px;
-        padding: 0.5em;
-        text-align: left;
+div#logo {
+        margin: 0px;
+        padding: 4px 0px 4px 0px;
+        text-align: center;
         background-color: #ccc;
@@ -110,3 +120,3 @@ div#sidebar div.infobox {
 
-div#sidebar div.infobox h1 {
+td#sidebar h1 {
         font-size: 10pt;
@@ -116,3 +126,3 @@ div#sidebar div.infobox h1 {
 
-div#sidebar div.infobox h1.first {
+td#sidebar h1.first {
         margin-top: 0px;
@@ -120,3 +130,3 @@ div#sidebar div.infobox h1.first {
 
-div#sidebar div.infobox a.menu {
+td#sidebar a.menu {
         display: block;
@@ -127,3 +137,3 @@ div#sidebar div.infobox a.menu {
 
-div#sidebar div.infobox a.menu:hover {
+td#sidebar a.menu:hover {
         background-color: #bbb;
@@ -132,3 +142,3 @@ div#sidebar div.infobox a.menu:hover {
 
-div#sidebar div.infobox select {
+td#sidebar select {
         width: 100%;
@@ -137,4 +147,4 @@ div#sidebar div.infobox select {
 
-td#branch-dropdown-cell {
-        width: 99%;
+td#sidebar form {
+        text-align: right;
 }
@@ -142,3 +152,2 @@ td#branch-dropdown-cell {
 input#switch-btn {
-        width: 20px;
         margin: 2px 0px 0px 0px;
@@ -146,3 +155,3 @@ input#switch-btn {
 
-div#sidebar div.infobox input.txt {
+td#sidebar input.txt {
         width: 100%;
diff --git a/ui-shared.c b/ui-shared.c
index 2f771da..4c0613a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -459,8 +459,10 @@ void cgit_print_pageheader(char *title, int show_search)
 
-        html("<div id='sidebar'>\n");
-        html("<div id='logo'><a href='");
+        html("<table id='layout' summary=''>\n");
+        html("<tr><td id='sidebar'>\n");
+        html("<table class='sidebar' summary=''>\n");
+        html("<tr><td class='sidebar'>\n<a href='");
         html_attr(cgit_rooturl());
-        htmlf("'><img src='%s' alt='cgit'/></a></div>\n",
+        htmlf("'><img src='%s' alt='cgit'/></a>\n",
               cgit_logo);
-        html("<div class='infobox'>");
+        html("</td></tr>\n<tr><td class='sidebar'>\n");
         if (cgit_query_repo) {
@@ -491,3 +493,3 @@ void cgit_print_pageheader(char *title, int show_search)
                 add_hidden_formfields(0, 1, cgit_query_page);
-                html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
+        //      html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
                 html("<select name='h' onchange='this.form.submit();'>\n");
@@ -495,5 +497,5 @@ void cgit_print_pageheader(char *title, int show_search)
                 html("</select>\n");
-                html("</td><td>");
-                html("<noscript><input type='submit' id='switch-btn' value='..'/></noscript>\n");
-                html("</td></tr></table>");
+        //      html("</td><td>");
+                html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
+        //      html("</td></tr></table>");
                 html("</form>\n");
@@ -521,5 +523,5 @@ void cgit_print_pageheader(char *title, int show_search)
 
-        html("</div>\n");
+        html("</td></tr></table></td>\n");
 
-        html("</div>\n<table summary='page content' class='grid'><tr><td id='content'>\n");
+        html("<td id='content'>\n");
 }