From c29c5485d7d198bad310cbdd0e565d61d3b98c75 Mon Sep 17 00:00:00 2001 From: droplet Date: Fri, 2 Dec 2011 10:26:56 +0800 Subject: [PATCH 1/3] remove IE7 from Core --- core/misc/vertical-tabs.css | 3 --- core/modules/book/book.theme-rtl.css | 3 --- core/modules/book/book.theme.css | 4 ---- core/modules/overlay/overlay-parent.js | 24 +----------------------- core/modules/system/system.base.css | 1 - core/themes/seven/ie.css | 6 ------ core/themes/seven/ie7.css | 23 ----------------------- core/themes/seven/reset.css | 7 ------- core/themes/seven/template.php | 2 -- 9 files changed, 1 insertions(+), 72 deletions(-) delete mode 100644 core/themes/seven/ie7.css diff --git a/core/misc/vertical-tabs.css b/core/misc/vertical-tabs.css index 505ba1e..4a18e20 100644 --- a/core/misc/vertical-tabs.css +++ b/core/misc/vertical-tabs.css @@ -2,12 +2,10 @@ div.vertical-tabs { margin: 1em 0 1em 15em; /* LTR */ border: 1px solid #ccc; - position: relative; /* IE7 */ } .vertical-tabs ul.vertical-tabs-list { width: 15em; list-style: none; - list-style-image: none; /* IE7 */ border-top: 1px solid #ccc; padding: 0; margin: -1px 0 -1px -15em; /* LTR */ @@ -29,7 +27,6 @@ div.vertical-tabs { border-top: 0; padding: 0; margin: 0; - min-width: 0; /* IE7 */ } .vertical-tabs ul.vertical-tabs-list li a { display: block; diff --git a/core/modules/book/book.theme-rtl.css b/core/modules/book/book.theme-rtl.css index 4a07b65..0fe891c 100644 --- a/core/modules/book/book.theme-rtl.css +++ b/core/modules/book/book.theme-rtl.css @@ -11,9 +11,6 @@ float: right; text-align: right; } -.book-pager .up { - *float: right; -} .book-pager .next { float: left; text-align: left; diff --git a/core/modules/book/book.theme.css b/core/modules/book/book.theme.css index 6af7731..9a807c8 100644 --- a/core/modules/book/book.theme.css +++ b/core/modules/book/book.theme.css @@ -18,12 +18,8 @@ } .book-pager li { display: inline-block; - *display: inline; - /* Prevents a line break caused by the float in .page-next in IE7. */ - *float: left; /* LTR */ list-style-type: none; vertical-align: top; - zoom: 1; } .book-pager .previous { text-align: left; /* LTR */ diff --git a/core/modules/overlay/overlay-parent.js b/core/modules/overlay/overlay-parent.js index 135320f..c58b834 100644 --- a/core/modules/overlay/overlay-parent.js +++ b/core/modules/overlay/overlay-parent.js @@ -421,10 +421,7 @@ Drupal.overlay.eventhandlerAlterDisplacedElements = function (event) { $(this.iframeWindow.document.body).css({ marginTop: Drupal.overlay.getDisplacement('top'), marginBottom: Drupal.overlay.getDisplacement('bottom') - }) - // IE7 isn't reflowing the document immediately. - // @todo This might be fixed in a cleaner way. - .addClass('overlay-trigger-reflow').removeClass('overlay-trigger-reflow'); + }); var documentHeight = this.iframeWindow.document.body.clientHeight; var documentWidth = this.iframeWindow.document.body.clientWidth; @@ -873,18 +870,6 @@ 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 - // 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) { - $('#overlay-disable-message a', context).attr('tabindex', -1); - return; - } - context = context || document.body; var $overlay, $tabbable, $hasTabindex; @@ -920,13 +905,6 @@ 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. - if (jQuery.browser.msie && parseInt(jQuery.browser.version, 10) < 8) { - return; - } - var $needsTabindex; context = context || document.body; diff --git a/core/modules/system/system.base.css b/core/modules/system/system.base.css index 99fcfcb..93ef248 100644 --- a/core/modules/system/system.base.css +++ b/core/modules/system/system.base.css @@ -227,7 +227,6 @@ html.js .js-hide { */ .element-invisible { position: absolute !important; - clip: rect(1px 1px 1px 1px); /* IE7 */ clip: rect(1px, 1px, 1px, 1px); } diff --git a/core/themes/seven/ie.css b/core/themes/seven/ie.css index 4b25695..d1a71ce 100644 --- a/core/themes/seven/ie.css +++ b/core/themes/seven/ie.css @@ -1,9 +1,3 @@ - -/* IE7 renders legends in nested fieldsets without a width. */ -fieldset legend { - height: 1%; -} - /* IE renders absolute positioned legend where fieldset content starts. */ fieldset .fieldset-legend { left: 0; diff --git a/core/themes/seven/ie7.css b/core/themes/seven/ie7.css deleted file mode 100644 index abcdb8a..0000000 --- a/core/themes/seven/ie7.css +++ /dev/null @@ -1,23 +0,0 @@ - -ul.tabs.primary { - padding: 0; -} -ul.primary li, -ul.primary li a, -ul.primary li.active a { - float: none !important; - display: inline; -} -ul.primary li, -ul.primary li a, -ul.primary li a.active, -ul.primary li a:active, -ul.primary li a:visited, -ul.primary li a:hover, -ul.primary li.active a { - zoom: 1; - position: relative; -} -ul.admin-list li { - position: static; -} diff --git a/core/themes/seven/reset.css b/core/themes/seven/reset.css index 306b1f9..de53f28 100644 --- a/core/themes/seven/reset.css +++ b/core/themes/seven/reset.css @@ -200,10 +200,3 @@ ul.inline:after { display: none; clear: none; } -/* IE7 */ -*:first-child + html .form-item, -*:first-child + html ul.links, -*:first-child + html div.admin-panel .body, -*:first-child + html .clearfix { - min-height: 1%; -} diff --git a/core/themes/seven/template.php b/core/themes/seven/template.php index 9804d4d..145ad22 100644 --- a/core/themes/seven/template.php +++ b/core/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), 'weight' => 999, 'preprocess' => FALSE)); - // Add conditional CSS for IE7 and below. - drupal_add_css(path_to_theme() . '/ie7.css', array('group' => CSS_THEME, 'browsers' => array('IE' => 'lte IE 7', '!IE' => FALSE), 'weight' => 999, 'preprocess' => FALSE)); } /** -- 1.7.7.3 From 29b61a881909969460fa76f35ebfb9cfc2dff41c Mon Sep 17 00:00:00 2001 From: droplet Date: Fri, 2 Dec 2011 10:35:36 +0800 Subject: [PATCH 2/3] remove tabindex support of IE7 and below --- core/modules/overlay/overlay-parent.js | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/core/modules/overlay/overlay-parent.js b/core/modules/overlay/overlay-parent.js index c58b834..9850889 100644 --- a/core/modules/overlay/overlay-parent.js +++ b/core/modules/overlay/overlay-parent.js @@ -910,19 +910,7 @@ Drupal.overlay.makeDocumentTabbable = function (context) { // Make the underlying document tabbable again by removing all existing // 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 - // removeAttribute works. - var i; - var length = $tabindex.length; - for (i = 0; i < length; i++) { - $tabindex[i].removeAttribute('tabIndex'); - } - } - else { - $tabindex.removeAttr('tabindex'); - } + $('[tabindex]', context).removeAttr('tabindex'); // Restore the tabindex attributes that existed before the overlay was opened. $needsTabindex = $(Drupal.overlay._hasTabindex, context); -- 1.7.7.3 From d1d67d31b45530aaaad79bd17b6abef174a4b5a1 Mon Sep 17 00:00:00 2001 From: droplet Date: Fri, 2 Dec 2011 10:39:02 +0800 Subject: [PATCH 3/3] remove IE7 supports --- core/misc/tableheader.js | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/core/misc/tableheader.js b/core/misc/tableheader.js index 949ef52..63de30c 100644 --- a/core/misc/tableheader.js +++ b/core/misc/tableheader.js @@ -98,10 +98,6 @@ Drupal.tableHeader.prototype.eventhandlerRecalculateStickyHeader = function (eve // Resize header and its cell widths. this.stickyHeaderCells.each(function (index) { var cellWidth = self.originalHeaderCells.eq(index).css('width'); - // Exception for IE7. - if (cellWidth == 'auto') { - cellWidth = self.originalHeaderCells.get(index).clientWidth + 'px'; - } $(this).css('width', cellWidth); }); this.stickyTable.css('width', this.originalTable.css('width')); -- 1.7.7.3