2009-09-02 08:26:24 +00:00
|
|
|
#zotero-splitter
|
|
|
|
|
{
|
|
|
|
|
border-top: none;
|
|
|
|
|
border-bottom: 1px solid #A3A3A3;
|
|
|
|
|
min-height: 1px !important;
|
|
|
|
|
max-height: 1px !important;
|
|
|
|
|
background-image: none;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-items-toolbar[state=collapsed]
|
|
|
|
|
{
|
|
|
|
|
margin-left: -8px !important;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-pane toolbarseparator {
|
|
|
|
|
margin-left: 7px;
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-02 03:23:07 +00:00
|
|
|
.zotero-tb-button, .zotero-tb-button:first-child, .zotero-tb-button:last-child {
|
|
|
|
|
-moz-margin-start: 0 !important;
|
|
|
|
|
-moz-margin-end: 3px !important;
|
|
|
|
|
-moz-padding-end: 10px !important;
|
2009-09-02 08:26:24 +00:00
|
|
|
background: url("chrome://zotero/skin/mac/menubutton-end.png") right center no-repeat;
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-02 03:23:07 +00:00
|
|
|
#zotero-collections-toolbar {
|
|
|
|
|
padding-left: 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-02 23:13:18 +00:00
|
|
|
.zotero-tb-button:-moz-window-inactive {
|
|
|
|
|
opacity: 0.7;
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-02 08:26:24 +00:00
|
|
|
.zotero-tb-button[open="true"],
|
2011-10-02 23:28:38 +00:00
|
|
|
.zotero-tb-button:not([disabled="true"]):hover:active {
|
2009-09-02 08:26:24 +00:00
|
|
|
background: url("chrome://zotero/skin/mac/menubutton-end-pressed.png") right center no-repeat;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.zotero-tb-button > menupopup {
|
|
|
|
|
-moz-margin-start: 2px;
|
|
|
|
|
margin-top: -4px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.zotero-tb-button > .toolbarbutton-icon {
|
2011-02-13 23:51:50 +00:00
|
|
|
/*-moz-binding: url('chrome://zotero-platform/content/zoterotbbutton.xml#zotero-tb-button');*/
|
2009-09-02 08:26:24 +00:00
|
|
|
background: url("chrome://zotero/skin/mac/menubutton-start.png") left center no-repeat;
|
2011-02-13 23:51:50 +00:00
|
|
|
padding: 5px 1px 5px 11px;
|
2009-09-08 22:23:37 +00:00
|
|
|
}
|
|
|
|
|
|
2011-06-14 03:24:21 +00:00
|
|
|
#zotero-tb-search-menu-button
|
|
|
|
|
{
|
|
|
|
|
margin: -6px -2px -6px -16px;
|
|
|
|
|
padding: 6px 2px 6px 14px;
|
2011-08-23 00:42:30 +00:00
|
|
|
list-style-image: url("chrome://zotero/skin/mac/searchbar-dropmarker.png");
|
2011-04-25 15:27:49 +00:00
|
|
|
}
|
|
|
|
|
|
2009-09-08 22:23:37 +00:00
|
|
|
#zotero-tb-sync > .toolbarbutton-icon {
|
|
|
|
|
-moz-padding-start: 8px;
|
2011-02-13 23:51:50 +00:00
|
|
|
padding-top: 1px;
|
2009-09-02 08:26:24 +00:00
|
|
|
}
|
|
|
|
|
|
2012-12-11 20:16:40 +00:00
|
|
|
#zotero-tb-sync-error[error=true]
|
2009-10-01 20:26:31 +00:00
|
|
|
{
|
|
|
|
|
margin-bottom: 2px;
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-02 08:26:24 +00:00
|
|
|
.zotero-tb-button[open="true"] > .toolbarbutton-icon,
|
2011-10-02 23:28:38 +00:00
|
|
|
.zotero-tb-button:not([disabled="true"]):hover:active > .toolbarbutton-icon {
|
2009-09-02 08:26:24 +00:00
|
|
|
background: url("chrome://zotero/skin/mac/menubutton-start-pressed.png") left center no-repeat;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.zotero-tb-button > .toolbarbutton-text {
|
|
|
|
|
display: none;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-tb-sync > .toolbarbutton-icon {
|
|
|
|
|
-moz-binding: none !important;
|
2011-02-13 23:51:50 +00:00
|
|
|
padding: 2px 0px 2px 8px !important;
|
2009-09-02 08:26:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-close-button {
|
|
|
|
|
margin: 0px !important;
|
|
|
|
|
padding: 0px 0px 0px 10px !important;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-tb-sync {
|
2010-08-27 19:16:29 +00:00
|
|
|
margin: 0;
|
2009-09-02 08:26:24 +00:00
|
|
|
}
|
|
|
|
|
|
2010-07-09 20:10:43 +00:00
|
|
|
#zotero-view-tabbox {
|
2009-09-02 08:26:24 +00:00
|
|
|
background-color: #fff;
|
|
|
|
|
padding: 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-09 20:10:43 +00:00
|
|
|
#zotero-item-pane-content .groupbox-body {
|
2009-09-02 08:26:24 +00:00
|
|
|
-moz-appearance: none;
|
|
|
|
|
background-color: #ffffff;
|
|
|
|
|
}
|
|
|
|
|
|
Duplicate detection:
- Adds a per-library "Duplicate Items" virtual search to the source list -- shows up by default for "My Library" but can be added to and removed from all libraries
- Current matching algorithm is very basic: finds exact title matches (after normalizing case/diacritics/punctuation/spacing) and DOI/ISBN matches (untested)
- In duplicates view, sets are selected automatically; in other views, duplicate items can be selected manually and the merge interface can be brought up with "Merge Items" in the context menu
- Can select a master item and individual fields to merge from other versions
- Word processor integration code will automatically find mapped replacements and update documents with new item keys
Possible future improvements:
- Improved detection algorithms
- UI tweaks
- Currently if any items differ, all available versions will be shown as master item options, even if only one item is different; probably the earliest equivalent item should be shown for each distinct version
- Caching of results for performance
- Confidence scale
- Creator version selection (currently the creators from the chosen master item are kept)
- Merging of matching child items
- Better sorting of duplicates if not clustered together by the selected sort column
- Relation path compression when merging items that are already mapped to previously removed duplicates
Other changes in this commit:
- Don't show Trash in word processor integration windows
- Consider items in trash to be missing in word processor documents
- Selection of special views (Trash, Unfiled, Duplicates) is now restored properly in new windows
- Disabled field transform context menu when item isn't editable
- Left/right arrow now expands/collapses all selected items instead of just the last-selected row
- Relation deletions are now synced
- The same items row is now reselected after item deletion
- (dev) Zotero.Item.getNotes(), Zotero.Item.getAttachments(), and Zotero.Item.getTags() now return empty arrays rather than FALSE if no matches -- tests on those return values in third-party code will need to be changed
- (dev) New function Zotero.Utilities.removeDiacritics(str, lowercaseOnly) -- could be used to generate ASCII BibTeX keys
- (dev) New 'tempTable' search condition can take a table to join against -- useful for implementing virtual source lists
- (dev) Significant UI code cleanup
- (dev) Moved all item pane content into itemPane.xul
- Probably various other things
Needless to say, this needs testing.
2011-07-22 21:24:38 +00:00
|
|
|
#zotero-item-pane-message {
|
2009-09-02 08:26:24 +00:00
|
|
|
color: #7f7f7f;
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-09 20:10:43 +00:00
|
|
|
#zotero-view-tabbox > tabpanels {
|
2009-09-08 22:23:37 +00:00
|
|
|
margin: 12px 0 0 0;
|
2011-02-13 06:16:06 +00:00
|
|
|
padding: 0;
|
2009-09-02 08:26:24 +00:00
|
|
|
-moz-appearance: none;
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-09 20:10:43 +00:00
|
|
|
#zotero-view-tabbox > tabs {
|
2012-01-25 22:42:28 +00:00
|
|
|
-moz-appearance: none;
|
|
|
|
|
background: -moz-linear-gradient(top, #ededed, #cccccc);
|
2012-01-25 08:49:07 +00:00
|
|
|
border-style: solid;
|
|
|
|
|
border-width: 0 0 1px 0;
|
|
|
|
|
border-color: #5e5e5e;
|
2012-01-25 22:42:28 +00:00
|
|
|
padding: 2px 0 2px 0;
|
2012-01-25 08:09:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-view-tabbox > tabs > tab > hbox {
|
|
|
|
|
padding: 0;
|
2009-09-02 08:26:24 +00:00
|
|
|
}
|
|
|
|
|
|
2010-07-09 20:10:43 +00:00
|
|
|
#zotero-view-tabbox > tabs > tab > hbox > .tab-icon {
|
2009-09-02 08:26:24 +00:00
|
|
|
display: none;
|
|
|
|
|
}
|
|
|
|
|
|
2012-02-10 06:38:01 +00:00
|
|
|
#zotero-pane #zotero-view-tabbox > tabs > tab {
|
2012-01-25 08:09:49 +00:00
|
|
|
-moz-box-orient: vertical;
|
|
|
|
|
-moz-box-align: center;
|
|
|
|
|
-moz-appearance: toolbarbutton;
|
|
|
|
|
text-align: center;
|
|
|
|
|
margin: 0;
|
2012-01-26 07:37:11 +00:00
|
|
|
padding: 3px 1px 3px 1px;
|
2012-01-25 08:09:49 +00:00
|
|
|
}
|
|
|
|
|
|
2012-02-10 06:38:01 +00:00
|
|
|
#zotero-pane #zotero-view-tabbox > tabs > tab > hbox .tab-text {
|
2012-01-25 08:26:10 +00:00
|
|
|
font-size: 11px;
|
|
|
|
|
font-weight: bold;
|
2012-01-26 07:37:11 +00:00
|
|
|
margin: 2px 7px 2px 9px !important;
|
2012-01-25 08:09:49 +00:00
|
|
|
text-shadow: 0 1px rgba(255, 255, 255, .4);
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-25 08:18:17 +00:00
|
|
|
/* This seems to be necessary to center the tabs. Not sure why. */
|
2012-02-10 06:38:01 +00:00
|
|
|
#zotero-pane #zotero-view-tabbox > tabs > tab:last-of-type > hbox .tab-text {
|
2012-01-26 07:37:11 +00:00
|
|
|
margin: 2px 9px 2px 9px !important;
|
2012-01-25 08:18:17 +00:00
|
|
|
}
|
|
|
|
|
|
2012-02-10 06:38:01 +00:00
|
|
|
#zotero-pane #zotero-view-tabbox > tabs > tab[selected=true] > hbox .tab-text {
|
2012-01-25 08:09:49 +00:00
|
|
|
color: #FFF !important;
|
|
|
|
|
text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-02 08:26:24 +00:00
|
|
|
#zotero-collections-tree {
|
|
|
|
|
-moz-appearance: none;
|
|
|
|
|
border: none;
|
|
|
|
|
margin: 0;
|
|
|
|
|
padding: 0;
|
|
|
|
|
min-height: 5.2em;
|
|
|
|
|
background-color: #d2d8e2;
|
|
|
|
|
}
|
|
|
|
|
|
2011-02-12 19:56:13 +00:00
|
|
|
#zotero-collections-tree:-moz-window-inactive {
|
|
|
|
|
background-color: rgb(232, 232, 232);
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-02 08:26:24 +00:00
|
|
|
#zotero-collections-tree treechildren::-moz-tree-row {
|
2011-06-07 06:26:12 +00:00
|
|
|
background-color: transparent;
|
|
|
|
|
border-color: transparent;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-collections-tree treechildren::-moz-tree-cell(selected) {
|
|
|
|
|
background: -moz-linear-gradient(top, #A0B0CF, #7386AB) repeat-x;
|
|
|
|
|
border-top: 1px solid #94A1C0;
|
2009-09-02 08:26:24 +00:00
|
|
|
}
|
|
|
|
|
|
2011-06-07 06:26:12 +00:00
|
|
|
#zotero-collections-tree:-moz-window-inactive treechildren::-moz-tree-cell(selected) {
|
|
|
|
|
background: -moz-linear-gradient(top, #B4B4B4, #8A8A8A) repeat-x;
|
|
|
|
|
border-top: 1px solid #979797;
|
2009-09-02 08:26:24 +00:00
|
|
|
}
|
|
|
|
|
|
2011-06-07 06:26:12 +00:00
|
|
|
#zotero-collections-tree treechildren::-moz-tree-cell(selected, focus) {
|
|
|
|
|
background: -moz-linear-gradient(top, #6494D4, #2559AC) repeat-x;
|
|
|
|
|
border-top: 1px solid #5382C5;
|
2009-09-02 08:26:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-collections-tree treechildren::-moz-tree-cell-text(selected) {
|
|
|
|
|
font-weight: bold !important;
|
|
|
|
|
color: #ffffff !important;
|
|
|
|
|
}
|
|
|
|
|
|
2011-06-07 06:26:12 +00:00
|
|
|
#zotero-collections-tree treechildren::-moz-tree-twisty(selected) {
|
2014-04-28 07:52:18 +00:00
|
|
|
list-style-image: url("chrome://zotero/skin/mac/twisty-selected.svg");
|
2011-06-07 06:26:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-collections-tree treechildren::-moz-tree-twisty(selected, open) {
|
2014-04-28 07:52:18 +00:00
|
|
|
list-style-image: url("chrome://zotero/skin/mac/twisty-selected-open.svg");
|
2011-06-07 06:26:12 +00:00
|
|
|
}
|
|
|
|
|
|
2011-05-31 06:50:52 +00:00
|
|
|
#zotero-collections-splitter, #zotero-items-splitter
|
2009-09-02 08:26:24 +00:00
|
|
|
{
|
|
|
|
|
-moz-appearance: none;
|
|
|
|
|
-moz-border-start: none !important;
|
|
|
|
|
-moz-border-end: none !important;
|
|
|
|
|
max-width: 1px !important;
|
|
|
|
|
min-width: 1px !important;
|
|
|
|
|
width: 1px !important;
|
|
|
|
|
background-color: #8b8b8b !important;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-31 06:50:52 +00:00
|
|
|
#zotero-collections-splitter[state=collapsed]
|
2009-09-02 08:26:24 +00:00
|
|
|
{
|
|
|
|
|
border-right: 1px;
|
|
|
|
|
border-color: #A5A5A5;
|
|
|
|
|
max-width: 8px !important;
|
|
|
|
|
min-width: 8px !important;
|
|
|
|
|
width: 8px !important;
|
|
|
|
|
background-image: url("chrome://zotero/skin/mac/vsplitter.png");
|
|
|
|
|
background-repeat: repeat-y;
|
2010-08-27 19:16:29 +00:00
|
|
|
padding: 0;
|
2009-09-02 08:26:24 +00:00
|
|
|
}
|
|
|
|
|
|
2011-05-31 06:50:52 +00:00
|
|
|
#zotero-collections-splitter[state=collapsed] > grippy
|
2009-09-02 08:26:24 +00:00
|
|
|
{
|
|
|
|
|
-moz-appearance: none;
|
|
|
|
|
background-image: url("chrome://zotero/skin/mac/vgrippy.png");
|
|
|
|
|
background-position: center;
|
|
|
|
|
background-repeat: no-repeat;
|
|
|
|
|
width: 8px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-tags-splitter
|
|
|
|
|
{
|
|
|
|
|
-moz-appearance: none;
|
|
|
|
|
border-top: 1px;
|
|
|
|
|
border-bottom: 1px;
|
|
|
|
|
border-color: #A5A5A5;
|
|
|
|
|
height: 8px;
|
|
|
|
|
background-image: url("chrome://zotero/skin/mac/hsplitter.png") !important;
|
|
|
|
|
background-repeat: repeat-x;
|
2010-08-27 19:16:29 +00:00
|
|
|
padding: 0;
|
2009-09-02 08:26:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-tags-splitter > grippy
|
|
|
|
|
{
|
|
|
|
|
-moz-appearance: none;
|
|
|
|
|
background-image: url("chrome://zotero/skin/mac/hgrippy.png");
|
|
|
|
|
background-position: center;
|
|
|
|
|
background-repeat: no-repeat;
|
|
|
|
|
height: 8px;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-31 06:50:52 +00:00
|
|
|
#zotero-tags-splitter > grippy:hover, #zotero-collections-splitter > grippy:hover
|
2009-09-02 08:26:24 +00:00
|
|
|
{
|
|
|
|
|
background-color:transparent;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-items-tree
|
|
|
|
|
{
|
|
|
|
|
-moz-appearance: none;
|
|
|
|
|
border: none;
|
|
|
|
|
margin: 0;
|
|
|
|
|
padding: 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-items-tree treechildren::-moz-tree-cell,
|
|
|
|
|
#zotero-items-tree treechildren::-moz-tree-column {
|
|
|
|
|
border-right: 1px solid #d7dad7;
|
2011-01-24 10:29:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
treechildren::-moz-tree-twisty {
|
|
|
|
|
-moz-appearance: none;
|
2014-04-28 07:52:18 +00:00
|
|
|
width: 16px;
|
|
|
|
|
height: 16px;
|
|
|
|
|
list-style-image: url("chrome://zotero/skin/mac/twisty.svg");
|
2011-01-24 10:29:36 +00:00
|
|
|
-moz-padding-start: 5px;
|
|
|
|
|
-moz-padding-end: 6px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
treechildren::-moz-tree-twisty(open) {
|
|
|
|
|
-moz-appearance: none;
|
2014-04-28 07:52:18 +00:00
|
|
|
width: 16px;
|
|
|
|
|
height: 16px;
|
|
|
|
|
list-style-image: url("chrome://zotero/skin/mac/twisty-open.svg");
|
2011-01-24 10:29:36 +00:00
|
|
|
-moz-padding-start: 4px;
|
|
|
|
|
-moz-padding-end: 7px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* How to get active twisty?
|
|
|
|
|
treechildren::-moz-tree-twisty(active) {
|
|
|
|
|
-moz-appearance: none;
|
2014-04-28 07:52:18 +00:00
|
|
|
list-style-image: url("chrome://zotero/skin/mac/twisty-active.svg") !important;
|
2011-01-24 10:29:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
treechilren::-moz-tree-twisty(active) {
|
|
|
|
|
-moz-appearance: none;
|
2014-04-28 07:52:18 +00:00
|
|
|
list-style-image: url("chrome://zotero/skin/mac/twisty-active-open.svg");
|
2011-01-24 10:29:36 +00:00
|
|
|
}
|
|
|
|
|
*/
|
|
|
|
|
|
2011-02-12 21:22:01 +00:00
|
|
|
tree:focus treechildren::-moz-tree-twisty(selected) {
|
2011-02-12 19:56:13 +00:00
|
|
|
-moz-appearance: none;
|
2014-04-28 07:52:18 +00:00
|
|
|
list-style-image: url("chrome://zotero/skin/mac/twisty-selected.svg");
|
2011-02-12 19:56:13 +00:00
|
|
|
}
|
|
|
|
|
|
2011-02-12 21:22:01 +00:00
|
|
|
tree:focus treechildren::-moz-tree-twisty(selected, open) {
|
2011-01-24 10:29:36 +00:00
|
|
|
-moz-appearance: none;
|
2014-04-28 07:52:18 +00:00
|
|
|
list-style-image: url("chrome://zotero/skin/mac/twisty-selected-open.svg");
|
2011-01-24 10:29:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
treechildren::-moz-tree-image {
|
|
|
|
|
height: 16px;
|
|
|
|
|
padding-bottom: 1px;
|
2011-02-13 23:51:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-tb-advanced-search
|
|
|
|
|
{
|
|
|
|
|
list-style-image: url('chrome://zotero/skin/mac/toolbar-advanced-search.png');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-tb-note-add
|
|
|
|
|
{
|
|
|
|
|
list-style-image: url('chrome://zotero/skin/mac/toolbar-note-add.png');
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-tb-actions-menu
|
|
|
|
|
{
|
|
|
|
|
list-style-image: url('chrome://zotero/skin/mac/cog.png');
|
2013-04-14 05:47:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-collectionmenu > .menuitem-iconic, #zotero-itemmenu > .menuitem-iconic, #zotero-collectionmenu > .menu-iconic, #zotero-itemmenu > .menu-iconic {
|
|
|
|
|
padding-top: 0px !important;
|
|
|
|
|
padding-bottom: 2px !important;
|
|
|
|
|
list-style-image: none !important;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#zotero-collectionmenu > .menuitem-iconic > .menu-iconic-left, #zotero-itemmenu > .menuitem-iconic > .menu-iconic-left, #zotero-collectionmenu > .menu-iconic > .menu-iconic-left, #zotero-itemmenu > .menu-iconic > .menu-iconic-left {
|
|
|
|
|
display: none;
|
2009-09-02 08:26:24 +00:00
|
|
|
}
|