From 88b7a2afa124830c1ef2c18b2592a21cb1970756 Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Fri, 13 Oct 2006 07:06:38 +0000 Subject: [PATCH] (bug 2013) Use numbers instead of em specifications for line-height so that the ratio and not the computed value is inherited. --- RELEASE-NOTES | 1 + skins/chick/main.css | 18 +++++++++--------- skins/common/commonPrint.css | 2 +- skins/monobook/main.css | 32 ++++++++++++++++---------------- skins/simple/main.css | 4 ++-- 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 2df592aa38..d35be10363 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -43,6 +43,7 @@ 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 == Languages updated == diff --git a/skins/chick/main.css b/skins/chick/main.css index 00cab8113a..e1515ee03c 100644 --- 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.5em; + line-height: 1.5; } p img { margin: 0; } @@ -66,12 +66,12 @@ h6 { font-size: 80%; } } ul { - line-height: 1.5em; + line-height: 1.5; margin: 0.3em 0 0 1.5em; padding:0; } ol { - line-height: 1.5em; + line-height: 1.5; 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.5em; + line-height: 1.5; 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.5em; + line-height: 1.5; } legend { background: White; @@ -156,7 +156,7 @@ pre { border: 1px dashed #2f6fab; color: Black; background-color: #f9f9f9; - line-height: 1.1em; + line-height: 1.1; } /* @@ -211,7 +211,7 @@ in the bottom-right corner of the content area */ font-weight: bold; display: block; margin: 1em 0em; - line-height: 1.5em; + line-height: 1.5; } .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.4em; + line-height: 1.4; 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.4em; + line-height: 1.4; margin: 0; padding: 0; } diff --git a/skins/common/commonPrint.css b/skins/common/commonPrint.css index e23c50b1fe..1b5df9a23b 100644 --- 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.2em; + line-height: 1.2; } .tocindent p { diff --git a/skins/monobook/main.css b/skins/monobook/main.css index 6b57ed9e6b..c88a4da729 100644 --- 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.5em; + line-height: 1.5; position: relative; z-index: 2; } @@ -95,7 +95,7 @@ img { } p { margin: .4em 0 .5em 0; - line-height: 1.5em; + line-height: 1.5; } p img { margin: 0; @@ -135,14 +135,14 @@ div.editsection { } ul { - line-height: 1.5em; + line-height: 1.5; list-style-type: square; margin: .3em 0 0 1.5em; padding: 0; list-style-image: url(bullet.gif); } ol { - line-height: 1.5em; + line-height: 1.5; margin: .3em 0 0 3.2em; padding: 0; list-style-image: none; @@ -159,7 +159,7 @@ dl { margin-bottom: .5em; } dd { - line-height: 1.5em; + line-height: 1.5; margin-left: 2em; margin-bottom: .1em; } @@ -168,7 +168,7 @@ fieldset { border: 1px solid #2f6fab; margin: 1em 0 1em 0; padding: 0 1em 1em; - line-height: 1.5em; + line-height: 1.5; } legend { padding: .5em; @@ -217,7 +217,7 @@ pre { border: 1px dashed #2f6fab; color: black; background-color: #f9f9f9; - line-height: 1.1em; + line-height: 1.1; } /* @@ -234,7 +234,7 @@ pre { #contentSub, #contentSub2 { font-size: 84%; - line-height: 1.2em; + line-height: 1.2; margin: 0 0 1.4em 1em; color: #7d7d7d; width: auto; @@ -315,7 +315,7 @@ in the bottom-right corner of the content area */ font-weight: bold; display: block; margin: 1em 0; - line-height: 1.5em; + line-height: 1.5; } .documentByLine { text-align: right; @@ -437,7 +437,7 @@ div.thumb div a img { div.thumb div div.thumbcaption { border: none; text-align: left; - line-height: 1.4em; + line-height: 1.4; padding: .3em 0 .1em 0; } div.magnify { @@ -523,7 +523,7 @@ div.townBox dl dd { ** edit views etc */ .special li { - line-height: 1.4em; + line-height: 1.4; margin: 0; padding: 0; } @@ -678,7 +678,7 @@ special external link styling */ padding: 0; } .portlet ul { - line-height: 1.5em; + line-height: 1.5; list-style-type: square; list-style-image: url(bullet.gif); font-size: 95%; @@ -780,7 +780,7 @@ input.searchButton { border: none; background: none; overflow: visible; - line-height: 1.2em; + line-height: 1.2; } #p-personal h5 { @@ -798,7 +798,7 @@ input.searchButton { /* this is the ul contained in the portlet */ #p-personal ul { border: none; - line-height: 1.4em; + line-height: 1.4; color: #2f6fab; padding: 0 2em 0 3em; margin: 0; @@ -816,7 +816,7 @@ input.searchButton { display: inline; color: #2f6fab; margin-left: 1em; - line-height: 1.2em; + line-height: 1.2; background: none; } #p-personal li.active { @@ -856,7 +856,7 @@ li#pt-login { margin: 0; white-space: nowrap; width: 76%; - line-height: 1.1em; + line-height: 1.1; overflow: visible; background: none; border-collapse: collapse; diff --git a/skins/simple/main.css b/skins/simple/main.css index e389dfa87c..fff0b753df 100644 --- 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.5em; + line-height: 1.5; } #column-one { @@ -59,7 +59,7 @@ img { } p { margin: 0.4em 0em 0.5em 0em; - line-height: 1.5em; + line-height: 1.5; } p img { margin: 0; } -- 2.20.1