landscape-client-charm

Merge lp:~mthaddon/landscape-client-charm/lp-1686721 into lp:landscape-client-charm

  1. lp-1686721
  2. Merge into trunk
Proposed by Tom Haddon
Status: Merged
Merged at revision: 70
Proposed branch: lp:~mthaddon/landscape-client-charm/lp-1686721
Merge into: lp:landscape-client-charm
Diff against target: 202 lines (+29/-104)
1 file modified
icon.svg (+29/-104)
To merge this branch: bzr merge lp:~mthaddon/landscape-client-charm/lp-1686721
Reviewer Review Type Date Requested Status
🤖 Landscape Builder test results Needs Fixing
Simon Poirier (community) Approve
Review via email: mp+377862@code.launchpad.net

Commit message

Update icon per lp#1686721

Description of the change

Update icon per lp#1686721

To post a comment you must log in.
Revision history for this message
Simon Poirier (simpoir) wrote :

+1 LGTM

review: Approve
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Voting does not meet specified criteria. Required: Approve >= 2, Disapprove == 0. Got: 1 Approve.

Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

No approved revision specified.

Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Fail
Revno: 70
Branch: lp:~mthaddon/landscape-client-charm/lp-1686721
Jenkins: https://jenkins.canonical.com/landscape/job/latch-test-xenial/426/

review: Needs Fixing (test results)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'icon.svg'
2--- icon.svg 2015-04-14 15:36:41 +0000
3+++ icon.svg 2020-01-21 12:20:55 +0000
4@@ -13,8 +13,12 @@
5 height="96"
6 id="svg6517"
7 version="1.1"
8- inkscape:version="0.48.5 r10040"
9- sodipodi:docname="icon.svg">
10+ inkscape:version="0.91+devel r"
11+ sodipodi:docname="landscape_server.svg"
12+ inkscape:export-filename="/home/acollard/src/landscape-charm/update-landscape-logo/icon.png"
13+ inkscape:export-xdpi="39.380001"
14+ inkscape:export-ydpi="39.380001"
15+ viewBox="0 0 96 96">
16 <defs
17 id="defs6519">
18 <linearGradient
19@@ -108,15 +112,6 @@
20 sodipodi:nodetypes="sssssssss" />
21 </g>
22 </clipPath>
23- <filter
24- inkscape:collect="always"
25- id="filter891"
26- inkscape:label="Badge Shadow">
27- <feGaussianBlur
28- inkscape:collect="always"
29- stdDeviation="0.71999962"
30- id="feGaussianBlur893" />
31- </filter>
32 </defs>
33 <sodipodi:namedview
34 id="base"
35@@ -125,9 +120,9 @@
36 borderopacity="1.0"
37 inkscape:pageopacity="0.0"
38 inkscape:pageshadow="2"
39- inkscape:zoom="2"
40- inkscape:cx="125.40733"
41- inkscape:cy="49.32023"
42+ inkscape:zoom="4.8828125"
43+ inkscape:cx="12.608442"
44+ inkscape:cy="24.655966"
45 inkscape:document-units="px"
46 inkscape:current-layer="layer1"
47 showgrid="false"
48@@ -143,7 +138,8 @@
49 showborder="false"
50 showguides="false"
51 inkscape:guide-bbox="true"
52- inkscape:showpageshadow="false">
53+ inkscape:showpageshadow="false"
54+ inkscape:snap-page="true">
55 <inkscape:grid
56 type="xygrid"
57 id="grid821"
58@@ -154,19 +150,23 @@
59 <sodipodi:guide
60 orientation="1,0"
61 position="16,48"
62- id="guide823" />
63+ id="guide823"
64+ inkscape:locked="false" />
65 <sodipodi:guide
66 orientation="0,1"
67 position="64,80"
68- id="guide825" />
69+ id="guide825"
70+ inkscape:locked="false" />
71 <sodipodi:guide
72 orientation="1,0"
73 position="80,40"
74- id="guide827" />
75+ id="guide827"
76+ inkscape:locked="false" />
77 <sodipodi:guide
78 orientation="0,1"
79 position="64,16"
80- id="guide829" />
81+ id="guide829"
82+ inkscape:locked="false" />
83 </sodipodi:namedview>
84 <metadata
85 id="metadata6522">
86@@ -176,7 +176,7 @@
87 <dc:format>image/svg+xml</dc:format>
88 <dc:type
89 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
90- <dc:title></dc:title>
91+ <dc:title />
92 </cc:Work>
93 </rdf:RDF>
94 </metadata>
95@@ -188,98 +188,23 @@
96 style="display:inline">
97 <g
98 id="g4799"
99- transform="translate(-140.81466,18.64047)">
100+ transform="translate(-140.81466,18.64047)"
101+ style="">
102 <path
103- style="color:#000000;fill:#dc4a26;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.27819771;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter1121);enable-background:accumulate"
104- d="m -127.18534,681.51515 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.103022,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 c -27.215172,0 -31.103022,-3.89189 -31.103022,-31.13514 z"
105- id="path4784"
106- inkscape:connector-curvature="0"
107- sodipodi:nodetypes="sssssssss" />
108+ style="color:#000000;fill:#e95420;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.27819771;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
109+ d="M 48 0 A 48 48 0 0 0 0 48 A 48 48 0 0 0 48 96 A 48 48 0 0 0 96 48 A 48 48 0 0 0 48 0 z "
110+ transform="translate(-127.18534,616.65029)"
111+ id="path4784" />
112 <g
113 id="g4762"
114- transform="matrix(2.1900084,0,0,2.1900084,-117.51048,628.51515)">
115+ transform="matrix(2.1900084,0,0,2.1900084,-117.51048,628.51515)"
116+ style="">
117 <polygon
118 id="polygon4764"
119 points="24.5,26.5 10.5,26.5 10.5,6.5 11.5,6.5 11.5,25.5 23.5,25.5 23.5,22.5 14.5,22.5 14.5,7.5 13.5,7.5 13.5,23.5 22.5,23.5 22.5,24.5 12.5,24.5 12.5,6.5 15.5,6.5 15.5,21.5 24.5,21.5 "
120- style="fill:#ffffff"
121+ style="fill:#ffffff;"
122 transform="matrix(1.2739714,0,0,1.2739714,-4.7945022,-4.5205307)" />
123 </g>
124 </g>
125 </g>
126- <g
127- inkscape:groupmode="layer"
128- id="layer3"
129- inkscape:label="PLACE YOUR PICTOGRAM HERE"
130- style="display:inline" />
131- <g
132- inkscape:groupmode="layer"
133- id="layer2"
134- inkscape:label="BADGE"
135- style="display:none"
136- sodipodi:insensitive="true">
137- <g
138- style="display:inline"
139- transform="translate(-340.00001,-581)"
140- id="g4394"
141- clip-path="none">
142- <g
143- id="g855">
144- <g
145- inkscape:groupmode="maskhelper"
146- id="g870"
147- clip-path="url(#clipPath873)"
148- style="opacity:0.6;filter:url(#filter891)">
149- <path
150- transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
151- d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
152- sodipodi:ry="12"
153- sodipodi:rx="12"
154- sodipodi:cy="552.36218"
155- sodipodi:cx="252"
156- id="path844"
157- style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
158- sodipodi:type="arc" />
159- </g>
160- <g
161- id="g862">
162- <path
163- sodipodi:type="arc"
164- style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
165- id="path4398"
166- sodipodi:cx="252"
167- sodipodi:cy="552.36218"
168- sodipodi:rx="12"
169- sodipodi:ry="12"
170- d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
171- transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
172- <path
173- transform="matrix(1.25,0,0,1.25,33,-100.45273)"
174- d="m 264,552.36218 c 0,6.62742 -5.37258,12 -12,12 -6.62742,0 -12,-5.37258 -12,-12 0,-6.62741 5.37258,-12 12,-12 6.62742,0 12,5.37259 12,12 z"
175- sodipodi:ry="12"
176- sodipodi:rx="12"
177- sodipodi:cy="552.36218"
178- sodipodi:cx="252"
179- id="path4400"
180- style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
181- sodipodi:type="arc" />
182- <path
183- sodipodi:type="star"
184- style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
185- id="path4459"
186- sodipodi:sides="5"
187- sodipodi:cx="666.19574"
188- sodipodi:cy="589.50385"
189- sodipodi:r1="7.2431178"
190- sodipodi:r2="4.3458705"
191- sodipodi:arg1="1.0471976"
192- sodipodi:arg2="1.6755161"
193- inkscape:flatsided="false"
194- inkscape:rounded="0.1"
195- inkscape:randomized="0"
196- d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 -0.18379,0.41279 0.0427,4.27917 -0.34859,4.5051 z"
197- transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
198- </g>
199- </g>
200- </g>
201- </g>
202 </svg>

Subscribers

People subscribed via source and target branches

to all changes: