diff --git a/misc/tabledrag.js b/misc/tabledrag.js index b566168..b599f1d 100644 --- a/misc/tabledrag.js +++ b/misc/tabledrag.js @@ -304,11 +304,6 @@ Drupal.tableDrag.prototype.makeDraggable = function (item) { $(self.oldRowElement).removeClass('drag-previous'); } - // Hack for IE6 that flickers uncontrollably if select lists are moved. - if (navigator.userAgent.indexOf('MSIE 6.') != -1) { - $('select', this.table).css('display', 'none'); - } - // Hack for Konqueror, prevent the blur handler from firing. // Konqueror always gives links focus, even after returning false on mousedown. self.safeBlur = false; @@ -562,11 +557,6 @@ Drupal.tableDrag.prototype.dropRow = function (event, self) { self.dragObject = null; $('body').removeClass('drag'); clearInterval(self.scrollInterval); - - // Hack for IE6 that flickers uncontrollably if select lists are moved. - if (navigator.userAgent.indexOf('MSIE 6.') != -1) { - $('select', this.table).css('display', 'block'); - } } }; diff --git a/misc/vertical-tabs.css b/misc/vertical-tabs.css index 10e8153..1f86bcf 100644 --- a/misc/vertical-tabs.css +++ b/misc/vertical-tabs.css @@ -2,15 +2,13 @@ div.vertical-tabs { margin: 1em 0 1em 15em; /* LTR */ border: 1px solid #ccc; - position: relative; /* IE6/7 */ + position: relative; /* IE7 */ } .vertical-tabs ul.vertical-tabs-list { width: 15em; list-style: none; - list-style-image: none; /* IE6 */ border-top: 1px solid #ccc; padding: 0; - position: relative; /* IE6 */ margin: -1px 0 -1px -15em; /* LTR */ float: left; /* LTR */ } @@ -71,7 +69,3 @@ div.vertical-tabs { -webkit-box-sizing: border-box; box-sizing: border-box; } -* html .vertical-tabs .form-type-textfield, -* html .vertical-tabs .form-textarea-wrapper { - width: 95%; /* IE6 */ -} diff --git a/modules/color/color.js b/modules/color/color.js index 43099ad..3e53ce1 100644 --- a/modules/color/color.js +++ b/modules/color/color.js @@ -43,14 +43,6 @@ Drupal.behaviors.color = { } } - // Fix preview background in IE6. - if (navigator.appVersion.match(/MSIE [0-6]\./)) { - var e = $('#preview #img')[0]; - var image = e.currentStyle.backgroundImage; - e.style.backgroundImage = 'none'; - e.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=crop, src='" + image.substring(5, image.length - 2) + "')"; - } - // Set up colorScheme selector. $('#edit-scheme', form).change(function () { var schemes = settings.color.schemes, colorScheme = this.options[this.selectedIndex].value; diff --git a/modules/overlay/overlay-child.css b/modules/overlay/overlay-child.css index a832fc8..6fdda8a 100644 --- a/modules/overlay/overlay-child.css +++ b/modules/overlay/overlay-child.css @@ -134,15 +134,6 @@ html.js body { } /** - * IE6 shows elements with position:fixed as position:static so replace - * it with position:absolute; - */ -* html #overlay-close, -* html #overlay-close:hover { - position: absolute; -} - -/** * Disable message. */ #overlay-disable-message { diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js index 8f11df6..af07b92 100644 --- a/modules/overlay/overlay-parent.js +++ b/modules/overlay/overlay-parent.js @@ -376,11 +376,6 @@ Drupal.overlay.eventhandlerOuterResize = function (event) { return; } - // IE6 uses position:absolute instead of position:fixed. - if (typeof document.body.style.maxHeight != 'string') { - this.activeFrame.height($(window).height()); - } - // Allow other scripts to respond to this event. $(document).trigger('drupalOverlayResize'); }; @@ -410,7 +405,6 @@ Drupal.overlay.eventhandlerAlterDisplacedElements = function (event) { var documentHeight = this.iframeWindow.document.body.clientHeight; var documentWidth = this.iframeWindow.document.body.clientWidth; - // IE6 doesn't support maxWidth, use width instead. var maxWidthName = (typeof document.body.style.maxWidth == 'string') ? 'maxWidth' : 'width'; // Consider any element that should be visible above the overlay (such as @@ -825,11 +819,11 @@ Drupal.overlay.getDisplacement = function (region) { * the entire page. */ Drupal.overlay.makeDocumentUntabbable = function (context) { - // Manipulating tabindexes for the entire document is unacceptably slow in IE6 - // and IE7, so in those browsers, the underlying page will still be reachable - // via the tab key. However, we still make the links within the Disable - // message unreachable, because the same message also exists within the - // child document. The duplicate copy in the underlying document is only for + // Manipulating tabindexes for the entire document is unacceptably slow in + // IE7, so in that browser, the underlying page will still be reachable via + // the tab key. However, we still make the links within the Disable message + // unreachable, because the same message also exists within the child + // document. The duplicate copy in the underlying document is only for // assisting screen-reader users navigating the document with reading commands // that follow markup order rather than tab order. if (jQuery.browser.msie && parseInt(jQuery.browser.version, 10) < 8) { @@ -872,9 +866,9 @@ Drupal.overlay.makeDocumentUntabbable = function (context) { * the entire page. */ Drupal.overlay.makeDocumentTabbable = function (context) { - // Manipulating tabindexes is unacceptably slow in IE6 and IE7. In those - // browsers, the underlying page was never made unreachable via tab, so - // there is no work to be done here. + // Manipulating tabindexes is unacceptably slow in IE7. In that browser, the + // underlying page was never made unreachable via tab, so there is no work to + // be done here. if (jQuery.browser.msie && parseInt(jQuery.browser.version, 10) < 8) { return; } @@ -886,7 +880,7 @@ Drupal.overlay.makeDocumentTabbable = function (context) { // tabindex attributes. var $tabindex = $('[tabindex]', context); if (jQuery.browser.msie && parseInt(jQuery.browser.version, 10) < 8) { - // removeAttr('tabindex') is broken in IE6-7, but the DOM function + // removeAttr('tabindex') is broken in IE7, but the DOM function // removeAttribute works. var i; var length = $tabindex.length; diff --git a/modules/system/system.admin.css b/modules/system/system.admin.css index 43340b5..7299484 100644 --- a/modules/system/system.admin.css +++ b/modules/system/system.admin.css @@ -243,7 +243,6 @@ table.screenshot { .exposed-filters .filters { float: left; /* LTR */ margin-right: 1em; /* LTR */ - width: 25em; /* IE6 */ } .exposed-filters .form-item { margin: 0 0 0.1em 0; diff --git a/modules/system/system.base.css b/modules/system/system.base.css index a6748de..4ce63cf 100644 --- a/modules/system/system.base.css +++ b/modules/system/system.base.css @@ -227,7 +227,7 @@ html.js .js-hide { */ .element-invisible { position: absolute !important; - clip: rect(1px 1px 1px 1px); /* IE6, IE7 */ + clip: rect(1px 1px 1px 1px); /* IE7 */ clip: rect(1px, 1px, 1px, 1px); } @@ -253,10 +253,6 @@ html.js .js-hide { clear: both; visibility: hidden; } -/* IE6 */ -* html .clearfix { - height: 1%; -} /* IE7 */ *:first-child + html .clearfix { min-height: 1%; diff --git a/themes/bartik/css/ie6.css b/themes/bartik/css/ie6.css deleted file mode 100644 index 435fab0..0000000 --- a/themes/bartik/css/ie6.css +++ /dev/null @@ -1,18 +0,0 @@ - -#content { - overflow: hidden; -} -.form-item-search-block-form { - width: 50%; -} -.tabs ul.primary, -.region-header .block-menu li a, -.comment-form .form-item { - zoom: 1; -} -#block-search-form .form-item-search-block-form input { - width: 67%; -} -.node-teaser { - border-bottom: 1px solid #d3d7d9; -} diff --git a/themes/bartik/template.php b/themes/bartik/template.php index d523a0a..8d2b8c4 100644 --- a/themes/bartik/template.php +++ b/themes/bartik/template.php @@ -23,7 +23,6 @@ function bartik_preprocess_html(&$variables) { // Add conditional stylesheets for IE drupal_add_css(path_to_theme() . '/css/ie.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 7', '!IE' => FALSE), 'preprocess' => FALSE)); - drupal_add_css(path_to_theme() . '/css/ie6.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'IE 6', '!IE' => FALSE), 'preprocess' => FALSE)); } /** diff --git a/themes/garland/fix-ie-rtl.css b/themes/garland/fix-ie-rtl.css deleted file mode 100644 index fb1901b..0000000 --- a/themes/garland/fix-ie-rtl.css +++ /dev/null @@ -1,61 +0,0 @@ - -body { - /* Center layout */ - text-align: center; -} - -#squeeze { - zoom: 1; - direction: ltr; -} - -#squeeze .left-corner { - direction: rtl -} - -#header-region, -#wrapper #container { - /* Reset text alignment */ - text-align: right; -} - -#wrapper #container #center { - /* Reduce amount of damage done by extremely wide content */ - overflow: hidden; -} - -#wrapper #container #center .right-corner .left-corner { - /* Because of the lack of min-height, we use height as an alternative */ - height: 400px; -} - -fieldset { - /* Don't draw backgrounds on fieldsets in IE, as they look really bad. */ - background: none; -} - -/* Prevent fieldsets from shifting when changing collapsed state. */ -html.js fieldset.collapsible { - top: -1em; -} - -html.js fieldset.collapsed { - top: 0; - margin-bottom: 1em; -} - -tr.menu-disabled { - /* Use filter to emulate CSS3 opacity */ - filter: alpha(opacity=50); -} - -#header-region { - /* Because of the lack of min-height, we use height as an alternative */ - height: 1em; -} - -#attach-hide label, -#uploadprogress div.message { - /* Fading elements in IE causes the text to bleed unless they have a background. */ - background-color: #ffffff; -} diff --git a/themes/garland/fix-ie.css b/themes/garland/fix-ie.css deleted file mode 100644 index 1a1c131..0000000 --- a/themes/garland/fix-ie.css +++ /dev/null @@ -1,65 +0,0 @@ - -body { - /* Center layout */ - text-align: center; -} - -#header-region, -#wrapper #container { - /* Reset text alignment */ - text-align: left; /* LTR */ -} - -#wrapper #container #center { - /* Reduce amount of damage done by extremely wide content */ - overflow: hidden; -} - -#wrapper #container #center .right-corner .left-corner { - /* Because of the lack of min-height, we use height as an alternative */ - height: 400px; -} - -fieldset { - /* Don't draw backgrounds on fieldsets in IE, as they look really bad. */ - background: none; -} - -div.vertical-tabs ul.vertical-tabs-list li.first { - background-image: none; -} - -ul.primary { - /* Fix missing top margin */ - position: relative; /* LTR */ -/* top: 0.5em; */ -} - -/* Prevent fieldsets from shifting when changing collapsed state. */ -html.js fieldset.collapsible { - top: -1em; -} -html.js fieldset.collapsed { - top: 0; - margin-bottom: 1em; -} - -tr.menu-disabled { - /* Use filter to emulate CSS3 opacity */ - filter: alpha(opacity=50); -} - -#header-region { - /* Because of the lack of min-height, we use height as an alternative */ - height: 1em; -} - -tr.taxonomy-term-preview { - filter: alpha(opacity=50); -} - -#attach-hide label, -#uploadprogress div.message { - /* Fading elements in IE causes the text to bleed unless they have a background. */ - background-color: #ffffff; -} diff --git a/themes/garland/template.php b/themes/garland/template.php index 1b144f1..fc09571 100644 --- a/themes/garland/template.php +++ b/themes/garland/template.php @@ -40,8 +40,6 @@ function garland_preprocess_html(&$vars) { if (theme_get_setting('garland_width') == 'fluid') { $vars['classes_array'][] = 'fluid-width'; } - // Add conditional CSS for IE6. - drupal_add_css(path_to_theme() . '/fix-ie.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lt IE 7', '!IE' => FALSE), 'preprocess' => FALSE)); } /** diff --git a/themes/seven/ie6.css b/themes/seven/ie6.css deleted file mode 100644 index 7d1c320..0000000 --- a/themes/seven/ie6.css +++ /dev/null @@ -1,17 +0,0 @@ - -ul.menu li, -ul.menu li a, -ul.links li, -ul.links li a, -.action-links, -#page { - height: 1%; -} -#block-system-main ul.admin-list li a { - height: 1px; - position: relative; - display: block; -} -#block-system-main ul.admin-list li div.description a { - display: inline; -} diff --git a/themes/seven/template.php b/themes/seven/template.php index 4582749..dbfffd5 100644 --- a/themes/seven/template.php +++ b/themes/seven/template.php @@ -18,8 +18,6 @@ function seven_preprocess_maintenance_page(&$vars) { function seven_preprocess_html(&$vars) { // Add conditional CSS for IE8 and below. drupal_add_css(path_to_theme() . '/ie.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE), 'preprocess' => FALSE)); - // Add conditional CSS for IE6. - drupal_add_css(path_to_theme() . '/ie6.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lt IE 7', '!IE' => FALSE), 'preprocess' => FALSE)); } /** diff --git a/themes/seven/vertical-tabs.css b/themes/seven/vertical-tabs.css index 4f66222..f06aade 100644 --- a/themes/seven/vertical-tabs.css +++ b/themes/seven/vertical-tabs.css @@ -87,7 +87,3 @@ div.vertical-tabs .vertical-tabs-panes legend { -webkit-box-sizing: border-box; box-sizing: border-box; } -* html .vertical-tabs .form-type-textfield, -* html .vertical-tabs .form-textarea-wrapper { - width: 95%; /* IE6 */ -} diff --git a/themes/stark/layout.css b/themes/stark/layout.css index 43bb93f..7e49d74 100644 --- a/themes/stark/layout.css +++ b/themes/stark/layout.css @@ -10,9 +10,7 @@ * This layout method works reasonably well, but shouldn't be used on a * production site because it can break. For example, if an over-large image * (one that is wider than 20% of the viewport) is in the left sidebar, the - * image will overlap with the #content to the right. The exception to this - * is IE6 which will just hide the navigation block completely in these - * instances due to a positioning bug. + * image will overlap with the #content to the right. */ #content,