From 79231c91236bfa21ec4977c90b4c6596ccf39c7a Mon Sep 17 00:00:00 2001 From: SHIMODA Hiroshi Date: Mon, 15 Aug 2011 18:28:51 +0900 Subject: [PATCH] The issue #147 should be fixed by the library --- content/treestyletab/res/tabFx2Compatible.css | 31 +++++++++++++------ content/treestyletab/res/tabFx2Compatible.xul | 2 +- content/treestyletab/treestyletab.css | 8 ----- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/content/treestyletab/res/tabFx2Compatible.css b/content/treestyletab/res/tabFx2Compatible.css index d526cbc3..aa403157 100644 --- a/content/treestyletab/res/tabFx2Compatible.css +++ b/content/treestyletab/res/tabFx2Compatible.css @@ -14,51 +14,62 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -:root[tabFx2Compatible="13"] +:root[tabFx2Compatible="14"] .tabbrowser-tab { -moz-binding: url(tabFx2Compatible.xml#tabbrowser-tab-3) !important; } -:root[tabFx2Compatible="13"][tabFx2Compatible-flags~="separate-tabContextMenu"] +:root[tabFx2Compatible="14"][tabFx2Compatible-flags~="separate-tabContextMenu"] .tabbrowser-tab { -moz-binding: url(tabFx2Compatible.xml#tabbrowser-tab-4) !important; } -:root[tabFx2Compatible="13"]:not([tabFx2Compatible-flags~="png-throbber"])[tabFx2Compatible-flags~="fx3"] +:root[tabFx2Compatible="14"]:not([tabFx2Compatible-flags~="png-throbber"])[tabFx2Compatible-flags~="fx3"] .tab-icon-image[busy] { list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif") !important; opacity: 0.6; } -:root[tabFx2Compatible="13"][tabFx2Compatible-flags~="png-throbber"][tabFx2Compatible-flags~="fx3"] +:root[tabFx2Compatible="14"][tabFx2Compatible-flags~="png-throbber"][tabFx2Compatible-flags~="fx3"] .tab-icon-image[busy] { list-style-image: url("chrome://global/skin/icons/loading_16.png") !important; } -:root[tabFx2Compatible="13"][tabFx2Compatible-flags~="mac"][tabFx2Compatible-flags~="png-throbber"] +:root[tabFx2Compatible="14"][tabFx2Compatible-flags~="mac"][tabFx2Compatible-flags~="png-throbber"] .tab-icon-image { list-style-image: url("chrome://global/skin/tree/item.png"); } -:root[tabFx2Compatible="13"][tabFx2Compatible-flags~="mac"] +:root[tabFx2Compatible="14"][tabFx2Compatible-flags~="mac"] .tabbrowser-tab:not(:hover) .tab-icon-image:not([selected="true"]) { opacity: 0.6; } -:root[tabFx2Compatible="13"] +:root[tabFx2Compatible="14"] .tabbrowser-tab:focus > .tab-image-middle { outline: 1px dotted; } /* we must split declarations for old Gecko */ -:root[tabFx2Compatible="13"] +:root[tabFx2Compatible="14"] .tabbrowser-tab:-moz-focusring > .tab-stack { outline: 1px dotted; } -:root[tabFx2Compatible="13"] +:root[tabFx2Compatible="14"] .tab-image-left[pinned="true"], -:root[tabFx2Compatible="13"] +:root[tabFx2Compatible="14"] .tab-image-right[pinned="true"] { display: none !important; } + +/* Tab Utilities */ +:root[tabFx2Compatible="14"] + .tabbrowser-tabs[highlightLocked][highlightSelected][highlightUnread] + > .tabbrowser-tab .tab-icon > .tab-icon-image ~ *, +:root[tabFx2Compatible="14"] + .tabbrowser-tabs[highlightlocked][highlightselected][highlightunread] + > .tabbrowser-tab .tab-icon > .tab-icon-image ~ * { + background: none !important; +} + diff --git a/content/treestyletab/res/tabFx2Compatible.xul b/content/treestyletab/res/tabFx2Compatible.xul index 2845e10d..426c1b5f 100644 --- a/content/treestyletab/res/tabFx2Compatible.xul +++ b/content/treestyletab/res/tabFx2Compatible.xul @@ -19,7 +19,7 @@ window.addEventListener('DOMContentLoaded', function() { window.removeEventListener('DOMContentLoaded', arguments.callee, true); - const currentRevision = 13; + const currentRevision = 14; var b = document.getElementById('content'); if (!b || b.localName != 'tabbrowser') return; diff --git a/content/treestyletab/treestyletab.css b/content/treestyletab/treestyletab.css index 3c30aaaa..43673be4 100644 --- a/content/treestyletab/treestyletab.css +++ b/content/treestyletab/treestyletab.css @@ -514,11 +514,3 @@ image.tab-icon { display: none; } -/* Tab Utilities */ -.tabbrowser-tabs[highlightLocked][highlightSelected][highlightUnread] - > .tabbrowser-tab .tab-icon > .tab-icon-image ~ *, -.tabbrowser-tabs[highlightlocked][highlightselected][highlightunread] - > .tabbrowser-tab .tab-icon > .tab-icon-image ~ * { - background: none !important; -} -