From aa04db022ec0ceeb28266847ce81e10aaecae865 Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Thu, 3 Jun 2010 18:07:16 +0000 Subject: [PATCH] Follow up to 66670 which in turn is a follow up to r66646. prefix the remaining id selectors with div Doing just some of them caused breakage on IE6, as the selectors in main had higher speciftivity then those in IE60Fixes. So add div to all of them. --- skins/monobook/IE50Fixes.css | 8 ++++---- skins/monobook/IE55Fixes.css | 8 ++++---- skins/monobook/IE60Fixes.css | 8 ++++---- skins/monobook/IE70Fixes.css | 6 +++--- skins/monobook/Opera6Fixes.css | 2 +- skins/monobook/main.css | 10 +++++----- skins/monobook/rtl.css | 14 +++++++------- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/skins/monobook/IE50Fixes.css b/skins/monobook/IE50Fixes.css index 26c3dc975f..1f51e9f077 100644 --- a/skins/monobook/IE50Fixes.css +++ b/skins/monobook/IE50Fixes.css @@ -2,22 +2,22 @@ ** IE5.0 Fix Stylesheet */ -#column-content { +div#column-content { margin: 0 !important; float: none; } -#column-content #content { +div#column-content #content { margin-top: 3em; height: 1%; } -#column-one { +div#column-one { position: absolute; overflow: visible; top: 0; left: 0; z-index: 3; } -#footer { +div#footer { margin: 0 0 0 13.6em; } diff --git a/skins/monobook/IE55Fixes.css b/skins/monobook/IE55Fixes.css index 637daae17f..7fc144d626 100644 --- a/skins/monobook/IE55Fixes.css +++ b/skins/monobook/IE55Fixes.css @@ -1,25 +1,25 @@ /* IE5.5/win- only fixes */ -#column-content { +div#column-content { float: none; margin-left: 0; height: 1%; } -#column-content #content { +div#column-content #content { position: relative; z-index: 5; margin-left: 12.2em; margin-top: 3em; height: 1%; } -#column-one { +div#column-one { position: absolute; top: 0; left: 0; z-index: 4; width: 100%; } -#footer { +div#footer { margin-left: 13.6em; border-left: 1px solid #fabd23; } diff --git a/skins/monobook/IE60Fixes.css b/skins/monobook/IE60Fixes.css index e6e447f6f5..f32b330f0e 100644 --- a/skins/monobook/IE60Fixes.css +++ b/skins/monobook/IE60Fixes.css @@ -1,23 +1,23 @@ /* 6.0 - only fixes */ /* content area */ /* workaround for various ie float bugs */ -#column-content { +div#column-content { float: none; margin-left: 0; height: 1%; } -#column-content #content { +div#column-content div#content { margin-left: 12.2em; margin-top: 3em; height: 1%; } -#column-one { +div#column-one { position: absolute; top: 0; left: 0; z-index: 4; } -#footer { +div#footer { margin-left: 13.6em; border-left: 1px solid #fabd23; } diff --git a/skins/monobook/IE70Fixes.css b/skins/monobook/IE70Fixes.css index 00145860f8..64fd742204 100644 --- a/skins/monobook/IE70Fixes.css +++ b/skins/monobook/IE70Fixes.css @@ -3,13 +3,13 @@ /* workaround for various ie float bugs */ /* This bit is needed to make links clickable... WTF */ -#column-content #content { +div#column-content div#content { margin-left: 12.2em; margin-top: 3em; height: 1%; } -.rtl #column-one { +.rtl div#column-one { /* For some reason it tries to inherit the padding-top into every div, * and I can't figure out how to get it back off. * Margin works correctly for this use, though. @@ -78,7 +78,7 @@ div.tleft { */ -#footer li { +div#footer li { /* Work around bug with inline
  • tags with right margins and nowrap */ margin-right: 0; } diff --git a/skins/monobook/Opera6Fixes.css b/skins/monobook/Opera6Fixes.css index 2a3d78f898..77dec0955e 100644 --- a/skins/monobook/Opera6Fixes.css +++ b/skins/monobook/Opera6Fixes.css @@ -1,5 +1,5 @@ /* opera 6 fixes */ -#column-one { +div#column-one { position: relative; max-width: 11.7em; } diff --git a/skins/monobook/main.css b/skins/monobook/main.css index 1403ff942b..4e1f4e0ea2 100644 --- a/skins/monobook/main.css +++ b/skins/monobook/main.css @@ -1091,8 +1091,8 @@ div#userloginForm .captcha { /* more IE fixes */ /* float/negative margin brokenness */ -* html #footer {margin-top: 0;} -* html #column-content { +* html div#footer {margin-top: 0;} +* html div#column-content { display: inline; margin-bottom: 0; } @@ -1100,15 +1100,15 @@ div#userloginForm .captcha { #pagehistory li.selected { position: relative; } /* Mac IE 5.0 fix; floated content turns invisible */ -* > html #column-content { +* > html div#column-content { float: none; } -* > html #column-one { +* > html div#column-one { position: absolute; left: 0; top: 0; } -* > html #footer { +* > html div#footer { margin-left: 13.2em; } .redirectText { diff --git a/skins/monobook/rtl.css b/skins/monobook/rtl.css index b9bf43c0a4..f61c8efe30 100644 --- a/skins/monobook/rtl.css +++ b/skins/monobook/rtl.css @@ -26,11 +26,11 @@ body { direction: rtl; unicode-bidi: embed; } -#column-content { +div#column-content { margin: 0 -12.2em 0 0; float: left; } -#column-content #content{ +div#column-content div#content{ margin-left: 0; margin-right: 12.2em; border-right: 1px solid #aaaaaa; @@ -153,7 +153,7 @@ li#ca-watch { background: none !important; } */ -#footer { +div#footer { clear: both; } #f-poweredbyico { @@ -164,22 +164,22 @@ li#ca-watch { float: right; height: 1%; } -* html #footer { +* html div#footer { margin-left: 0; margin-right: 13.6em; border-left: 0; border-right: 1px solid #fabd23; } -* html #column-content { +* html div#column-content { float: none; margin-left: 0; margin-right: 0; } -* html #column-content #content { +* html div#column-content div#content { margin-left: 0; margin-top: 3em; } -* html #column-one { right: 0; } +* html div#column-one { right: 0; } /* js pref toc */ -- 2.20.1