commit 88f1636d0890f89edb6490d9357376ff88397df2 parent 3afc50bbf6b6c26c4b309a10ad7dded7a73a6c6c Author: Dan Stillman <dstillman@zotero.org> Date: Wed, 10 Feb 2016 03:20:55 -0500 Toolbar icon tweaks - Fix spacing on Windows and Linux in latest Firefox versions - Tweak icon colors on Windows and OS X - Adjust Z SVG to take up full height, so Z is a full 16px instead of 14px with slight anti-aliasing - Use generated PNGs instead of SVG for Z toolbar icons, to remove the need for complicated size rules - Add separate platform-specific .svg files that are used by a zotero-build script, make-z-icons, to generate the Z PNGs; the main SVG is still used directly in the menu panel and customization palette, with platform media queries to determine the coloring Diffstat:
14 files changed, 638 insertions(+), 85 deletions(-)
diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css @@ -2,14 +2,6 @@ As of Fx36, the built-in Mac styles don't properly handle a menu-button within a combined button, so we need this ungodly mess. */ -/* Necessary to keep 32px icons from being rendered at full size */ -#zotero-toolbar-main-button[cui-areatype="toolbar"] > .toolbarbutton-icon, -#zotero-toolbar-main-button-single[cui-areatype="toolbar"] > .toolbarbutton-icon, -#zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon, -#zotero-toolbar-save-button-single[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - height: 16px; -} - #zotero-toolbar-buttons[cui-areatype="toolbar"] > separator, #zotero-toolbar-save-button[cui-areatype="toolbar"]:not(:hover) > .toolbarbutton-menubutton-dropmarker::before, #zotero-toolbar-buttons[cui-areatype="toolbar"]:hover > #zotero-toolbar-save-button { @@ -36,7 +28,7 @@ } #zotero-toolbar-save-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button { - min-width: 26px; + min-width: 27px; padding-left: 1px; padding-right: 1px; } diff --git a/chrome/content/zotero-platform/mac/zotero-z-16px-australis.png b/chrome/content/zotero-platform/mac/zotero-z-16px-australis.png Binary files differ. diff --git a/chrome/content/zotero-platform/mac/zotero-z-32px-australis.png b/chrome/content/zotero-platform/mac/zotero-z-32px-australis.png Binary files differ. diff --git a/chrome/content/zotero-platform/unix/overlay.css b/chrome/content/zotero-platform/unix/overlay.css @@ -9,31 +9,17 @@ /* * Nav bar */ -toolbar[id="nav-bar"] #zotero-toolbar-main-button-single .toolbarbutton-icon, -toolbar[id="nav-bar"] #zotero-toolbar-save-button-single .toolbarbutton-icon { - width: 32px; -} - -toolbar[id="nav-bar"] #zotero-toolbar-main-button .toolbarbutton-icon, -toolbar[id="nav-bar"] #zotero-toolbar-save-button .toolbarbutton-icon { - width: 28px; -} - toolbar[id="nav-bar"] #zotero-toolbar-buttons #zotero-toolbar-main-button { margin-right: -1px; + padding: 0; /* avoid shift on :active */ } toolbar[id="nav-bar"] #zotero-toolbar-main-button .toolbarbutton-icon { margin-left: 2px; - margin-right: -3px; padding-left: 5px !important; padding-right: 5px !important; } -toolbar[id="nav-bar"] #zotero-toolbar-save-button .toolbarbutton-icon { - width: 30px !important; -} - toolbar[id="nav-bar"] #zotero-toolbar-save-button > .toolbarbutton-menubutton-button { padding-left: 0; } @@ -78,7 +64,6 @@ toolbar[id="nav-bar"] #zotero-toolbar-buttons > separator { width: 1px; height: 18px; -moz-margin-end: -1px; - background-image: var(--toolbarbutton-combined-backgroundimage); background-clip: padding-box; background-position: center; background-repeat: no-repeat; @@ -162,10 +147,6 @@ toolbar:not([id="nav-bar"]) #zotero-toolbar-buttons separator { @media (min-resolution: 1.5dppx) { - #zotero-toolbar .toolbarbutton-icon { - width: 16px; - } - #zotero-tb-sync > .toolbarbutton-icon { width: 20px; } diff --git a/chrome/content/zotero-platform/unix/zotero-z-16px-australis.png b/chrome/content/zotero-platform/unix/zotero-z-16px-australis.png Binary files differ. diff --git a/chrome/content/zotero-platform/unix/zotero-z-32px-australis.png b/chrome/content/zotero-platform/unix/zotero-z-32px-australis.png Binary files differ. diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css @@ -10,32 +10,13 @@ * Nav bar */ toolbar[id="nav-bar"] #zotero-toolbar-main-button .toolbarbutton-icon { - width: 28px; /* 16 + 1 + 1 + 5 + 5 */ - padding-left: 5px !important; - padding-right: 5px !important; + padding-left: 6px !important; + padding-right: 6px !important; } toolbar[id="nav-bar"] #zotero-toolbar-save-button .toolbarbutton-icon { - width: 28px; /* 16 + 6 + 5 + 1 */ padding-left: 6px !important; - padding-right: 5px !important; -} - -toolbar[id="nav-bar"] #zotero-toolbar-main-button-single .toolbarbutton-icon { - width: 32px; -} - -toolbar[id="nav-bar"] #zotero-toolbar-save-button-single .toolbarbutton-icon { - width: 31px; /* Compensate for border on only one side */ -} - -/* Fix size when dragged to nav bar in Customize mode */ -toolbar[id="nav-bar"] toolbarpaletteitem #zotero-toolbar-save-button .toolbarbutton-icon { - width: 29px; -} - -toolbar[id="nav-bar"] #zotero-toolbar-buttons #zotero-toolbar-main-button { - margin-right: -1px; + padding-right: 6px !important; } toolbar[id="nav-bar"] #zotero-toolbar-buttons #zotero-toolbar-save-button > .toolbarbutton-menubutton-dropmarker .dropmarker-icon { @@ -46,13 +27,13 @@ toolbar[id="nav-bar"] #zotero-toolbar-buttons #zotero-toolbar-save-button > .too toolbar[id="nav-bar"] #zotero-toolbar-buttons > separator { margin-top: 11px; margin-bottom: 11px; - -moz-margin-end: -3px; + -moz-margin-start: -1px !important; + -moz-margin-end: -3px !important; } toolbar[id="nav-bar"] #zotero-toolbar-buttons > separator, toolbar[id="nav-bar"] #zotero-toolbar-buttons > #zotero-toolbar-save-button > .toolbarbutton-menubutton-dropmarker::before { width: 1px; - background-image: var(--toolbarbutton-combined-backgroundimage); } toolbar[id="nav-bar"] #zotero-toolbar-buttons > #zotero-toolbar-save-button > .toolbarbutton-menubutton-dropmarker::before { diff --git a/chrome/content/zotero-platform/win/zotero-z-16px-australis.png b/chrome/content/zotero-platform/win/zotero-z-16px-australis.png Binary files differ. diff --git a/chrome/content/zotero-platform/win/zotero-z-32px-australis.png b/chrome/content/zotero-platform/win/zotero-z-32px-australis.png Binary files differ. diff --git a/chrome/skin/default/zotero/zotero-z-32px-australis-mac.svg b/chrome/skin/default/zotero/zotero-z-32px-australis-mac.svg @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + viewBox="-8 -8 32 32" + width="32px" + height="32px" + id="svg2" + inkscape:version="0.91 r13725" + sodipodi:docname="zotero-z-32px-australis.svg"> + <metadata + id="metadata40"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1250" + inkscape:window-height="1087" + id="namedview38" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="4.9830508" + inkscape:cy="16" + inkscape:window-x="587" + inkscape:window-y="200" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <defs + id="defs4"> + <style + type="text/css" + id="style6"><![CDATA[ + /* + * This file is used by the make-z-icons build script to generate platform-specific + * PNGs for the main toolbar button. + */ + + polygon { + stroke: #4d4d4d; + } + #s1 { + stop-color: #4d4d4d; + } + #s2 { + stop-color: #4d4d4d; + } + ]]></style> + <linearGradient + x1="0" + y1="2" + x2="0" + y2="30" + gradientUnits="userSpaceOnUse" + id="lg"> + <stop + id="s1" + offset="0" /> + <stop + id="s2" + offset="1" /> + </linearGradient> + <filter + color-interpolation-filters="sRGB" + id="f"> + <feGaussianBlur + result="r8" + stdDeviation="0.5" + id="feGaussianBlur12" /> + <feOffset + result="r11" + dy="0.5" + dx="0" + id="feOffset14" /> + <feComposite + in2="r11" + operator="in" + in="SourceGraphic" + result="r6" + id="feComposite16" /> + <feFlood + flood-color="#000" + flood-opacity="0.75" + in="r6" + result="r10" + id="feFlood18" /> + <feBlend + in2="r10" + mode="normal" + in="r6" + result="r12" + id="feBlend20" /> + <feComposite + in2="SourceGraphic" + operator="in" + result="fbSourceGraphic" + id="feComposite22" /> + <feColorMatrix + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + in="fbSourceGraphic" + result="fbSourceGraphicAlpha" + id="feColorMatrix24" /> + <feFlood + in="fbSourceGraphic" + result="flood" + flood-color="#fff" + flood-opacity="0.5" + id="feFlood26" /> + <feComposite + in2="fbSourceGraphic" + operator="in" + in="flood" + result="c1" + id="feComposite28" /> + <feGaussianBlur + result="blur" + stdDeviation="1.5 0.01" + id="feGaussianBlur30" /> + <feOffset + result="offset" + dy="1.5" + dx="0" + id="feOffset32" /> + <feComposite + in2="offset" + operator="over" + in="fbSourceGraphic" + result="c2" + id="feComposite34" /> + </filter> + </defs> + <polygon + points="10.8,1.467 -2.267,1.467 -2.267,-6 18.267,-6 18.267,3.333 7.066,14.533 18.267,14.533 18.267,22 -2.267,22 -2.267,14.533 " + style="fill:url(#lg);stroke:#4d4d4d;stroke-width:0.2;stroke-miterlimit:4;filter:url(#f)" + id="polygon36" + transform="matrix(1.1331719,0,0,1.1331719,-1.0653754,-1.0653766)" /> +</svg> diff --git a/chrome/skin/default/zotero/zotero-z-32px-australis-unix.svg b/chrome/skin/default/zotero/zotero-z-32px-australis-unix.svg @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + viewBox="-8 -8 32 32" + width="32px" + height="32px" + id="svg2" + inkscape:version="0.91 r13725" + sodipodi:docname="zotero-z-32px-australis.svg"> + <metadata + id="metadata40"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1250" + inkscape:window-height="1087" + id="namedview38" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="4.9830508" + inkscape:cy="16" + inkscape:window-x="587" + inkscape:window-y="200" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <defs + id="defs4"> + <style + type="text/css" + id="style6"><![CDATA[ + /* + * This file is used by the make-z-icons build script to generate platform-specific + * PNGs for the main toolbar button. + */ + + polygon { + stroke: #000; + } + #s1 { + stop-color: #899199; + } + #s2 { + stop-color: #7f868d; + } + ]]></style> + <linearGradient + x1="0" + y1="2" + x2="0" + y2="30" + gradientUnits="userSpaceOnUse" + id="lg"> + <stop + id="s1" + offset="0" /> + <stop + id="s2" + offset="1" /> + </linearGradient> + <filter + color-interpolation-filters="sRGB" + id="f"> + <feGaussianBlur + result="r8" + stdDeviation="0.5" + id="feGaussianBlur12" /> + <feOffset + result="r11" + dy="0.5" + dx="0" + id="feOffset14" /> + <feComposite + in2="r11" + operator="in" + in="SourceGraphic" + result="r6" + id="feComposite16" /> + <feFlood + flood-color="#000" + flood-opacity="0.75" + in="r6" + result="r10" + id="feFlood18" /> + <feBlend + in2="r10" + mode="normal" + in="r6" + result="r12" + id="feBlend20" /> + <feComposite + in2="SourceGraphic" + operator="in" + result="fbSourceGraphic" + id="feComposite22" /> + <feColorMatrix + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + in="fbSourceGraphic" + result="fbSourceGraphicAlpha" + id="feColorMatrix24" /> + <feFlood + in="fbSourceGraphic" + result="flood" + flood-color="#fff" + flood-opacity="0.5" + id="feFlood26" /> + <feComposite + in2="fbSourceGraphic" + operator="in" + in="flood" + result="c1" + id="feComposite28" /> + <feGaussianBlur + result="blur" + stdDeviation="1.5 0.01" + id="feGaussianBlur30" /> + <feOffset + result="offset" + dy="1.5" + dx="0" + id="feOffset32" /> + <feComposite + in2="offset" + operator="over" + in="fbSourceGraphic" + result="c2" + id="feComposite34" /> + </filter> + </defs> + <polygon + points="10.8,1.467 -2.267,1.467 -2.267,-6 18.267,-6 18.267,3.333 7.066,14.533 18.267,14.533 18.267,22 -2.267,22 -2.267,14.533 " + style="fill:url(#lg);stroke:#4d4d4d;stroke-width:0.2;stroke-miterlimit:4;filter:url(#f)" + id="polygon36" + transform="matrix(1.1331719,0,0,1.1331719,-1.0653754,-1.0653766)" /> +</svg> diff --git a/chrome/skin/default/zotero/zotero-z-32px-australis-win.svg b/chrome/skin/default/zotero/zotero-z-32px-australis-win.svg @@ -0,0 +1,159 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + viewBox="-8 -8 32 32" + width="32px" + height="32px" + id="svg2" + inkscape:version="0.91 r13725" + sodipodi:docname="zotero-z-32px-australis-win.svg"> + <metadata + id="metadata40"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1250" + inkscape:window-height="1087" + id="namedview38" + showgrid="false" + inkscape:zoom="11.313708" + inkscape:cx="6.7817267" + inkscape:cy="8.9289322" + inkscape:window-x="638" + inkscape:window-y="223" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <defs + id="defs4"> + <style + type="text/css" + id="style6"><![CDATA[ + /* + * This file is used by the make-z-icons build script to generate platform-specific + * PNGs for the main toolbar button. + */ + + polygon { + stroke: #000 !important; + } + /* These colors are different from the ones in the SVG, because Firefox's Windows + toolbar icons are shaded differently from in the palette, which the SVG is used for. */ + #s1 { + stop-color: #66737f; + } + #s2 { + stop-color: #707f8c; + } + ]]></style> + <linearGradient + x1="0" + y1="2" + x2="0" + y2="30" + gradientUnits="userSpaceOnUse" + id="lg"> + <stop + id="s1" + offset="0" /> + <stop + id="s2" + offset="1" /> + </linearGradient> + <filter + color-interpolation-filters="sRGB" + id="f"> + <feGaussianBlur + result="r8" + stdDeviation="0.5" + id="feGaussianBlur12" /> + <feOffset + result="r11" + dy="0.5" + dx="0" + id="feOffset14" /> + <feComposite + in2="r11" + operator="in" + in="SourceGraphic" + result="r6" + id="feComposite16" /> + <feFlood + flood-color="#000" + flood-opacity="0.75" + in="r6" + result="r10" + id="feFlood18" /> + <feBlend + in2="r10" + mode="normal" + in="r6" + result="r12" + id="feBlend20" /> + <feComposite + in2="SourceGraphic" + operator="in" + result="fbSourceGraphic" + id="feComposite22" /> + <feColorMatrix + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + in="fbSourceGraphic" + result="fbSourceGraphicAlpha" + id="feColorMatrix24" /> + <feFlood + in="fbSourceGraphic" + result="flood" + flood-color="#fff" + flood-opacity="0.5" + id="feFlood26" /> + <feComposite + in2="fbSourceGraphic" + operator="in" + in="flood" + result="c1" + id="feComposite28" /> + <feGaussianBlur + result="blur" + stdDeviation="1.5 0.01" + id="feGaussianBlur30" /> + <feOffset + result="offset" + dy="1.5" + dx="0" + id="feOffset32" /> + <feComposite + in2="offset" + operator="over" + in="fbSourceGraphic" + result="c2" + id="feComposite34" /> + </filter> + </defs> + <polygon + points="18.267,3.333 7.066,14.533 18.267,14.533 18.267,22 -2.267,22 -2.267,14.533 10.8,1.467 -2.267,1.467 -2.267,-6 18.267,-6 " + style="fill:url(#lg);stroke:#000000;stroke-width:0.64156199;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#f)" + id="polygon36" + transform="matrix(1.1042352,0,0,1.1042352,-0.83388182,-0.83388292)" /> +</svg> diff --git a/chrome/skin/default/zotero/zotero-z-32px-australis.svg b/chrome/skin/default/zotero/zotero-z-32px-australis.svg @@ -1,8 +1,56 @@ -<?xml version="1.0"?> - -<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="-8 -8 32 32" width="32px" height="32px"> - <defs> - <style type="text/css"><![CDATA[ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + viewBox="-8 -8 32 32" + width="32px" + height="32px" + id="svg2" + inkscape:version="0.91 r13725" + sodipodi:docname="zotero-z-32px-australis.svg"> + <metadata + id="metadata40"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1250" + inkscape:window-height="1087" + id="namedview38" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="4.9830508" + inkscape:cy="16" + inkscape:window-x="587" + inkscape:window-y="200" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <defs + id="defs4"> + <style + type="text/css" + id="style6"><![CDATA[ polygon { stroke: #000; } @@ -41,32 +89,99 @@ /* Windows Aero */ @media (-moz-windows-theme: aero), (-moz-windows-theme: aero-lite) { #s1 { - stop-color: #85919e; + stop-color: #808c96; } #s2 { - stop-color: #68717d; + stop-color: #78838d; } } ]]></style> - <linearGradient x1="0" y1="2" x2="0" y2="30" gradientUnits="userSpaceOnUse" id="lg"> - <stop id="s1" offset="0" /> - <stop id="s2" offset="1" /> - </linearGradient> - <filter color-interpolation-filters="sRGB" id="f"> - <feGaussianBlur result="r8" stdDeviation="0.5" /> - <feOffset result="r11" dy="0.5" dx="0" /> - <feComposite in2="r11" operator="in" in="SourceGraphic" result="r6" /> - <feFlood flood-color="#000" flood-opacity="0.75" in="r6" result="r10" /> - <feBlend in2="r10" mode="normal" in="r6" result="r12" /> - <feComposite in2="SourceGraphic" operator="in" result="fbSourceGraphic" /> - <feColorMatrix values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" in="fbSourceGraphic" result="fbSourceGraphicAlpha" /> - <feFlood in="fbSourceGraphic" result="flood" flood-color="#fff" flood-opacity="0.5" /> - <feComposite in2="fbSourceGraphic" operator="in" in="flood" result="c1" /> - <feGaussianBlur result="blur" stdDeviation="1.5 0.01" /> - <feOffset result="offset" dy="1.5" dx="0" /> - <feComposite in2="offset" operator="over" in="fbSourceGraphic" result="c2" /> - </filter> - </defs> - <polygon points="-2.267,-6 18.267,-6 18.267,3.333 7.066,14.533 - 18.267,14.533 18.267,22 -2.267,22 -2.267,14.533 10.8,1.467 -2.267,1.467" style="fill: url(#lg); stroke-width: 0.2; stroke-miterlimit: 4; filter: url(#f);" /> + <linearGradient + x1="0" + y1="2" + x2="0" + y2="30" + gradientUnits="userSpaceOnUse" + id="lg"> + <stop + id="s1" + offset="0" /> + <stop + id="s2" + offset="1" /> + </linearGradient> + <filter + color-interpolation-filters="sRGB" + id="f"> + <feGaussianBlur + result="r8" + stdDeviation="0.5" + id="feGaussianBlur12" /> + <feOffset + result="r11" + dy="0.5" + dx="0" + id="feOffset14" /> + <feComposite + in2="r11" + operator="in" + in="SourceGraphic" + result="r6" + id="feComposite16" /> + <feFlood + flood-color="#000" + flood-opacity="0.75" + in="r6" + result="r10" + id="feFlood18" /> + <feBlend + in2="r10" + mode="normal" + in="r6" + result="r12" + id="feBlend20" /> + <feComposite + in2="SourceGraphic" + operator="in" + result="fbSourceGraphic" + id="feComposite22" /> + <feColorMatrix + values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0" + in="fbSourceGraphic" + result="fbSourceGraphicAlpha" + id="feColorMatrix24" /> + <feFlood + in="fbSourceGraphic" + result="flood" + flood-color="#fff" + flood-opacity="0.5" + id="feFlood26" /> + <feComposite + in2="fbSourceGraphic" + operator="in" + in="flood" + result="c1" + id="feComposite28" /> + <feGaussianBlur + result="blur" + stdDeviation="1.5 0.01" + id="feGaussianBlur30" /> + <feOffset + result="offset" + dy="1.5" + dx="0" + id="feOffset32" /> + <feComposite + in2="offset" + operator="over" + in="fbSourceGraphic" + result="c2" + id="feComposite34" /> + </filter> + </defs> + <polygon + points="10.8,1.467 -2.267,1.467 -2.267,-6 18.267,-6 18.267,3.333 7.066,14.533 18.267,14.533 18.267,22 -2.267,22 -2.267,14.533 " + style="fill:url(#lg);stroke:#4d4d4d;stroke-width:0.2;stroke-miterlimit:4;filter:url(#f)" + id="polygon36" + transform="matrix(1.1331719,0,0,1.1331719,-1.0653754,-1.0653766)" /> </svg> diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css @@ -32,7 +32,14 @@ #zotero-toolbar-main-button, #zotero-toolbar-main-button-single { - list-style-image: url("chrome://zotero/skin/zotero-z-32px-australis.svg"); + list-style-image: url("chrome://zotero-platform/content/zotero-z-16px-australis.png"); +} + +@media (min-resolution: 1.5dppx) { + #zotero-toolbar-main-button, + #zotero-toolbar-main-button-single { + list-style-image: url("chrome://zotero-platform/content/zotero-z-32px-australis.png"); + } } #zotero-toolbar-save-button, @@ -40,6 +47,13 @@ list-style-image: url("chrome://zotero/skin/treeitem-webpage.png"); } +#zotero-toolbar-main-button[cui-areatype="menu-panel"], +#zotero-toolbar-main-button-single[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] #zotero-toolbar-main-button, +toolbarpaletteitem[place="palette"] #zotero-toolbar-main-button-single { + list-style-image: url("chrome://zotero/skin/zotero-z-32px-australis.svg"); +} + #zotero-toolbar-save-button[cui-areatype="menu-panel"], #zotero-toolbar-save-button-single[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] #zotero-toolbar-save-button, @@ -48,9 +62,6 @@ toolbarpaletteitem[place="palette"] #zotero-toolbar-save-button-single { } /* Show single icon for combo buttons in palette */ -toolbarpaletteitem[place="palette"] #zotero-toolbar-main-button { - list-style-image: url("chrome://zotero/skin/zotero-z-32px-australis.svg"); -} toolbarpaletteitem[place="palette"] #zotero-toolbar-buttons separator, toolbarpaletteitem[place="palette"] #zotero-toolbar-buttons #zotero-toolbar-save-button { display:none;
