use a 36px svg close icon

This commit is contained in:
Tom Beckmann 2014-07-17 02:18:34 +02:00
parent ce5fb86e1b
commit bf65d00e39
4 changed files with 234 additions and 4 deletions

View File

@ -1,5 +1,5 @@
stylesdir = $(pkgdatadir)
styles_DATA = gala.css texture.png close.png
styles_DATA = gala.css texture.png close.svg
applicationsdir = $(datadir)/applications
applications_DATA = gala.desktop
@ -22,7 +22,7 @@ EXTRA_DIST = \
gala.css \
gala.desktop \
texture.png \
close.png \
close.svg \
org.pantheon.desktop.gala.gschema.xml.in.in \
$(NULL)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

230
data/close.svg Normal file
View File

@ -0,0 +1,230 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="36"
height="36"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="close.svg"
inkscape:export-filename="/home/daniel/overview.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4">
<linearGradient
id="linearGradient8590"
osb:paint="solid">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop8592" />
</linearGradient>
<filter
color-interpolation-filters="sRGB"
inkscape:collect="always"
id="filter6743-0-7"
x="-0.12000016"
width="1.2400002"
y="-0.11999984"
height="1.2399997">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="1.1000015"
id="feGaussianBlur6745-1-9" />
</filter>
<linearGradient
id="linearGradient7232-8-8-68-3">
<stop
offset="0"
style="stop-color:#7e7e7e;stop-opacity:1;"
id="stop7234-8-8-5-3" />
<stop
offset="1"
style="stop-color:#3e3e3e;stop-opacity:1;"
id="stop7236-3-00-8-3" />
</linearGradient>
<linearGradient
id="linearGradient13056-7-3-6">
<stop
offset="0"
style="stop-color:#ffffff;stop-opacity:1"
id="stop13058-5-11-1" />
<stop
offset="0.44780642"
style="stop-color:#ffffff;stop-opacity:0.23529412"
id="stop13060-4-2-7" />
<stop
offset="0.78098851"
style="stop-color:#ffffff;stop-opacity:0.15686275"
id="stop13062-4-7-6" />
<stop
offset="1"
style="stop-color:#ffffff;stop-opacity:0.39215687"
id="stop13064-7-7-7" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient13056-7-3-6"
id="linearGradient5187"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(2.9743594,0,0,0.90436603,45.192139,397.46536)"
x1="26.453793"
y1="77.927414"
x2="26.453793"
y2="109.82289" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient7232-8-8-68-3"
id="linearGradient5190"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.49144378,0,0,1.503194,-240.19308,-414.73873)"
x1="721.04901"
y1="583.98163"
x2="721.04901"
y2="607.51257" />
<linearGradient
id="linearGradient13056-7-3-6-9">
<stop
offset="0"
style="stop-color:#ffffff;stop-opacity:1"
id="stop13058-5-11-1-56" />
<stop
offset="0.44780642"
style="stop-color:#ffffff;stop-opacity:0.23529412"
id="stop13060-4-2-7-4" />
<stop
offset="0.78098851"
style="stop-color:#ffffff;stop-opacity:0.15686275"
id="stop13062-4-7-6-4" />
<stop
offset="1"
style="stop-color:#ffffff;stop-opacity:0.39215687"
id="stop13064-7-7-7-1" />
</linearGradient>
<linearGradient
y2="109.82289"
x2="26.453793"
y1="77.927414"
x1="26.453793"
gradientTransform="matrix(2.7692312,0,0,0.84199596,49.730612,403.3212)"
gradientUnits="userSpaceOnUse"
id="linearGradient5208"
xlink:href="#linearGradient13056-7-3-6-9"
inkscape:collect="always" />
<filter
inkscape:collect="always"
id="filter5323"
color-interpolation-filters="sRGB">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="1.0385"
id="feGaussianBlur5325" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="9.921875"
inkscape:cx="16"
inkscape:cy="16"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-width="1440"
inkscape:window-height="845"
inkscape:window-x="0"
inkscape:window-y="30"
inkscape:window-maximized="1"
showborder="true"
borderlayer="true"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0">
<inkscape:grid
type="xygrid"
id="grid5966"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
originx="-93px"
originy="-550.98719px" />
</sodipodi:namedview>
<metadata
id="metadata7">
<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 />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-93,-465.375)">
<path
style="opacity:0.3;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5323);enable-background:accumulate"
id="path2555-7-1-4-4-8-6-5-1-0-2-9-5"
d="m 111.00002,467.86216 c -8.55243,0 -15.500018,6.94763 -15.500018,15.5 0,8.55237 6.947588,15.5 15.500018,15.5 8.55235,0 15.5,-6.94763 15.49998,-15.5 0,-8.55237 -6.94763,-15.5 -15.49998,-15.5 z"
inkscape:connector-curvature="0" />
<path
style="color:#000000;fill:url(#linearGradient5190);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999982;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path2555-7-1-4-4-8-6-5-1-0-2-9"
d="m 111.00002,466.875 c -8.55243,0 -15.500018,6.94763 -15.500018,15.5 0,8.55237 6.947588,15.5 15.500018,15.5 8.55235,0 15.5,-6.94763 15.49998,-15.5 0,-8.55237 -6.94763,-15.5 -15.49998,-15.5 z"
inkscape:connector-curvature="0" />
<path
style="opacity:0.2;color:#000000;fill:none;stroke:url(#linearGradient5187);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3019-2-0-4-7-1-46-6-0-3-3"
d="m 125.5,482.375 c 0,-8.00809 -6.49188,-14.5 -14.50008,-14.5 -8.00811,0 -14.49992,6.49191 -14.49992,14.5 0,8.00809 6.49181,14.5 14.49992,14.5 8.0082,0 14.50008,-6.49191 14.50008,-14.5 z"
inkscape:connector-curvature="0" />
<path
style="opacity:0.4;color:#000000;fill:none;stroke:#000000;stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3019-2-0-4-7-1-46-65-2-0"
d="m 126.5,482.375 c 0,-8.56039 -6.9396,-15.5 -15.50007,-15.5 -8.5604,0 -15.499928,6.93961 -15.499928,15.5 0,8.56038 6.939528,15.5 15.499928,15.5 8.56047,0 15.50007,-6.93962 15.50007,-15.5 z"
inkscape:connector-curvature="0" />
<path
style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 106.71875,476.51284 c -0.2024,-0.0104 -0.42158,-0.008 -0.625,0.0312 -0.5274,0.10255 -0.94308,0.38056 -1.25,0.6875 -0.95362,0.95361 -0.95361,2.54639 0,3.5 l 2.65625,2.65625 -2.65625,2.65625 c -0.95362,0.95361 -0.95361,2.54639 0,3.5 0.95361,0.9536 2.54639,0.9536 3.5,0 l 2.65625,-2.6562 2.65625,2.65625 c 0.95361,0.9536 2.54639,0.9536 3.5,0 0.95361,-0.95361 0.95362,-2.54639 0,-3.5 l -2.65625,-2.65625 2.65625,-2.65625 c 0.95361,-0.95361 0.95362,-2.54639 0,-3.5 -0.4768,-0.4768 -1.1175,-0.71875 -1.75,-0.71875 -0.6325,0 -1.2732,0.24195 -1.75,0.71875 L 111,479.88784 l -2.65625,-2.65625 c -0.44811,-0.44813 -1.0178,-0.68768 -1.625,-0.71875 z"
id="path5186"
inkscape:connector-curvature="0"
sodipodi:nodetypes="sccscssscssscssssccs" />
<path
style="opacity:0.07000002;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 106.28125,477.48114 c -0.28337,0.0551 -0.52965,0.21714 -0.75,0.4375 -0.58761,0.5876 -0.58761,1.53739 0,2.125 l 3.34375,3.34375 -3.34375,3.34375 c -0.58761,0.5876 -0.58761,1.53739 0,2.125 0.58761,0.5876 1.53739,0.5876 2.125,0 L 111,485.51239 l 3.34375,3.34375 c 0.58761,0.5876 1.53739,0.5876 2.125,0 0.58761,-0.58761 0.58761,-1.5374 0,-2.125 l -3.34375,-3.34375 3.34375,-3.34375 c 0.58761,-0.58761 0.58761,-1.5374 0,-2.125 -0.58761,-0.58761 -1.53739,-0.58761 -2.125,0 L 111,481.26239 l -3.34375,-3.34375 c -0.36725,-0.36726 -0.90272,-0.52932 -1.375,-0.4375 z"
id="rect5962"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 106.28125,476.48159 c -0.28337,0.0551 -0.52965,0.21715 -0.75,0.4375 -0.58761,0.5876 -0.58761,1.53739 0,2.125 l 3.34375,3.34375 -3.34375,3.34375 c -0.58761,0.5876 -0.58761,1.53739 0,2.125 0.58761,0.5876 1.53739,0.5876 2.125,0 L 111,484.51284 l 3.34375,3.34375 c 0.58761,0.5876 1.5374,0.5876 2.125,0 0.58761,-0.58761 0.58761,-1.5374 0,-2.125 l -3.34375,-3.34375 3.34375,-3.34375 c 0.58761,-0.58761 0.58761,-1.5374 0,-2.125 -0.5876,-0.58761 -1.53739,-0.58761 -2.125,0 L 111,480.26284 l -3.34375,-3.34375 c -0.36725,-0.36726 -0.90272,-0.52931 -1.375,-0.4375 z"
id="rect5962-1" />
<path
style="opacity:0.07000002;color:#000000;fill:none;stroke:url(#linearGradient5208);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3019-2-0-4-7-1-46-6-0-3-3-3"
d="m 124.5,482.375 c 0,-7.45581 -6.04416,-13.5 -13.50007,-13.5 -7.45583,0 -13.49993,6.04419 -13.49993,13.5 0,7.45581 6.0441,13.5 13.49993,13.5 7.45591,0 13.50007,-6.04419 13.50007,-13.5 z"
inkscape:connector-curvature="0" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -305,7 +305,7 @@ namespace Gala
{
if (close_pixbuf == null) {
try {
close_pixbuf = new Gdk.Pixbuf.from_file (Config.PKGDATADIR + "/close.png");
close_pixbuf = new Gdk.Pixbuf.from_file (Config.PKGDATADIR + "/close.svg");
} catch (Error e) {
warning (e.message);
return null;
@ -325,7 +325,7 @@ namespace Gala
var pixbuf = get_close_button_pixbuf ();
texture.reactive = true;
texture.set_size (28, 28);
texture.set_size (36, 36);
if (pixbuf != null) {
try {