From 1e30c02696f00782fa49f76ca5923ebb868e8bc9 Mon Sep 17 00:00:00 2001
From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Mon, 26 Apr 2004 18:09:28 +0000
Subject: [PATCH] fixed not-clickable subtitle in IE6 and subtitle/cat link
 problem in IE5/5.5

---
 stylesheets/IEFixes.js             |  7 +++++--
 stylesheets/monobook/IE50Fixes.css | 10 ++++------
 stylesheets/monobook/IE60Fixes.css |  1 +
 stylesheets/monobook/main.css      | 13 ++++++++-----
 templates/xhtml_slim.pt            |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/stylesheets/IEFixes.js b/stylesheets/IEFixes.js
index b83a4d1c03..e9b46a62e4 100644
--- a/stylesheets/IEFixes.js
+++ b/stylesheets/IEFixes.js
@@ -39,9 +39,12 @@ function relativeforfloats() {
 function setrelative (nodes) {
     var i = 0;
     while (i < nodes.length) {
-        if(nodes[i].style.float != ('none'|null) ||
-                nodes[i].align != (''|null|'none'))
+        if(((nodes[i].style.float && nodes[i].style.float != ('none') ||
+        (nodes[i].align && nodes[i].align != ('none'))) &&
+        (!nodes[i].style.position || nodes[i].style.position != 'relative'))) 
+        {
             nodes[i].style.position = 'relative';
+        }
         i++;
     }
 }
diff --git a/stylesheets/monobook/IE50Fixes.css b/stylesheets/monobook/IE50Fixes.css
index 6c8a76ca93..3c4165aef1 100644
--- a/stylesheets/monobook/IE50Fixes.css
+++ b/stylesheets/monobook/IE50Fixes.css
@@ -18,7 +18,7 @@
 }
 
 #portal-footer {
-    margin: 0 0 0 14.5em;
+    margin: 0 0 0 13.6em;
 }
 
 /* IE 4&5 interpret keyword sizes one off */
@@ -107,15 +107,13 @@ div.thumbnail-none p, div.thumbnail-right p, div.thumbnail-left p {
 textarea {
     width: 78% !important;
 }
-#documentSubtitle {
-    margin: -1em 0 0.6em 1em;
-}
-
-
 .visualClear {
     width:100%;
     height: 0px;
     padding:0;
     margin:0;
 }
+.documentFirstHeading {
+    margin-bottom: 0.3em;
+}
 /*div{ border:1px solid Red !important;}*/
diff --git a/stylesheets/monobook/IE60Fixes.css b/stylesheets/monobook/IE60Fixes.css
index 1397fb90fb..8fbc26f2e6 100644
--- a/stylesheets/monobook/IE60Fixes.css
+++ b/stylesheets/monobook/IE60Fixes.css
@@ -63,6 +63,7 @@ textarea {
     overflow: hidden;
 }
 div.editsection,
+#catlinks,
 div.tright,
 div.tleft {
     position: relative;
diff --git a/stylesheets/monobook/main.css b/stylesheets/monobook/main.css
index 0a806ae5fb..91b8cccd1a 100644
--- a/stylesheets/monobook/main.css
+++ b/stylesheets/monobook/main.css
@@ -262,18 +262,19 @@ pre {
 #documentSubtitle {
     font-size: 84%;
     line-height: 1.2em;
-    margin: -1.6em 0 0.6em 1em;
+    margin: 0 0 1.4em 1em;
     color: #7d7d7d;
+    width: auto;
 }
 #siteSubtitle {
     display: none;    
 }
 #catlinks {
-    width: 40%;
+    margin: 0;
+    padding: 0;
+    width: 34%;
     text-align: right;
     float: right;
-    position: relative;
-    top: -1.5em;
 }
 
 #content {
@@ -287,13 +288,15 @@ pre {
 
 /* Some space under the headers in the content area */
 #bodyContent h1,
-.documentFirstHeading,
 #bodyContent h2,
 #bodyContent h3,
 #bodyContent h4,
 #bodyContent h5 {
     margin-bottom:0.8em;
 }
+.documentFirstHeading {
+    margin-bottom:0.1em;
+}
 
 
 #documentContent {
diff --git a/templates/xhtml_slim.pt b/templates/xhtml_slim.pt
index 262da1af44..c18a017509 100644
--- a/templates/xhtml_slim.pt
+++ b/templates/xhtml_slim.pt
@@ -35,7 +35,7 @@
             <div id="bodyContent">
               <div tal:condition="catlinks" id="catlinks" tal:content="structure catlinks"></div>
               <h3 id="siteSubtitle" i18n:translate="string:fromwikipedia">From Wikipedia, the free encyclopedia.</h3>
-              <div tal:condition="subtitle"  id="documentSubtitle" tal:content="structure subtitle"></div>
+              <div id="documentSubtitle" tal:content="structure subtitle"></div>
               <!-- <esi:include src="userxy/message"/> cached per user, purged on new message-->
               <div tal:condition="newtalk" class="portalMessage" tal:content="structure newtalk"></div>
               <!-- the content area is cached with the remaining inexpensive sceleton, one version for all.
-- 
2.20.1