cannot fix ie6 css, i give up

git-svn-id: file:///raid/svn-personal/koakuma/trunk@30 219d0f9c-2d94-d447-890a-813e76b88fe9

diff --git a/Static/style.css b/Static/style.css
index f8f9bdfef62ddc97c0e3b4f08a7649f4b422e77d..bc8199cf4538e9454ef8d612d18827492d5cdf59 100644 (file)
--- a/Static/style.css
+++ b/Static/style.css
@@ -63,6 +63,12 @@ img {
        padding-right: 25%;
 }
 
+#toc {
+       float: right;
+       width: 13em;
+       background-color: #f0f0f0;
+}
+
 #toctitle {
        font-size: 30px;
        background-color: #f8f8f8;
@@ -72,16 +78,11 @@ img {
        margin-left: 10px;
 }
 
-#clearfix {
-       clear: both;
-}
-
 #doc {
-       margin-top: -20px;
 }
 
 #docinside {
-       margin-right: 14em;
+       padding-right: 14em;
 }
 
 a {
@@ -92,11 +93,8 @@ a:visited {
        color: #a0a0a0;
 }
 
-#toc {
-       float: right;
-       width: 13em;
+#tocinside {
        padding: 5px;
-       background-color: #f0f0f0;
 }
 
 pre {

diff --git a/koakuma.cgi.in b/koakuma.cgi.in
index cb80d479528254cfd30a460ff4435d28801efd54..742fcb16be766eb8024fc2f468296a24c30754b2 100644 (file)
--- a/koakuma.cgi.in
+++ b/koakuma.cgi.in
@@ -241,11 +241,9 @@ proc start_html {title has_toc} {
        rputs   "               <title>$title - Koakuma</title>"
        rputs   "               <link rel=\"stylesheet\" href=\"$css\">"
        set msie " src=\"$koakuma_png\""
-       set msie2 ""
        if { [info exists "env(HTTP_USER_AGENT)"] } {
                if { [regexp {MSIE 6} "$env(HTTP_USER_AGENT)"] } {
                        set msie " style=\"filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='$koakuma_png', sizingMethod='scale');\" src=\"/static/transparent.gif\""
-                       set msie2 " style=\"margin-top: 20px;\""
                }
        }
        rputs   "       </head>"
@@ -258,15 +256,16 @@ proc start_html {title has_toc} {
        rputs   "                       Koakuma"
        rputs   "               </div>"
        rputs   "               <a href=\"$env(SCRIPT_NAME)\">Root</a>"
-       rputs   "               <div id=\"clearfix\"></div>"
        if { "$has_toc" == "1" } {
                rputs   "               <div id=\"doc\">"
        } else {
                rputs   "               <div id=\"doc-notoc\">"
        }
+       rputs   "               <div style=\"clear: both;\"></div>"
        if { "$has_toc" == "1" } {
-               rputs   "               <div id=\"toc\"$msie2>"
-               rputs   "                       <div id=\"toctitle\">TOC</div>"
+               rputs   "               <div id=\"toc\">"
+               rputs   "                       <div id=\"tocinside\">"
+               rputs   "                               <div id=\"toctitle\">TOC</div>"
                foreach sect $toc {
                        if { "[string range "[regsub -all { } "$sect" "-"]" 0 0]" == "-" } {
                                rputs "<a class=\"shiftlink\" href=\"#TOC-[regsub {^-} "[regsub -all { } "$sect" "-"]" ""]\">[regsub {^-} "$sect" ""]</a><br>"
@@ -274,6 +273,7 @@ proc start_html {title has_toc} {
                                rputs "<a href=\"#TOC-[regsub -all { } "$sect" "-"]\">$sect</a><br>"
                        }
                }
+               rputs   "                       </div>"
                rputs   "               </div>"
        }
        rputs   "                       <div id=\"docinside\">"