Fix some icon may still incorrect, #48

* Fix close tab icon incorrect with Dark Fox theme on Fx40 only
** protected icon is invisible when not hover on Fx39 and earlier
* Linux should use the same image with Windows instead of Mac
* Cleanup some CSS, drop some icon compatibility for older versions

chrome/content/tabutils.js

@@ -53,8 +53,6 @@ var tabutils = {
     document.documentElement.setAttribute("v17", true);
     document.documentElement.setAttribute("v29", this.fxVersion >= 29.0);
     document.documentElement.setAttribute("v31", this.fxVersion >= 31.0);
-    document.documentElement.setAttribute("v40", this.fxVersion >= 40.0);
-    document.documentElement.setAttribute("v41", this.fxVersion >= 41.0);
 
     gBrowser.mTabContainer._originalAdjustTabstripFunc = gBrowser.mTabContainer.adjustTabstrip;
     gBrowser.mTabContainer.adjustTabstrip = function adjustTabstrip() {

chrome/content/tabutils.xul

@@ -5,8 +5,6 @@
 <?xml-stylesheet href="chrome://tabutils/skin/tabutils_fx14.css" type="text/css"?>
 <?xml-stylesheet href="chrome://tabutils/skin/tabutils_fx29.css" type="text/css"?>
 <?xml-stylesheet href="chrome://tabutils/skin/tabutils_fx31.css" type="text/css"?>
-<?xml-stylesheet href="chrome://tabutils/skin/tabutils_fx40.css" type="text/css"?>
-<?xml-stylesheet href="chrome://tabutils/skin/tabutils_fx41.css" type="text/css"?>
 <?xml-stylesheet href="chrome://tabutils/skin/tabutils_mac.css" type="text/css"?>
 <?xml-stylesheet href="chrome://tabutils/skin/tabutils_linux.css" type="text/css"?>
 

chrome/skin/tabutils.css

@@ -81,13 +81,14 @@ menuseparator:last-child {
 
 .tabbrowser-tab[locked] .tab-throbber:not([busy]),
 .tabbrowser-tab[protected] .tab-close-button {
-  list-style-image: url(resource:///chrome/browser/skin/classic/browser/Secure.png);
-  -moz-image-region: rect(1px, 15px, 15px, 1px);
+  list-style-image: url("chrome://tabutils/skin/Secure24.png") !important;
+  -moz-image-region: auto !important;
 }
 
+/* Tab Highlighting */
 .tabbrowser-tab[autoReload]:not(:hover) .tab-close-button {
-  list-style-image: url("resource:///chrome/browser/skin/classic/browser/classic/browser/Toolbar-small.png") !important;
-  -moz-image-region: rect(1px, 111px, 15px, 97px) !important;
+  list-style-image: url("chrome://tabutils/skin/autoreload.png") !important;
+  -moz-image-region: auto !important;
 }
 
 /* Pinned Tab */

chrome/skin/tabutils_fx29.css

@@ -1,8 +1,3 @@
-/* Tab Highlighting */
-window[v29="true"] .tabbrowser-tab[autoReload]:not(:hover) .tab-close-button {
-  -moz-image-region: rect(1px, 179px, 17px, 163px) !important;
-}
-
 /* Toolbar buttons */
 window[v29="true"]:not([OS="Linux"]) #nav-bar #button_tuOptions .toolbarbutton-icon,
 window[v29="true"]:not([OS="Linux"]) #nav-bar #closetab-button .toolbarbutton-icon {

chrome/skin/tabutils_fx4.css

@@ -130,23 +130,11 @@ window[v4="true"] .tabbrowser-tabs[dontanimate="true"] > .tabbrowser-tab {
   -moz-transition: none !important;
 }
 
-/* Tab Highlighting */
-window[v4="true"] .tabbrowser-tab[locked] .tab-throbber:not([busy]),
-window[v4="true"] .tabbrowser-tab[protected] .tab-close-button {
-  list-style-image: url("jar:resource://app/omni.jar!/chrome/browser/skin/classic/browser/Secure24.png");
-  -moz-image-region: auto;
-}
-
 window[v4="true"] .tabbrowser-tab[protected] .tab-close-button > .toolbarbutton-icon {
   width: 16px;
   height: 16px;
 }
 
-window[v4="true"] .tabbrowser-tab[autoReload]:not(:hover) .tab-close-button {
-  list-style-image: url("jar:resource://app/omni.jar!/chrome/browser/skin/classic/browser/Toolbar.png") !important;
-  -moz-image-region: rect(1px, 125px, 17px, 109px) !important;
-}
-
 window[v4="true"] .tabbrowser-tab[pinned][unread][rotate="true"] .tab-icon-image {
   -moz-transform: rotate(360deg);
 }

chrome/skin/tabutils_fx6.css

@@ -7,16 +7,6 @@ window[v6="true"] .tabbrowser-tab[group-first]:not([group-last]):not([group-coll
   list-style-image: url("chrome://global/skin/tree/twisty-open.png");
 }
 
-/* Tab Highlighting */
-window[v6="true"] .tabbrowser-tab[locked] .tab-throbber:not([busy]),
-window[v6="true"] .tabbrowser-tab[protected] .tab-close-button {
-  list-style-image: url("resource:///chrome/browser/skin/classic/browser/Secure24.png");
-}
-
-window[v6="true"] .tabbrowser-tab[autoReload]:not(:hover) .tab-close-button {
-  list-style-image: url("resource:///chrome/browser/skin/classic/browser/Toolbar.png") !important;
-}
-
 /* Toolbar buttons */
 window[v6="true"] #closetab-button {
   list-style-image: url("chrome://global/skin/icons/close.png");

chrome/skin/tabutils_linux.css

@@ -1,28 +1,3 @@
-/* Tab Highlighting */
-window[OS="Linux"] .tabbrowser-tab[locked] .tab-throbber:not([busy]),
-window[OS="Linux"] .tabbrowser-tab[protected] .tab-close-button {
-  list-style-image: url("resource:///chrome/browser/skin/classic/browser/Secure.png");
-  -moz-image-region: auto;
-}
-window[OS="Linux"][v41="true"] .tabbrowser-tab[locked] .tab-throbber:not([busy]),
-window[OS="Linux"][v41="true"] .tabbrowser-tab[protected] .tab-close-button {
-  list-style-image: url("chrome://tabutils/skin/Secure-Glyph.png") !important;
-}
-
-window[OS="Linux"] .tabbrowser-tab[autoReload]:not(:hover) .tab-close-button {
-  list-style-image: url("resource:///chrome/browser/skin/classic/browser/Toolbar-small.png") !important;
-  -moz-image-region: rect(0px, 32px, 16px, 16px) !important;
-}
-window[OS="Linux"][v40="true"] .tabbrowser-tab[autoReload]:not(:hover) .tab-close-button {
-  list-style-image: url("chrome://tabutils/skin/autoreload.png") !important;
-  -moz-image-region: auto !important;
-}
-
-window[OS="Linux"][v29="true"] .tabbrowser-tab[autoReload]:not(:hover) .tab-close-button {
-  list-style-image: url("resource:///chrome/browser/skin/classic/browser/Toolbar.png") !important;
-  -moz-image-region: rect(1px, 179px, 17px, 163px) !important;
-}
-
 /* Toolbar buttons */
 window[OS="Linux"] #closetab-button {
   list-style-image: url("moz-icon://stock/gtk-close?size=toolbar");

chrome/skin/tabutils_mac.css

@@ -1,4 +1,3 @@
-
 /* Tab Stacking */
 window[OS="Darwin"][v4="true"] .tabbrowser-tab[group-selected]:not([group-counter="1"])[group-collapsed] .tab-twisty {
   -moz-appearance: treetwisty;
@@ -17,29 +16,6 @@ window[OS="Darwin"][v4="true"] .tabbrowser-tabs[orient="vertical"] > .tabbrowser
   -moz-margin-start: 21px;
 }
 
-/* Tab Highlighting */
-window[OS="Darwin"][v17="true"] .tabbrowser-tab[locked] .tab-throbber:not([busy]),
-window[OS="Darwin"][v17="true"] .tabbrowser-tab[protected] .tab-close-button {
-  list-style-image: url("resource:///chrome/browser/skin/classic/browser/Secure-Glyph.png");
-}
-
-window[OS="Darwin"][v41="true"] .tabbrowser-tab[locked] .tab-throbber:not([busy]),
-window[OS="Darwin"][v41="true"] .tabbrowser-tab[protected] .tab-close-button {
-  list-style-image: url("chrome://tabutils/skin/Secure-Glyph.png") !important;
-}
-
-window[OS="Darwin"][v4="true"] .tabbrowser-tab[autoReload]:not(:hover) .tab-close-button {
-  -moz-image-region: rect(2px, 158px, 18px, 142px) !important;
-}
-window[OS="Darwin"][v40="true"] .tabbrowser-tab[autoReload]:not(:hover) .tab-close-button {
-  list-style-image: url("chrome://tabutils/skin/autoreload.png") !important;
-  -moz-image-region: auto !important;
-}
-
-window[OS="Darwin"][v29="true"] .tabbrowser-tab[autoReload]:not(:hover) .tab-close-button {
-  -moz-image-region: rect(1px, 179px, 17px, 163px) !important;
-}
-
 /* Status bar buttons */
 window[OS="Darwin"][v4="true"] #statusbar-openintab {
   -moz-image-region: rect(0px, 220px, 20px, 200px);

install.rdf

@@ -4,7 +4,7 @@
     <em:id>[email protected]</em:id>
     <em:type>2</em:type>
     <em:name>Tab Utilities Fixed</em:name>
-    <em:version>1.5.2015.09.10</em:version>
+    <em:version>1.5.2015.09.11</em:version>
     <em:creator>YFdyh000</em:creator>
     <em:contributor>ithinc (Former author)</em:contributor>
     <em:contributor>Phil Tsarik</em:contributor>