diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css index af79f9a918..a92ba21023 100644 --- a/chrome/content/zotero-platform/mac/overlay.css +++ b/chrome/content/zotero-platform/mac/overlay.css @@ -16,26 +16,24 @@ 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; @@ -51,18 +49,19 @@ } .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 { - /* TODO */ + background: url("chrome://zotero/skin/mac/menubutton-end-inactive-window.png") right center/auto 24px no-repeat; } .zotero-tb-button[open="true"], .zotero-tb-button:not([disabled="true"]):hover:active { - /* TODO */ + background: url("chrome://zotero/skin/mac/menubutton-end-pressed.png") right center/auto 24px no-repeat; } .zotero-tb-button > menupopup { @@ -87,7 +86,7 @@ .zotero-tb-button[open="true"] > .toolbarbutton-icon, .zotero-tb-button:not([disabled="true"]):hover:active > .toolbarbutton-icon { - /* TODO */ + background: url("chrome://zotero/skin/mac/menubutton-start-pressed.png") left center/auto 24px no-repeat; } .zotero-tb-button > .toolbarbutton-text { @@ -375,6 +374,12 @@ 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 new file mode 100644 index 0000000000..406ce76fef Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-end-active-pressed.png 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 new file mode 100644 index 0000000000..ce6680e7b1 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-end-active-pressed@2x.png differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end-active.png b/chrome/skin/default/zotero/mac/menubutton-end-active.png new file mode 100644 index 0000000000..55093ac8e4 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-end-active.png 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 new file mode 100644 index 0000000000..14016a7cac Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-end-active@2x.png 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 new file mode 100644 index 0000000000..0a4fa9d347 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-end-inactive-window.png 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 new file mode 100644 index 0000000000..e1bc2ebc6d Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-end-inactive-window@2x.png differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end-pressed.png b/chrome/skin/default/zotero/mac/menubutton-end-pressed.png new file mode 100644 index 0000000000..3e451f1075 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-end-pressed.png 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 new file mode 100644 index 0000000000..cdf3cb3245 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-end-pressed@2x.png differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end.png b/chrome/skin/default/zotero/mac/menubutton-end.png new file mode 100644 index 0000000000..494aaaf165 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-end.png differ diff --git a/chrome/skin/default/zotero/mac/menubutton-end@2x.png b/chrome/skin/default/zotero/mac/menubutton-end@2x.png new file mode 100644 index 0000000000..701ad4a907 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-end@2x.png 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 new file mode 100644 index 0000000000..92e4b75cb8 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-start-active-pressed.png 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 new file mode 100644 index 0000000000..ee71341c17 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-start-active-pressed@2x.png differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start-active.png b/chrome/skin/default/zotero/mac/menubutton-start-active.png new file mode 100644 index 0000000000..aa588c4f6c Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-start-active.png 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 new file mode 100644 index 0000000000..3e89ef1a3d Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-start-active@2x.png 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 new file mode 100644 index 0000000000..0311fa4574 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-start-inactive-window.png 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 new file mode 100644 index 0000000000..7bcbcc367f Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-start-inactive-window@2x.png differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start-pressed.png b/chrome/skin/default/zotero/mac/menubutton-start-pressed.png new file mode 100644 index 0000000000..afd3fd7fd8 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-start-pressed.png 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 new file mode 100644 index 0000000000..478f0331fc Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-start-pressed@2x.png differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start.png b/chrome/skin/default/zotero/mac/menubutton-start.png new file mode 100644 index 0000000000..d46a23c99b Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-start.png differ diff --git a/chrome/skin/default/zotero/mac/menubutton-start@2x.png b/chrome/skin/default/zotero/mac/menubutton-start@2x.png new file mode 100644 index 0000000000..ba2c20b737 Binary files /dev/null and b/chrome/skin/default/zotero/mac/menubutton-start@2x.png differ