Revert changes of 16988 and 17038 until I get some aesthetic issues worked out (some...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6cf4b7d..851f7db 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -43,7 +43,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   tables in Monobook
 * (bug 6868) Un-hardcode section edit link style
 * (bug 3205) Stop right floats from stacking horizontally in non-Monobook skins
-* (bug 2013) Inherit ratios and not computed values for line-height
 * Added global $wgStyleVersion to centralize bumping CSS and JS file versions
   for cache-friendly style and script updating
 * (bug 7562) Fix non-ASCII namespaces on Windows/XAMPP servers

diff --git a/skins/chick/main.css b/skins/chick/main.css
index e1515ee..00cab81 100644 (file)
--- a/skins/chick/main.css
+++ b/skins/chick/main.css
@@ -28,7 +28,7 @@ img {
 }
 p {
     margin: 0.4em 0em 0.5em 0em;
-    line-height: 1.5;
+    line-height: 1.5em;
 }
 
 p img { margin: 0; }
@@ -66,12 +66,12 @@ h6 { font-size: 80%;  }
 }
 
 ul {
-    line-height: 1.5;
+    line-height: 1.5em;
     margin: 0.3em 0 0 1.5em;
     padding:0;
 }
 ol {
-    line-height: 1.5;
+    line-height: 1.5em;
     margin: 0.3em 0 0 3.2em;
     padding:0;
     list-style-image: none;
@@ -86,7 +86,7 @@ dl{
     margin-bottom: 0.5em;
 }
 dd {
-    line-height: 1.5;
+    line-height: 1.5em;
     margin-left: 2em;
     margin-bottom: 0.1em;
 }
@@ -95,7 +95,7 @@ fieldset {
     border: 1px solid #2f6fab;
     margin: 1em 0em 1em 0em;
     padding: 0em 1em 1em 1em;
-    line-height: 1.5;
+    line-height: 1.5em;
 }
 legend {
     background: White;
@@ -156,7 +156,7 @@ pre {
     border: 1px dashed #2f6fab;
     color: Black;
     background-color: #f9f9f9;
-    line-height: 1.1;
+    line-height: 1.1em;
 }
 
 /*
@@ -211,7 +211,7 @@ in the bottom-right corner of the content area */
     font-weight: bold;
     display: block;
     margin: 1em 0em;
-    line-height: 1.5;
+    line-height: 1.5em;
 }
 .documentByLine {
     text-align: right;
@@ -290,7 +290,7 @@ div.thumb div a img {
 div.thumb div div.thumbcaption {
     border: none;
     text-align: left;
-    line-height: 1.4;
+    line-height: 1.4em;
     padding: 0.3em 0 0.1em 0;
 }
 div.magnify {
@@ -371,7 +371,7 @@ div.townBox dl dd {
 ** edit views etc
 */
 .special li {
-    line-height: 1.4;
+    line-height: 1.4em;
     margin: 0;
     padding: 0;
 }

diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css
index 1b5df9a..e23c50b 100644 (file)
--- a/skins/common/commonPrint.css
+++ b/skins/common/commonPrint.css
@@ -136,7 +136,7 @@ h1, h2, h3, h4, h5, h6
 
 p, .documentDescription {
     margin: 1em 0 ! important;
-    line-height: 1.2;    
+    line-height: 1.2em;    
 }
 
 .tocindent p {

diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index cf301ad..6b57ed9 100644 (file)
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -22,7 +22,7 @@
        color: black;
        border: 1px solid #aaa;
        border-right: none;
-       line-height: 1.5;
+       line-height: 1.5em;
        position: relative;
        z-index: 2;
 }
@@ -95,7 +95,7 @@ img {
 }
 p {
        margin: .4em 0 .5em 0;
-       line-height: 1.5;
+       line-height: 1.5em;
 }
 p img {
        margin: 0;
@@ -118,31 +118,16 @@ h1, h2, h3, h4, h5, h6 {
        padding-bottom: .17em;
        border-bottom: 1px solid #aaa;
 }
-h1 {
-       font-size: 188%;
-       line-height: 0.8;
-}
-h2 {
-       font-size: 150%;
-       line-height: 1;
-}
+h1 { font-size: 188%; }
+h2 { font-size: 150%; }
 h3, h4, h5, h6 {
        border-bottom: none;
        font-weight: bold;
 }
-h3 {
-       font-size: 132%;
-       line-height: 1.14;
-}
-h4 {
-       font-size: 116%;
-       line-height: 1.30;
-}
+h3 { font-size: 132%; }
+h4 { font-size: 116%; }
 h5 { font-size: 100%; }
-h6 {
-       font-size: 80%;
-       line-height: 1.89;
-}
+h6 { font-size: 80%;  }
 
 div.editsection {
        float: right;
@@ -150,14 +135,14 @@ div.editsection {
 }
 
 ul {
-       line-height: 1.5;
+       line-height: 1.5em;
        list-style-type: square;
        margin: .3em 0 0 1.5em;
        padding: 0;
        list-style-image: url(bullet.gif);
 }
 ol {
-       line-height: 1.5;
+       line-height: 1.5em;
        margin: .3em 0 0 3.2em;
        padding: 0;
        list-style-image: none;
@@ -174,7 +159,7 @@ dl {
        margin-bottom: .5em;
 }
 dd {
-       line-height: 1.5;
+       line-height: 1.5em;
        margin-left: 2em;
        margin-bottom: .1em;
 }
@@ -183,7 +168,7 @@ fieldset {
        border: 1px solid #2f6fab;
        margin: 1em 0 1em 0;
        padding: 0 1em 1em;
-       line-height: 1.5;
+       line-height: 1.5em;
 }
 legend {
        padding: .5em;
@@ -232,7 +217,7 @@ pre {
        border: 1px dashed #2f6fab;
        color: black;
        background-color: #f9f9f9;
-       line-height: 1.1;
+       line-height: 1.1em;
 }
 
 /*
@@ -249,7 +234,7 @@ pre {
 
 #contentSub, #contentSub2 {
        font-size: 84%;
-       line-height: 1.2;
+       line-height: 1.2em;
        margin: 0 0 1.4em 1em;
        color: #7d7d7d;
        width: auto;
@@ -330,7 +315,7 @@ in the bottom-right corner of the content area */
        font-weight: bold;
        display: block;
        margin: 1em 0;
-       line-height: 1.5;
+       line-height: 1.5em;
 }
 .documentByLine {
        text-align: right;
@@ -452,7 +437,7 @@ div.thumb div a img {
 div.thumb div div.thumbcaption {
        border: none;
        text-align: left;
-       line-height: 1.4;
+       line-height: 1.4em;
        padding: .3em 0 .1em 0;
 }
 div.magnify {
@@ -538,7 +523,7 @@ div.townBox dl dd {
 ** edit views etc
 */
 .special li {
-       line-height: 1.4;
+       line-height: 1.4em;
        margin: 0;
        padding: 0;
 }
@@ -693,7 +678,7 @@ special external link styling */
        padding: 0;
 }
 .portlet ul {
-       line-height: 1.5;
+       line-height: 1.5em;
        list-style-type: square;
        list-style-image: url(bullet.gif);
        font-size: 95%;
@@ -795,7 +780,7 @@ input.searchButton {
        border: none;
        background: none;
        overflow: visible;
-       line-height: 1.2;
+       line-height: 1.2em;
 }
 
 #p-personal h5 {
@@ -813,7 +798,7 @@ input.searchButton {
 /* this is the ul contained in the portlet */
 #p-personal ul {
        border: none;
-       line-height: 1.4;
+       line-height: 1.4em;
        color: #2f6fab;
        padding: 0 2em 0 3em;
        margin: 0;
@@ -831,7 +816,7 @@ input.searchButton {
        display: inline;
        color: #2f6fab;
        margin-left: 1em;
-       line-height: 1.2;
+       line-height: 1.2em;
        background: none;
 }
 #p-personal li.active {
@@ -871,7 +856,7 @@ li#pt-login {
        margin: 0;
        white-space: nowrap;
        width: 76%;
-       line-height: 1.1;
+       line-height: 1.1em;
        overflow: visible;
        background: none;
        border-collapse: collapse;

diff --git a/skins/simple/main.css b/skins/simple/main.css
index fff0b75..e389dfa 100644 (file)
--- a/skins/simple/main.css
+++ b/skins/simple/main.css
@@ -29,7 +29,7 @@ a:hover {
     margin: 0em 0 0 12.2em;
     padding: 0em 1em 1.5em 1em;
     border-left: 1px solid #959595;
-    line-height: 1.5;
+    line-height: 1.5em;
 }
 
 #column-one {
@@ -59,7 +59,7 @@ img {
 }
 p {
     margin: 0.4em 0em 0.5em 0em;
-    line-height: 1.5;
+    line-height: 1.5em;
 }
 p img { margin: 0; }