Bug 956190 (part 3): Remove IE-fixes.css (Internet Explorer 7 and older are no longer...

r/a=justdave

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 3766137a52b1355397382f9432816c5f31481eba..b8fcae1079611394bd9a8d1a7f0058c2cc2c6d05 100644 (file)
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -428,15 +428,13 @@ sub mtime_filter {
 #  1. YUI CSS
 #  2. Standard Bugzilla stylesheet set (persistent)
 #  3. Third-party "skin" stylesheet set, per user prefs (persistent)
-#  4. Page-specific styles
-#  5. Custom Bugzilla stylesheet set (persistent)
+#  4. Custom Bugzilla stylesheet set (persistent)
 
 sub css_files {
     my ($style_urls, $yui, $yui_css) = @_;
-    
-    # global.css goes on every page, and so does IE-fixes.css.
-    my @requested_css = ('skins/standard/global.css', @$style_urls,
-                         'skins/standard/IE-fixes.css');
+
+    # global.css goes on every page.
+    my @requested_css = ('skins/standard/global.css', @$style_urls);
 
     my @yui_required_css;
     foreach my $yui_name (@$yui) {

diff --git a/skins/standard/IE-fixes.css b/skins/standard/IE-fixes.css
deleted file mode 100644 (file)
index 65f33a6..0000000
--- a/skins/standard/IE-fixes.css
+++ /dev/null
@@ -1,58 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This Source Code Form is "Incompatible With Secondary Licenses", as
- * defined by the Mozilla Public License, v. 2.0.
- */
-
-.bz_comment_text, .uneditable_textarea, tbody.file pre {
-     white-space: pre;
-     word-wrap: break-word;
-}
-
-.component_table {
-    margin-top: .5em;
-}
-
-form#Create #comp_desc {
-    margin: .5em 1em;
-}
-
-#footer #useful-links li {
-    padding-bottom: 0.8ex;
-}
-
-#footer .label {
-    display: block;
-    float: left;
-    width: 8.2em;
-    padding-bottom: 0.1ex;
-}
-
-#footer #links-actions .label {
-    padding-top: 0.35em;
-}
-
-#footer .links {
-    display: inline;
-}
-
-#bug_id_container, .search_field_grid, 
-.search_email_fields, ul.bug_changes li { 
-    zoom: 1;
-    display: inline;
-}
-
-#keywords_container .yui-ac-content {
-    _height: 30em; /* ie6 */
-}
-
-.bz_short_desc_column a, .bz_short_short_desc_column a {
-    /* color:inherit */
-    color: expression(this.parentNode.currentStyle['color']);
-}
-
-#graphical_report {
-  width: auto\9; /* IE6-8 */
-}

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 7d39ab9091155c071c92c5852089155f6671c74c..427934264770b6bfb8af6cbd2465eddc57800929 100644 (file)
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -266,14 +266,6 @@
     [% END %]
 
 [% BLOCK format_css_link %]
-  [% IF style_url.match('/IE-fixes\.css') %]
-    <!--[if lte IE 7]>
-      [%# Internet Explorer treats [if IE] HTML comments as uncommented.
-        # We use it to import CSS fixes so that Bugzilla looks decent on IE 7
-        # and below.
-        #%]
-  [% END %]
-
   [% IF css_set_name == 'standard' %]
     [% SET css_title_link = '' %]
   [% ELSE %]
@@ -284,8 +276,6 @@
 
   <link href="[% style_url FILTER html %]" rel="stylesheet"
         type="text/css" [% css_title_link FILTER none %]>
-
-  [% '<![endif]-->' IF style_url.match('/IE-fixes\.css') %]
 [% END %]
 
 [% BLOCK format_js_link %]