From 25cbe2a55338459d9848c4d5bf5ef4245bd67d20 Mon Sep 17 00:00:00 2001
From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Wed, 24 Mar 2004 17:16:27 +0000
Subject: [PATCH] Misc css cleanups, mainly for IE. * portlet font sizes
 slightly larger * subtitle formatting * autocomment rule

---
 stylesheets/DaVinci.css          | 84 ++++++++++++++++----------------
 stylesheets/DaVinciIE50Fixes.css | 82 +++++++++++++++----------------
 stylesheets/DaVinciIE55Fixes.css | 23 ++-------
 stylesheets/DaVinciIE60Fixes.css | 63 ++++--------------------
 4 files changed, 96 insertions(+), 156 deletions(-)

diff --git a/stylesheets/DaVinci.css b/stylesheets/DaVinci.css
index 525d1b1320..6951e32ec5 100644
--- a/stylesheets/DaVinci.css
+++ b/stylesheets/DaVinci.css
@@ -33,10 +33,10 @@
     top:2.2em; */
     width: 100%;
     float: right;
-    margin: 2.3em 0 0 -13.2em;
+    margin: 2.1em 0 0 -12.2em;
 }
 #portal-column-content #content {
-    margin: 0 0 0 13.2em;
+    margin: 0 0 0 12.2em;
 /*    position: relative;
     z-index:1;*/
 }
@@ -64,7 +64,7 @@ body {
 
 /* scale back up to a sane default */
 #visual-portal-wrapper {
-    font-size:119%
+    font-size:123%
 }
 
 /* general styles */
@@ -85,7 +85,7 @@ img {
     vertical-align: middle;
 }
 p {
-    margin: 0.5em 0em 1em 0em;
+    margin: 0.4em 0em 0.7em 0em;
     line-height: 1.5em;
 }
 p a {
@@ -121,7 +121,7 @@ h1, h2, h3, h4, h5, h6 {
     font-weight: normal;
     margin: 0;
     padding-top: 0.5em;
-    padding-bottom: 1px;
+    padding-bottom: 0.17em;
    /* border-bottom: 1px solid #2f6fab;*/
     border-bottom: 1px solid #aaaaaa;
 
@@ -145,13 +145,13 @@ h2 {
 }
 
 h3 {
-    font-size: 140%;
+    font-size: 132%;
     border-bottom: none;
     font-weight: bold;
 }
 
 h4 {
-    font-size: 120%;
+    font-size: 116%;
     border-bottom: none;
     font-weight: bold;
 }
@@ -172,21 +172,21 @@ h6 {
 ul { 
     line-height: 1.2em;
     list-style-type: square;
-    margin: 0.2em 0 0 1.5em;
+    margin: 0.3em 0 0 1.5em;
     padding:0;
     list-style-image: url("davinci/bullet.gif");
 }
 
 ol {
     line-height: 1.2em;
-    margin: 0.3em 0 0 2em;
+    margin: 0.3em 0 0 1.5em;
     padding:0;
 }
 ul a, ol a {
     text-decoration: none;
 }
 li {
-    margin-bottom: 0.5em;
+    margin-bottom: 0.4em;
 }
 dt {
     font-weight: bold;    
@@ -279,14 +279,15 @@ pre {
 /*
 ** the main content area
 */
-/*
-#bodyContent #subtitle {
-    font-size: 100%;
+
+#documentSubtitle {
+    font-size: 84%;
     line-height: 1.2em;
-    font-weight: normal;
+    margin: -1.6em 0 0.6em 1em;
+    color: #7d7d7d;
 }
-*/
-#documentSubtitle {
+
+#siteSubtitle {
     display: none;    
 }
 
@@ -312,11 +313,11 @@ pre {
 
 
 .documentContent {
-    font-size: 110%;
+    font-size: 105%;
     padding: 0em 1em 2em 1em !important;
     background: White;
     border: 1px solid  #74ae0b;
-    border-top:3px solid #cde2a7;
+    border-top:2px solid #cde2a7;
     border-style: solid;
     margin:0;
     line-height: 1.5em;
@@ -365,6 +366,8 @@ pre {
     padding: 0;
 }
 
+/* the auto-generated edit comments */
+#autocomment { color: gray; }
 
 
 
@@ -389,7 +392,7 @@ pre {
     margin: 0 0 1em 0em;
     float: none;
     padding: 0;
-    width: 13.3em !important;
+    width: 13.5em !important;
     overflow: hidden;
 }
 .portlet h4 {
@@ -398,7 +401,7 @@ pre {
     white-space: nowrap;
 }
 .portlet h5 { 
-    background: #ffae2e;
+    background: #ffb938;
     border: 1px solid #2f6fab;
     border-style: solid solid none solid;
     padding: 0em 1em 0em 1em;
@@ -463,13 +466,13 @@ pre {
 }
 
 .portlet ul {
-    list-style-type: square
+    list-style-type: square;
     list-style-image: url("davinci/bullet.gif");
-    font-size:105%;
+    font-size:107%;
 }
 .portlet li {
     line-height: 1.3em;
-    font-size:107%;
+    font-size:106%;
     margin: 0 0 0.3em 0.2em;
     padding:0;
     line-height: 1em;
@@ -589,11 +592,11 @@ input.searchButton {
 /* this is the ul contained in the portlet */
 
 #portal-personaltools {
-    background-color: #ffae2e;
+    background-color: #ffb938;
 /*    border-bottom-color: #2f6fab;*/
-    border: 0px solid #ffb506;
+    border: none;
     line-height: 1.4em;
-    color: Black;
+    color: #2f6fab;
     padding: 0em 3em 0 3em;
     margin: 0;
     text-align: right;
@@ -603,7 +606,7 @@ input.searchButton {
 }
 
 #portal-personaltools .portalNotLoggedIn {
-    color: Black;
+    color: #2f6fab;
     padding: 0;
     background: transparent;
     background-image: none;
@@ -612,21 +615,20 @@ input.searchButton {
 #portal-personaltools li {
     padding:0;
     display: inline;
-    color: Black;
+    color: #2f6fab;
     margin-left: 1em;
     line-height: 1.2em;
 }
 #portal-personaltools li a {
     text-decoration: none;
 /*    color: #436976;*/
-    color: Black;
+    color: #005896;
     padding-bottom: 0.2em;
 }
 #portal-personaltools li a:hover {
     text-decoration: none;
 /*    color: #436976;*/
-    background-color: White;
-    color: Black;
+    background-color: #ffcd6b;
     padding-bottom: 0.2em;
 }
 
@@ -646,8 +648,8 @@ li#personaltools-login{
     position:absolute;
     /*top:2.5em;
     left:0px;*/
-    top: 2.1em;
-    left: 14.1em;
+    top: 2em;
+    left: 13.3em;
     margin:0 0 0 0;
     white-space:nowrap !important;
     width:auto;
@@ -672,23 +674,23 @@ li#personaltools-login{
     border-color: #74ae0b;
     border-width: 1px; 
     border-style: solid solid none solid;
-    color: #578308;
+    color: #446b00;
     height: auto;
     margin-right: 0.3em;
-    padding: 0 0.9em 0.2em 0.9em;
+    padding: 0 0.9em 0.1em 0.9em;
     text-decoration: none;
     text-transform: lowercase;
 }
 #portlet-contentViews .selected a {
     background-color: #cde2a7;
     border-bottom: none;
-    padding: 0 0.9em 0.2em 0.9em !important;
+    padding: 0 0.9em 0.1em 0.9em !important;
   /*  border-bottom: #cde2a7 1px solid;*/
-    color: #578308;
+    color: #446b00;
 }
 #portlet-contentViews li a:hover {
     background-color: #cde2a7;
-    color: #578308;
+    color: #446b00;
 }
 
 /* offsets to distinguish the tab groups
@@ -714,12 +716,12 @@ li#contentaction-watch {
 
 
 #portal-footer {
-    background-color: #ffae2e;
+    background-color: #ffb938;
     border-top: 1px solid #2f6fab;
     border-bottom: 1px solid #2f6fab;
     float: none;
     margin: 0.3em 0em 1em 0em;
-    padding: 0.3em 0em 1em 0em;
+    padding: 0.4em 0em 1em 0em;
     text-align: center;
 }
 
@@ -752,7 +754,6 @@ a.new{ color:#ba0000; text-decoration:none; }
     border:1px solid #aaaaaa;
     background-color:#f9f9f9;
     padding:5px;
-    font-size:105%;
 }
 
 /* images */
@@ -844,6 +845,7 @@ html*.external{
     background-repeat: no-repeat;
     padding: 1px 0px 1px 16px;
 }*/
+
 .urlexpansion {
     display: none;
 }
diff --git a/stylesheets/DaVinciIE50Fixes.css b/stylesheets/DaVinciIE50Fixes.css
index 3d822f4a73..abeeaf0cb0 100644
--- a/stylesheets/DaVinciIE50Fixes.css
+++ b/stylesheets/DaVinciIE50Fixes.css
@@ -31,8 +31,9 @@ table.listing td.top {
     background: none;
     padding: 0;
 }
-#personaltools-userpage,
-#personaltools-login {
+li#personaltools-userpage,
+li#personaltools-login,
+li#personaltools-logout {
     background: none;
     padding-left: none;
 }
@@ -44,9 +45,11 @@ table.listing td.top {
     overflow: hidden;
 }
 
-.contentViews {
-    margin-top:-1px;
-    height:1%;
+#portal-column-one {
+    position: absolute;
+    z-index:0;
+    overflow: visible;
+    top: 0px;
 }
 
 textarea {
@@ -55,48 +58,39 @@ textarea {
 
 
 #portal-column-content {
-    /*width: 83% !important;*/
-    float: right !important;
-    margin: 0 0 0 -13.2em !important;
-    margin-left: -13.2em !important;
+    margin: 2.8em 0 0 -12.2em !important;
 }
 #portal-column-content #content {
-    margin: 2.4em 0 0 13.2em !important;
-    /*position: relative;*/
-/*    z-index:1;*/
+    margin-left: 12.2em;    
+    position: relative;
+    z-index: 1;
 }
+/* slightly smaller top margin for the content area */
+
 
 #portlet-contentViews {
-    position:absolute;
-    top: 1.6em;
-    left: 15.8em;
-   /* margin: 1.9em 0 0 15.7em;*/
-    margin: 0;
-    white-space: nowrap !important;
-    /*width: 400px !important;*/
-    width: 70% !important;
-    height: 1.5em;
-    padding-bottom: 0.3em;
+    top: 1.4em;
+    left: 11.8em;
+    background: transparent;
+    width: 76% !important;
 }
+                                                                                                                                                                       
 #portlet-contentViews ul {
-    margin-left: 0;
+    display: block;
+    float: left;
 }
-#portlet-contentViews li a {
-    height: 1.5em;
-    margin-right: 0.3em;
-    padding: 0 0.9em 0px 0.9em !important;
+#portlet-contentViews li {
+    display: block;
+    float: left;
 }
-#portlet-contentViews .selected a {
-    padding: 0 0.9em 0px 0.9em !important;
-}
-/* offsets to distinguish the tab groups
-IE5.5/6.0 is too dumb for this, hides the right tabs
-*/
-li#contentaction-talk {
-    margin-right: 1.6em;
+#portlet-contentViews li a {
+    display: block;
+    float: left;
+    padding-bottom: 0.2em;
 }
-li#contentaction-watch {
-    margin-left: 1.6em;
+#portlet-contentViews .selected a,
+#portlet-contentViews li a:hover {
+    padding-bottom: 0.2em;
 }
 
 #portlet-personal {
@@ -122,14 +116,8 @@ li#contentaction-watch {
 }
 
 
-#portal-column-one {
-    position: absolute;
-    overflow: hidden;
-    top: 0px;
-}
-
 #portal-footer {
-    margin: 0 0 0 15.8em;
+    margin: 0 0 0 15em;
 }
 
 /* padding fixes */
@@ -137,5 +125,11 @@ li#contentaction-watch {
     padding: 0 0 1em 0em;
     margin: 0;
 }
+.urlexpansion {
+    display: none !important;
+}
+#documentSubtitle {
+    margin: -1em 0 0.6em 1em;
+}
 
 /*div{ border:1px solid Red !important;}*/
diff --git a/stylesheets/DaVinciIE55Fixes.css b/stylesheets/DaVinciIE55Fixes.css
index df2ad697c5..661a54775b 100644
--- a/stylesheets/DaVinciIE55Fixes.css
+++ b/stylesheets/DaVinciIE55Fixes.css
@@ -1,30 +1,17 @@
-
-#visual-portal-wrapper {
-    font-size:118%
-}
-body {
-    font-size: xx-small;
-}
+/* IE5.5/win- only fixes */
 
 /* slightly smaller top margin for the content area */
-#portlet-contentViews {
-  /*  margin:2.1em 0 0 15.7em;*/
-    top: 2em;
-    left: 14em;
-}
 
-
-#portal-column-content {
-    width: 100%;
-    float: right;
-    margin: 2.1em 0 0 -13.4em;
+#portlet-contentViews li a,
+#portlet-contentViews .selected a,
+#portlet-contentViews li a:hover {
+    padding-bottom: 0.2em;
 }
 
 #portal-personaltools {
     padding-bottom: 0.1em;
 }
 
-
 body {
     font-size: xx-small;
 }
diff --git a/stylesheets/DaVinciIE60Fixes.css b/stylesheets/DaVinciIE60Fixes.css
index 0da1767b74..f57380f464 100644
--- a/stylesheets/DaVinciIE60Fixes.css
+++ b/stylesheets/DaVinciIE60Fixes.css
@@ -1,31 +1,10 @@
 /* 6.0 - only fixes */
-body {
-    font-size: xx-small;
-}
-
-#visual-portal-wrapper {
-    font-size:128%
-}
 
-
-
-.portlet {
-    overflow: hidden;
-    width: 14.4em !important;
-}
 /* slightly smaller top margin for the content area */
 #portlet-contentViews {
-  /*  margin:2.1em 0 0 15.7em;*/
-  /*  top: 2em;
-    left: 17em;*/
-    top: 0;
-    left: 0;
-    height: 1.7em;
-    padding-left: 0px;
-    margin: 2em -17em 0 15.2em;
-    white-space: nowrap;
+    left: 11.4em;
+    top: 1.7em;
     width: 76% !important;
-   /* border-left: 1px solid  #74ae0b;*/
 }
                                                                                                                                                                        
 #portlet-contentViews ul {
@@ -38,43 +17,25 @@ body {
 }
 #portlet-contentViews li a {
     display: block;
-    width: 0.1em;
     float: left;
     padding-bottom: 0.2em;
 }
-
-#contentaction-view {
-}
-
-#contentaction-view a,
-#contentaction-view .selected a {
-/*    border-left: 0.9em solid #cde2a7 !important;*/
-    width: 0.1em !important;
-    height: 100%;
+#portlet-contentViews .selected a,
+#portlet-contentViews li a:hover {
+    padding-bottom: 0.2em;
 }
 
 #portal-column-content {
-    width: 100%;
-    float: right;
-    margin: 2.1em 0 0 -13.5em;
+    margin: 1.9em 0 0 -11.9em;
 }
 
 #portal-column-content #content {
-    margin: 0 0 0 13.5em !important;
-    /*position: relative;*/
-/*    z-index:1;*/
+    margin: 0 0 0 11.9em;
 }
 
 #portal-personaltools {
     padding-bottom: 0.1em;
 }
-/*
-.contentViews li a {
-    padding: 0 10px 0.2em 10px !important;
-}
-.contentViews .selected a {
-    padding: 0 10px 0.2em 10px !important;
-}*/
 
 
 /* height on everything... */
@@ -92,13 +53,9 @@ h6,
     height: 100%;    
 }
 
-#bodyContent h1,
-.documentFirstHeading,
-#bodyContent h2,
-#bodyContent h3,
-#bodyContent h4,
-#bodyContent h5 {
-    margin-bottom:0.4em;
+p {
+    margin: 0.2em 0em 0.4em 0em;
+    line-height: 1.5em;
 }
 
 /*{ border:1px solid Red !important;}*/
-- 
2.20.1