From 56fbef2a6cd1222138e2adb55238a1dd4e4c35b0 Mon Sep 17 00:00:00 2001 From: Tom Gilder Date: Thu, 13 Jan 2005 21:09:57 +0000 Subject: [PATCH] Merged my changes from 1.4 --- skins/MonoBook.php | 1 + skins/common/IEFixes.js | 47 +++++++++++++++++++++------------ skins/disabled/Amethyst.pt | 1 + skins/disabled/MonoBook.pt | 1 + skins/disabled/WikimediaWiki.pt | 1 + skins/monobook/IE55Fixes.css | 15 +++++++---- skins/monobook/main.css | 31 ++++++---------------- 7 files changed, 52 insertions(+), 45 deletions(-) diff --git a/skins/MonoBook.php b/skins/MonoBook.php index 88c29aa1ec..d34b4395eb 100644 --- a/skins/MonoBook.php +++ b/skins/MonoBook.php @@ -111,6 +111,7 @@ class MonoBookTemplate extends QuickTemplate { href="data['nav_urls']['mainpage']['href'])?>" title="msg('mainpage') ?>"> +
msg('navigation') ?>
diff --git a/skins/common/IEFixes.js b/skins/common/IEFixes.js index 68debfe745..2d2ba672bd 100644 --- a/skins/common/IEFixes.js +++ b/skins/common/IEFixes.js @@ -2,6 +2,7 @@ var isMSIE55 = (window.showModalDialog && window.clipboardData && window.createPopup); var doneIETransform; +var doneIEAlphaFix; if (document.attachEvent) document.attachEvent('onreadystatechange', hookit); @@ -9,33 +10,45 @@ if (document.attachEvent) function hookit() { if (!doneIETransform && document.getElementById && document.getElementById('bodyContent')) { doneIETransform = true; - fixalpha(); relativeforfloats(); + fixalpha(); } } // png alpha transparency fixes function fixalpha() { // bg - if (isMSIE55) { - var plogo = document.getElementById('p-logo'); - var logoa = plogo.getElementsByTagName('a')[0]; - var bg = logoa.currentStyle.backgroundImage; - var imageUrl = bg.substring(5, bg.length-2); + if (!doneIEAlphaFix) + { + doneIEAlphaFix = true; + var plogo = document.getElementById('p-logo'); + var logoa = plogo.getElementsByTagName('a')[0]; + var bg = logoa.currentStyle.backgroundImage; + var imageUrl = bg.substring(5, bg.length-2); - if (imageUrl.substr(imageUrl.length-4).toLowerCase() == '.png') { - var logospan = logoa.appendChild(document.createElement('span')); - - logoa.style.backgroundImage = 'none'; - logospan.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src='+imageUrl+')'; - logospan.style.height = '100%'; - logospan.style.position = 'absolute'; - logospan.style.width = '100%'; - logospan.style.cursor = 'hand'; - // Center image with hack for IE5.5 + if (imageUrl.substr(imageUrl.length-4).toLowerCase() == '.png') { + var logospan = logoa.appendChild(document.createElement('span')); + + logoa.style.backgroundImage = 'none'; + logospan.style.filter = 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src=' + imageUrl + ')'; + logospan.style.height = '100%'; + logospan.style.position = 'absolute'; + logospan.style.width = logoa.currentStyle.width; + logospan.style.cursor = 'hand'; + // Center image with hack for IE5.5 + if (document.documentElement.dir == "rtl") + { + logospan.style.right = '50%'; + logospan.style.setExpression('marginRight', '"-" + (this.offsetWidth / 2) + "px"'); + } + else + { logospan.style.left = '50%'; logospan.style.setExpression('marginLeft', '"-" + (this.offsetWidth / 2) + "px"'); - } + } + logospan.style.top = '50%'; + logospan.style.setExpression('marginTop', '"-" + (this.offsetHeight / 2) + "px"'); + } } } diff --git a/skins/disabled/Amethyst.pt b/skins/disabled/Amethyst.pt index 1cf115c765..48a698b1c4 100644 --- a/skins/disabled/Amethyst.pt +++ b/skins/disabled/Amethyst.pt @@ -59,6 +59,7 @@ +
Navigation
diff --git a/skins/disabled/MonoBook.pt b/skins/disabled/MonoBook.pt index 2614b017c4..59a2e20e54 100644 --- a/skins/disabled/MonoBook.pt +++ b/skins/disabled/MonoBook.pt @@ -59,6 +59,7 @@ +
Navigation
diff --git a/skins/disabled/WikimediaWiki.pt b/skins/disabled/WikimediaWiki.pt index 412ad8f50e..06f8761a8f 100644 --- a/skins/disabled/WikimediaWiki.pt +++ b/skins/disabled/WikimediaWiki.pt @@ -59,6 +59,7 @@ +
Navigation
diff --git a/skins/monobook/IE55Fixes.css b/skins/monobook/IE55Fixes.css index ad20b20bcc..2f7856123a 100644 --- a/skins/monobook/IE55Fixes.css +++ b/skins/monobook/IE55Fixes.css @@ -37,16 +37,21 @@ body { font-size: xx-small; } float: none; } #p-cactions li { - float: left; - padding-top: 0; padding-bottom: 0 !important; - height: 0.9em; + border: none; + background-color: transparent; + cursor: default; + float: none !important; } #p-cactions li a { - display: block; - padding-bottom: 0.045em; + display: inline-block !important; + vertical-align: top; + padding-bottom: 0; + border: solid #aaa; + border-width: 1px 1px 0; } #p-cactions li.selected a { + border-color: #fabd23; padding-bottom: 0.17em; } #p-cactions li a:hover { diff --git a/skins/monobook/main.css b/skins/monobook/main.css index e8693426e2..f564ee4754 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -155,24 +155,14 @@ form { } textarea { - border: 1px solid #2f6fab; color: Black; background-color: white; width: 100%; padding: 0.1em; overflow: auto; } -/* hide this from ie/mac and konq2.2 */ -@media All { - head:first-child+body input { - visibility: visible; - border: 1px solid #2f6fab; - color: Black; - background-color: white; - vertical-align: middle; - padding: 0.2em; - } -} + + input.historysubmit { padding: 0 0.3em 0.3em 0.3em !important; font-size: 94%; @@ -180,13 +170,8 @@ input.historysubmit { height: 1.7em !important; margin-left: 1.6em; } -input[type="radio"], -input[type="checkbox"] { border:none; } select { - border: 1px solid #2f6fab; - color: Black; - background: White; - vertical-align: top; + vertical-align: top; } abbr, acronym, .explain { border-bottom: 1px dotted Black; @@ -637,14 +622,14 @@ special external link styling */ } input.searchButton { margin-top:1px; - padding: 0 0.4em !important; font-size: 95%; - cursor: pointer; - background-color: White; - border: 1px solid #2f6fab; +} +#searchGoButton { + padding-left: .5em; + padding-right: .5em; + font-weight: bold; } #searchInput { - border: 1px solid #2f6fab; width:10.9em; margin: 0 0 0 0; font-size: 95%; -- 2.20.1