diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css index adef10d368..ed2b982737 100644 --- a/chrome/content/zotero-platform/mac/overlay.css +++ b/chrome/content/zotero-platform/mac/overlay.css @@ -16,24 +16,26 @@ max-width: 31px; } +/* TODO: Proper button styling */ +.zotero-tb-button { + border: 1px solid lightgray; + border-radius: 3px; +} +.zotero-tb-button:hover { + background: lightgray; +} + .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; - background: url("chrome://zotero/skin/mac/menubutton-end.png") right center/auto 24px no-repeat; } .zotero-tb-button[type=menu] { -moz-padding-end: 8px !important; } -.zotero-tb-button > .toolbarbutton-icon { - background: url("chrome://zotero/skin/mac/menubutton-start.png") left center/auto 24px no-repeat; - padding: 4px 4px 4px 11px; -} - /* For menu buttons, decrease left padding by 1px */ .zotero-tb-button[type=menu] > .toolbarbutton-icon { -moz-padding-start: 9px; @@ -49,19 +51,18 @@ } .zotero-tb-button:-moz-window-inactive > .toolbarbutton-icon { - background: url("chrome://zotero/skin/mac/menubutton-start-inactive-window.png") left center/auto 24px no-repeat; } /* Use a darker background when inactive so the button itself doesn't get too dark at 50% */ .zotero-tb-button:-moz-window-inactive, .zotero-tb-button:-moz-window-inactive:first-child, .zotero-tb-button:-moz-window-inactive:last-child { - background: url("chrome://zotero/skin/mac/menubutton-end-inactive-window.png") right center/auto 24px no-repeat; + /* TODO */ } .zotero-tb-button[open="true"], .zotero-tb-button:not([disabled="true"]):hover:active { - background: url("chrome://zotero/skin/mac/menubutton-end-pressed.png") right center/auto 24px no-repeat; + /* TODO */ } .zotero-tb-button > menupopup { @@ -86,7 +87,7 @@ .zotero-tb-button[open="true"] > .toolbarbutton-icon, .zotero-tb-button:not([disabled="true"]):hover:active > .toolbarbutton-icon { - background: url("chrome://zotero/skin/mac/menubutton-start-pressed.png") left center/auto 24px no-repeat; + /* TODO */ } .zotero-tb-button > .toolbarbutton-text { @@ -378,12 +379,6 @@ treechildren::-moz-tree-image { /* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */ @media (min-resolution: 1.25dppx) { - .zotero-tb-button,.zotero-tb-button:first-child,.zotero-tb-button:last-child { background: url("chrome://zotero/skin/mac/menubutton-end@2x.png") right center/auto 24px no-repeat; } - .zotero-tb-button > .toolbarbutton-icon { background: url("chrome://zotero/skin/mac/menubutton-start@2x.png") left center/auto 24px no-repeat; } - .zotero-tb-button:-moz-window-inactive > .toolbarbutton-icon { background: url("chrome://zotero/skin/mac/menubutton-start-inactive-window@2x.png") left center/auto 24px no-repeat; } - .zotero-tb-button:-moz-window-inactive,.zotero-tb-button:-moz-window-inactive:first-child,.zotero-tb-button:-moz-window-inactive:last-child { background: url("chrome://zotero/skin/mac/menubutton-end-inactive-window@2x.png") right center/auto 24px no-repeat; } - .zotero-tb-button[open="true"],.zotero-tb-button:not([disabled="true"]):hover:active { background: url("chrome://zotero/skin/mac/menubutton-end-pressed@2x.png") right center/auto 24px no-repeat; } - .zotero-tb-button[open="true"] > .toolbarbutton-icon,.zotero-tb-button:not([disabled="true"]):hover:active > .toolbarbutton-icon { background: url("chrome://zotero/skin/mac/menubutton-start-pressed@2x.png") left center/auto 24px no-repeat; } #zotero-collections-splitter[state=collapsed] > grippy, #zotero-items-splitter[state=collapsed] > grippy { background: url(chrome://zotero/skin/mac/vgrippy@2x.png) center/auto 8px no-repeat; } #zotero-tags-splitter > grippy { background: url(chrome://zotero/skin/mac/hgrippy@2x.png) center/auto 8px no-repeat; } #zotero-tb-advanced-search { list-style-image: url('chrome://zotero/skin/mac/toolbar-advanced-search@2x.png'); } diff --git a/chrome/skin/default/zotero/mac/menubutton-end-active-pressed.png b/chrome/skin/default/zotero/mac/menubutton-end-active-pressed.png deleted file mode 100644 index 406ce76fef..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-end-active-pressed.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end-active-pressed@2x.png b/chrome/skin/default/zotero/mac/menubutton-end-active-pressed@2x.png deleted file mode 100644 index ce6680e7b1..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-end-active-pressed@2x.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end-active.png b/chrome/skin/default/zotero/mac/menubutton-end-active.png deleted file mode 100644 index 55093ac8e4..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-end-active.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end-active@2x.png b/chrome/skin/default/zotero/mac/menubutton-end-active@2x.png deleted file mode 100644 index 14016a7cac..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-end-active@2x.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end-inactive-window.png b/chrome/skin/default/zotero/mac/menubutton-end-inactive-window.png deleted file mode 100644 index 0a4fa9d347..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-end-inactive-window.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end-inactive-window@2x.png b/chrome/skin/default/zotero/mac/menubutton-end-inactive-window@2x.png deleted file mode 100644 index e1bc2ebc6d..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-end-inactive-window@2x.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end-pressed.png b/chrome/skin/default/zotero/mac/menubutton-end-pressed.png deleted file mode 100644 index 3e451f1075..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-end-pressed.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end-pressed@2x.png b/chrome/skin/default/zotero/mac/menubutton-end-pressed@2x.png deleted file mode 100644 index cdf3cb3245..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-end-pressed@2x.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end.png b/chrome/skin/default/zotero/mac/menubutton-end.png deleted file mode 100644 index 494aaaf165..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-end.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end@2x.png b/chrome/skin/default/zotero/mac/menubutton-end@2x.png deleted file mode 100644 index 701ad4a907..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-end@2x.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start-active-pressed.png b/chrome/skin/default/zotero/mac/menubutton-start-active-pressed.png deleted file mode 100644 index 92e4b75cb8..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-start-active-pressed.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start-active-pressed@2x.png b/chrome/skin/default/zotero/mac/menubutton-start-active-pressed@2x.png deleted file mode 100644 index ee71341c17..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-start-active-pressed@2x.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start-active.png b/chrome/skin/default/zotero/mac/menubutton-start-active.png deleted file mode 100644 index aa588c4f6c..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-start-active.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start-active@2x.png b/chrome/skin/default/zotero/mac/menubutton-start-active@2x.png deleted file mode 100644 index 3e89ef1a3d..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-start-active@2x.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start-inactive-window.png b/chrome/skin/default/zotero/mac/menubutton-start-inactive-window.png deleted file mode 100644 index 0311fa4574..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-start-inactive-window.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start-inactive-window@2x.png b/chrome/skin/default/zotero/mac/menubutton-start-inactive-window@2x.png deleted file mode 100644 index 7bcbcc367f..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-start-inactive-window@2x.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start-pressed.png b/chrome/skin/default/zotero/mac/menubutton-start-pressed.png deleted file mode 100644 index afd3fd7fd8..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-start-pressed.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start-pressed@2x.png b/chrome/skin/default/zotero/mac/menubutton-start-pressed@2x.png deleted file mode 100644 index 478f0331fc..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-start-pressed@2x.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start.png b/chrome/skin/default/zotero/mac/menubutton-start.png deleted file mode 100644 index d46a23c99b..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-start.png and /dev/null differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start@2x.png b/chrome/skin/default/zotero/mac/menubutton-start@2x.png deleted file mode 100644 index ba2c20b737..0000000000 Binary files a/chrome/skin/default/zotero/mac/menubutton-start@2x.png and /dev/null differ