Unity Asset Pool

Merge lp:~submarine/unity-asset-pool/more-master-scopes-icons into lp:unity-asset-pool

  1. more-master-scopes-icons
  2. Merge into trunk
Proposed by David Callé
Status: Merged
Approved by: Francis Ginther
Approved revision: 71
Merged at revision: 72
Proposed branch: lp:~submarine/unity-asset-pool/more-master-scopes-icons
Merge into: lp:unity-asset-pool
Diff against target: 260 lines (+251/-0)
2 files modified
unity-icon-theme/places/svg/group-calendar.svg (+121/-0)
unity-icon-theme/places/svg/group-recipes.svg (+130/-0)
To merge this branch: bzr merge lp:~submarine/unity-asset-pool/more-master-scopes-icons
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+154423@code.launchpad.net

Commit message

Add master scope icons for recipes and calendar

Description of the change

Add master scope icons for recipes and calendar

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

great!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-asset-pool-mbs-autolanding/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-asset-pool-mbs-autolanding/./build=panda-pbuilder,distribution=raring,flavor=armhf/10/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-asset-pool-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-asset-pool-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/10

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Possible transient network or builder issue. Setting to approved again to retry. If it fails again, I'll take a closer look.

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'unity-icon-theme/places/svg/group-calendar.svg'
2--- unity-icon-theme/places/svg/group-calendar.svg 1970-01-01 00:00:00 +0000
3+++ unity-icon-theme/places/svg/group-calendar.svg 2013-03-20 16:24:07 +0000
4@@ -0,0 +1,121 @@
5+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
6+<!-- Created with Inkscape (http://www.inkscape.org/) -->
7+
8+<svg
9+ xmlns:dc="http://purl.org/dc/elements/1.1/"
10+ xmlns:cc="http://creativecommons.org/ns#"
11+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
12+ xmlns:svg="http://www.w3.org/2000/svg"
13+ xmlns="http://www.w3.org/2000/svg"
14+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
15+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
16+ width="22"
17+ height="22"
18+ id="svg2"
19+ version="1.1"
20+ inkscape:version="0.48+devel r12226"
21+ sodipodi:docname="group-calendar.svg">
22+ <defs
23+ id="defs4">
24+ <inkscape:perspective
25+ id="perspective2447"
26+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
27+ inkscape:vp_z="744.09448 : 526.18109 : 1"
28+ inkscape:vp_y="0 : 1000 : 0"
29+ inkscape:vp_x="0 : 526.18109 : 1"
30+ sodipodi:type="inkscape:persp3d" />
31+ <inkscape:perspective
32+ sodipodi:type="inkscape:persp3d"
33+ inkscape:vp_x="0 : 0.5 : 1"
34+ inkscape:vp_y="0 : 1000 : 0"
35+ inkscape:vp_z="1 : 0.5 : 1"
36+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
37+ id="perspective2846" />
38+ <inkscape:perspective
39+ id="perspective2824"
40+ inkscape:persp3d-origin="32 : 21.333333 : 1"
41+ inkscape:vp_z="64 : 32 : 1"
42+ inkscape:vp_y="0 : 1000 : 0"
43+ inkscape:vp_x="0 : 32 : 1"
44+ sodipodi:type="inkscape:persp3d" />
45+ </defs>
46+ <sodipodi:namedview
47+ id="base"
48+ pagecolor="#888888"
49+ bordercolor="#666666"
50+ borderopacity="1.0"
51+ inkscape:pageopacity="1"
52+ inkscape:pageshadow="2"
53+ inkscape:zoom="11.641532"
54+ inkscape:cx="16.537428"
55+ inkscape:cy="-5.8816671"
56+ inkscape:document-units="px"
57+ inkscape:current-layer="layer1"
58+ showgrid="true"
59+ inkscape:window-width="1920"
60+ inkscape:window-height="1029"
61+ inkscape:window-x="0"
62+ inkscape:window-y="24"
63+ inkscape:window-maximized="1"
64+ inkscape:snap-global="true"
65+ inkscape:snap-bbox="true"
66+ inkscape:bbox-paths="true"
67+ inkscape:snap-bbox-edge-midpoints="true"
68+ inkscape:bbox-nodes="true"
69+ inkscape:snap-bbox-midpoints="true"
70+ inkscape:snap-grids="true"
71+ showguides="false"
72+ showborder="true">
73+ <inkscape:grid
74+ type="xygrid"
75+ id="grid2985"
76+ empspacing="8"
77+ visible="true"
78+ enabled="true"
79+ snapvisiblegridlinesonly="true" />
80+ </sodipodi:namedview>
81+ <metadata
82+ id="metadata7">
83+ <rdf:RDF>
84+ <cc:Work
85+ rdf:about="">
86+ <dc:format>image/svg+xml</dc:format>
87+ <dc:type
88+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
89+ <dc:title></dc:title>
90+ </cc:Work>
91+ </rdf:RDF>
92+ </metadata>
93+ <g
94+ inkscape:label="Layer 1"
95+ inkscape:groupmode="layer"
96+ id="layer1"
97+ transform="translate(0,-1030.3622)">
98+ <path
99+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
100+ d="M 4 5 C 3.446 5 3 5.446 3 6 L 3 19 C 3 19.554 3.446 20 4 20 L 18 20 C 18.554 20 19 19.554 19 19 L 19 6 C 19 5.446 18.554 5 18 5 L 17 5 L 17 6 C 17 7.108 16.108 8 15 8 C 13.892 8 13 7.108 13 6 L 13 5 L 9 5 L 9 6 C 9 7.108 8.108 8 7 8 C 5.892 8 5 7.108 5 6 L 5 5 L 4 5 z M 5 9 L 17 9 L 17 18 L 5 18 L 5 9 z "
101+ transform="translate(0,1030.3622)"
102+ id="path4193" />
103+ <rect
104+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
105+ id="rect4197"
106+ width="2"
107+ height="5.0000172"
108+ x="6"
109+ y="1032.3622"
110+ ry="1" />
111+ <path
112+ id="path4205"
113+ d="m 10,1040.3622 -1,1 0,1 1,0 0,5 2,0 0,-7 L 10,1040.3622 Z"
114+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
115+ inkscape:connector-curvature="0" />
116+ <rect
117+ ry="1"
118+ y="1032.3622"
119+ x="14"
120+ height="5.0000172"
121+ width="2"
122+ id="rect4213"
123+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
124+ </g>
125+</svg>
126
127=== added file 'unity-icon-theme/places/svg/group-recipes.svg'
128--- unity-icon-theme/places/svg/group-recipes.svg 1970-01-01 00:00:00 +0000
129+++ unity-icon-theme/places/svg/group-recipes.svg 2013-03-20 16:24:07 +0000
130@@ -0,0 +1,130 @@
131+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
132+<!-- Created with Inkscape (http://www.inkscape.org/) -->
133+
134+<svg
135+ xmlns:dc="http://purl.org/dc/elements/1.1/"
136+ xmlns:cc="http://creativecommons.org/ns#"
137+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
138+ xmlns:svg="http://www.w3.org/2000/svg"
139+ xmlns="http://www.w3.org/2000/svg"
140+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
141+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
142+ width="22"
143+ height="22"
144+ id="svg2"
145+ version="1.1"
146+ inkscape:version="0.48+devel r12226"
147+ sodipodi:docname="group-recipes.svg">
148+ <defs
149+ id="defs4">
150+ <inkscape:perspective
151+ id="perspective2447"
152+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
153+ inkscape:vp_z="744.09448 : 526.18109 : 1"
154+ inkscape:vp_y="0 : 1000 : 0"
155+ inkscape:vp_x="0 : 526.18109 : 1"
156+ sodipodi:type="inkscape:persp3d" />
157+ <inkscape:perspective
158+ sodipodi:type="inkscape:persp3d"
159+ inkscape:vp_x="0 : 0.5 : 1"
160+ inkscape:vp_y="0 : 1000 : 0"
161+ inkscape:vp_z="1 : 0.5 : 1"
162+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
163+ id="perspective2846" />
164+ <inkscape:perspective
165+ id="perspective2824"
166+ inkscape:persp3d-origin="32 : 21.333333 : 1"
167+ inkscape:vp_z="64 : 32 : 1"
168+ inkscape:vp_y="0 : 1000 : 0"
169+ inkscape:vp_x="0 : 32 : 1"
170+ sodipodi:type="inkscape:persp3d" />
171+ </defs>
172+ <sodipodi:namedview
173+ id="base"
174+ pagecolor="#888888"
175+ bordercolor="#666666"
176+ borderopacity="1.0"
177+ inkscape:pageopacity="1"
178+ inkscape:pageshadow="2"
179+ inkscape:zoom="14.551915"
180+ inkscape:cx="11.871407"
181+ inkscape:cy="0.3273544"
182+ inkscape:document-units="px"
183+ inkscape:current-layer="layer1"
184+ showgrid="false"
185+ inkscape:window-width="1920"
186+ inkscape:window-height="1029"
187+ inkscape:window-x="0"
188+ inkscape:window-y="24"
189+ inkscape:window-maximized="1"
190+ inkscape:snap-global="true"
191+ inkscape:snap-bbox="true"
192+ inkscape:bbox-paths="true"
193+ inkscape:snap-bbox-edge-midpoints="true"
194+ inkscape:bbox-nodes="true"
195+ inkscape:snap-bbox-midpoints="true"
196+ inkscape:snap-grids="true"
197+ showguides="false"
198+ showborder="true">
199+ <inkscape:grid
200+ type="xygrid"
201+ id="grid2985"
202+ empspacing="8"
203+ visible="true"
204+ enabled="true"
205+ snapvisiblegridlinesonly="true" />
206+ </sodipodi:namedview>
207+ <metadata
208+ id="metadata7">
209+ <rdf:RDF>
210+ <cc:Work
211+ rdf:about="">
212+ <dc:format>image/svg+xml</dc:format>
213+ <dc:type
214+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
215+ <dc:title></dc:title>
216+ </cc:Work>
217+ </rdf:RDF>
218+ </metadata>
219+ <g
220+ inkscape:label="Layer 1"
221+ inkscape:groupmode="layer"
222+ id="layer1"
223+ transform="translate(0,-1030.3622)">
224+ <path
225+ sodipodi:type="arc"
226+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
227+ id="path815"
228+ sodipodi:cx="5.5"
229+ sodipodi:cy="5.5"
230+ sodipodi:rx="3.5"
231+ sodipodi:ry="3.5"
232+ d="M 9,5.5 A 3.5,3.5 0 1 1 2,5.5 3.5,3.5 0 1 1 9,5.5 Z"
233+ transform="translate(-1.1571428e-7,1031.3622)" />
234+ <path
235+ transform="translate(11,1031.3622)"
236+ d="M 9,5.5 A 3.5,3.5 0 1 1 2,5.5 3.5,3.5 0 1 1 9,5.5 Z"
237+ sodipodi:ry="3.5"
238+ sodipodi:rx="3.5"
239+ sodipodi:cy="5.5"
240+ sodipodi:cx="5.5"
241+ id="path817"
242+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
243+ sodipodi:type="arc" />
244+ <path
245+ sodipodi:type="arc"
246+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
247+ id="path819"
248+ sodipodi:cx="5.5"
249+ sodipodi:cy="5.5"
250+ sodipodi:rx="3.5"
251+ sodipodi:ry="3.5"
252+ d="M 9,5.5 A 3.5,3.5 0 1 1 2,5.5 3.5,3.5 0 1 1 9,5.5 Z"
253+ transform="matrix(0.85714687,0,0,0.85714687,6.285692,1031.6479)" />
254+ <path
255+ style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
256+ d="M 7 7 C 6.4459904 7 6 7.4459904 6 8 L 6 15 L 16 15 L 16 8 C 16 7.4459904 15.55401 7 15 7 L 7 7 z M 6 16 L 6 18 C 6 18.55401 6.4459904 19 7 19 L 15 19 C 15.55401 19 16 18.55401 16 18 L 16 16 L 6 16 z "
257+ transform="translate(0,1030.3622)"
258+ id="rect821" />
259+ </g>
260+</svg>

Subscribers

People subscribed via source and target branches

to all changes: