diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul index cda20766f..51c3ef06f 100644 --- a/chrome/chromeFiles/content/scholar/overlay.xul +++ b/chrome/chromeFiles/content/scholar/overlay.xul @@ -23,7 +23,7 @@ - diff --git a/chrome/chromeFiles/skin/default/scholar/scholar.css b/chrome/chromeFiles/skin/default/scholar/scholar.css index bdddad8c9..96f6f64fc 100644 --- a/chrome/chromeFiles/skin/default/scholar/scholar.css +++ b/chrome/chromeFiles/skin/default/scholar/scholar.css @@ -1,41 +1,31 @@ -#scholar-toolbar-button +#zotero-toolbar-button { - list-style-image: url('chrome://scholar/skin/toolbar-large.png'); + list-style-image: url('chrome://scholar/skin/zotero-z-24px.png'); } -#scholar-toolbar-button:active +#zotero-toolbar-button:hover { - list-style-image: url('chrome://scholar/skin/toolbar-large-active.png'); + list-style-image: url('chrome://scholar/skin/zotero-z-24px-hover.png'); } -#scholar-toolbar-button[disabled="true"] +#zotero-toolbar-button:active { - list-style-image: url('chrome://scholar/skin/toolbar-large-disabled.png'); + list-style-image: url('chrome://scholar/skin/zotero-z-24px-active.png'); } -toolbar[iconsize="small"] #scholar-toolbar-button +toolbar[iconsize="small"] #zotero-toolbar-button { - list-style-image: url('chrome://scholar/skin/toolbar-small.png'); + list-style-image: url('chrome://scholar/skin/zotero-z-16px.png'); } -toolbar[iconsize="small"] #scholar-toolbar-button:active +toolbar[iconsize="small"] #zotero-toolbar-button:hover { - list-style-image: url('chrome://scholar/skin/toolbar-small-active.png'); + list-style-image: url('chrome://scholar/skin/zotero-z-16px-hover.png'); } -toolbar[iconsize="small"] #scholar-toolbar-button[disabled="true"] +toolbar[iconsize="small"] #zotero-toolbar-button:active { - list-style-image: url('chrome://scholar/skin/toolbar-small-disabled.png'); -} - -#scholar-toolbar-button -{ - list-style-image: url('chrome://scholar/skin/toolbar-large.png'); -} - -toolbar[iconsize="small"] #scholar-toolbar-button -{ - list-style-image: url('chrome://scholar/skin/toolbar-small.png'); + list-style-image: url('chrome://scholar/skin/zotero-z-16px-active.png'); } textbox[multiline="true"][type="timed"] diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-large-active.png b/chrome/chromeFiles/skin/default/scholar/toolbar-large-active.png deleted file mode 100644 index ff3c1ce2e..000000000 Binary files a/chrome/chromeFiles/skin/default/scholar/toolbar-large-active.png and /dev/null differ diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-large-disabled.png b/chrome/chromeFiles/skin/default/scholar/toolbar-large-disabled.png deleted file mode 100644 index cf9d08b03..000000000 Binary files a/chrome/chromeFiles/skin/default/scholar/toolbar-large-disabled.png and /dev/null differ diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-large.png b/chrome/chromeFiles/skin/default/scholar/toolbar-large.png deleted file mode 100644 index 08a167596..000000000 Binary files a/chrome/chromeFiles/skin/default/scholar/toolbar-large.png and /dev/null differ diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-small-active.png b/chrome/chromeFiles/skin/default/scholar/toolbar-small-active.png deleted file mode 100644 index a59d8e789..000000000 Binary files a/chrome/chromeFiles/skin/default/scholar/toolbar-small-active.png and /dev/null differ diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-small-disabled.png b/chrome/chromeFiles/skin/default/scholar/toolbar-small-disabled.png deleted file mode 100644 index 74da7f00c..000000000 Binary files a/chrome/chromeFiles/skin/default/scholar/toolbar-small-disabled.png and /dev/null differ diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-small.png b/chrome/chromeFiles/skin/default/scholar/toolbar-small.png deleted file mode 100644 index 6605c3e66..000000000 Binary files a/chrome/chromeFiles/skin/default/scholar/toolbar-small.png and /dev/null differ diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-16px-active.png b/chrome/chromeFiles/skin/default/scholar/zotero-z-16px-active.png new file mode 100644 index 000000000..e1e402503 Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/zotero-z-16px-active.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-16px-hover.png b/chrome/chromeFiles/skin/default/scholar/zotero-z-16px-hover.png new file mode 100644 index 000000000..777d46824 Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/zotero-z-16px-hover.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-16px.png b/chrome/chromeFiles/skin/default/scholar/zotero-z-16px.png new file mode 100644 index 000000000..85545d13a Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/zotero-z-16px.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-24px-active.png b/chrome/chromeFiles/skin/default/scholar/zotero-z-24px-active.png new file mode 100644 index 000000000..d17b56fb0 Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/zotero-z-24px-active.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-24px-hover.png b/chrome/chromeFiles/skin/default/scholar/zotero-z-24px-hover.png new file mode 100644 index 000000000..9d542654e Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/zotero-z-24px-hover.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-24px.png b/chrome/chromeFiles/skin/default/scholar/zotero-z-24px.png new file mode 100644 index 000000000..9d4ca1472 Binary files /dev/null and b/chrome/chromeFiles/skin/default/scholar/zotero-z-24px.png differ diff --git a/chrome/chromeFiles/skin/default/scholar/zotero_z_32px.png b/chrome/chromeFiles/skin/default/scholar/zotero_z_32px.png index 6e2dd14f4..4161bd730 100644 Binary files a/chrome/chromeFiles/skin/default/scholar/zotero_z_32px.png and b/chrome/chromeFiles/skin/default/scholar/zotero_z_32px.png differ