scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-10 03:28:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix activated/deactivated appearance in Fx 4

Browse source
This commit is contained in:
Simon Kornblith 2011-02-12 19:56:13 +00:00
parent cf7359854d
commit e5a4d4a1ee
2 changed files with 59 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
chrome/content/zotero-platform/mac/overlay.css
View file

@ -182,7 +182,7 @@
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-selected-inactive.png") 0 4 0 5 repeat stretch;
}
/* Since Fx4 doesn't recognize the -moz-window-inactive pseudoclass as valid, these have to be separate (duplicate) rules to be parsed */
/* Since Fx < 4 doesn't recognize the -moz-window-inactive pseudoclass as valid, these have to be separate (duplicate) rules to be parsed */
:root:not([active]) #zotero-pane:not([isFx4]) > #zotero-item-pane > #zotero-item-pane-content > #zotero-view-tabbox > tabs > * {
color: #7C7C7C !important;
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-inactive.png") 0 4 0 5 repeat stretch;
@ -222,26 +222,33 @@
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-selected-down.png") 0 4 0 6 repeat stretch;
}
:root:not([active]) #zotero-view-tabbox > tabs > :first-child,
:root:not([active]) #zotero-view-tabbox > tabs > [first-visible],
:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child,
:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] {
#zotero-view-tabbox:-moz-window-inactive > tabs > :first-child,
#zotero-view-tabbox:-moz-window-inactive > tabs > [first-visible],
#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > :last-child,
#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > [last-visible] {
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-inactive.png") 0 4 0 6 repeat stretch;
}
/* Since Fx4 doesn't recognize the -moz-window-inactive pseudoclass as valid, these have to be separate (duplicate) rules to be parsed */
:root:not([active]) #zotero-view-tabbox > tabs > :first-child,
:root:not([active]) #zotero-view-tabbox > tabs > [first-visible],
:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child,
:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] {
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs > :first-child,
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs > [first-visible],
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child,
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] {
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-inactive.png") 0 4 0 6 repeat stretch;
}
:root:not([active]) #zotero-view-tabbox > tabs > tab:first-child[selected=true],
:root:not([active]) #zotero-view-tabbox > tabs > tab[first-visible][selected=true],
:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true],
:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] {
#zotero-view-tabbox:-moz-window-inactive > tabs > tab:first-child[selected=true],
#zotero-view-tabbox:-moz-window-inactive > tabs > tab[first-visible][selected=true],
#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > tab:last-child[selected=true],
#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > tab[last-visible][selected=true] {
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-selected-inactive.png") 0 4 0 6 repeat stretch;
}
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs > tab:first-child[selected=true],
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs > tab[first-visible][selected=true],
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true],
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] {
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-selected-inactive.png") 0 4 0 6 repeat stretch;
}
@ -274,17 +281,30 @@
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-selected-down.png") 0 6 0 5 repeat stretch;
}
:root:not([active]) #zotero-view-tabbox > tabs > :last-child,
:root:not([active]) #zotero-view-tabbox > tabs > [last-visible],
:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child,
:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] {
#zotero-view-tabbox:-moz-window-inactive > tabs > :last-child,
#zotero-view-tabbox:-moz-window-inactive > tabs > [last-visible],
#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > :first-child,
#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > [first-visible] {
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-inactive.png") 0 6 0 5 repeat stretch;
}
:root:not([active]) #zotero-view-tabbox > tabs > tab:last-child[selected=true],
:root:not([active]) #zotero-view-tabbox > tabs > tab[last-visible][selected=true],
:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true],
:root:not([active]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] {
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs > :last-child,
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs > [last-visible],
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child,
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] {
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-inactive.png") 0 6 0 5 repeat stretch;
}
#zotero-view-tabbox:-moz-window-inactive > tabs > tab:last-child[selected=true],
#zotero-view-tabbox:-moz-window-inactive > tabs > tab[last-visible][selected=true],
#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > tab:first-child[selected=true],
#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > tab[first-visible][selected=true] {
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-selected-inactive.png") 0 6 0 5 repeat stretch;
}
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs > tab:last-child[selected=true],
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs > tab[last-visible][selected=true],
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true],
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] {
-moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-selected-inactive.png") 0 6 0 5 repeat stretch;
}
@ -297,7 +317,11 @@
background-color: #d2d8e2;
}
:root:not([active="true"]) #zotero-collections-tree {
#zotero-collections-tree:-moz-window-inactive {
background-color: rgb(232, 232, 232);
}
:root:not([active]) #zotero-pane:not([isFx4]) #zotero-collections-tree {
background-color: rgb(232, 232, 232);
}
@ -426,11 +450,21 @@ treechilren::-moz-tree-twisty(active) {
}
*/
#zotero-pane:not(:-moz-window-inactive) treechildren::-moz-tree-twisty(selected) {
-moz-appearance: none;
list-style-image: url("chrome://zotero/skin/mac/twisty-selected.png");
}
:root[active] treechildren::-moz-tree-twisty(selected) {
-moz-appearance: none;
list-style-image: url("chrome://zotero/skin/mac/twisty-selected.png");
}
#zotero-pane:not(:-moz-window-inactive) treechildren::-moz-tree-twisty(selected, open) {
-moz-appearance: none;
list-style-image: url("chrome://zotero/skin/mac/twisty-selected-open.png");
}
:root[active] treechildren::-moz-tree-twisty(selected, open) {
-moz-appearance: none;
list-style-image: url("chrome://zotero/skin/mac/twisty-selected-open.png");

9
chrome/content/zotero/zoteroPane.js
View file

@ -114,7 +114,8 @@ var ZoteroPane = new function()
}
_loaded = true;
Zotero.setFontSize(document.getElementById('zotero-pane'))
var zp = document.getElementById('zotero-pane');
Zotero.setFontSize(zp)
if (Zotero.isMac) {
//document.getElementById('zotero-tb-actions-zeroconf-update').setAttribute('hidden', false);
@ -127,11 +128,7 @@ var ZoteroPane = new function()
// hack, since Fx 4 no longer sets active, and the reverse in polarity of the preferred
// property makes things painful to handle otherwise
// DEBUG: remove this once we only support Fx 4
document.documentElement.setAttribute("active", "true");
window.addEventListener("focus",
function() { document.documentElement.setAttribute("active", "true") }, false);
window.addEventListener("blur",
function() { document.documentElement.removeAttribute("active") }, false);
zp.setAttribute("isFx4", "true");
}
//Initialize collections view