Merge lp:~aisrael/charms/precise/kusabax/charm-proof into lp:charms/kusabax

Proposed by Adam Israel
Status: Merged
Merged at revision: 10
Proposed branch: lp:~aisrael/charms/precise/kusabax/charm-proof
Merge into: lp:charms/kusabax
Diff against target: 317 lines (+294/-2)
2 files modified
config.yaml (+2/-2)
icon.svg (+292/-0)
To merge this branch: bzr merge lp:~aisrael/charms/precise/kusabax/charm-proof
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+233841@code.launchpad.net

Description of the change

Add generic icon.svg, fix truncated description key and fix default value for boolean type, in order to pass charm proof.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2014-03-26 03:37:18 +0000
3+++ config.yaml 2014-09-09 01:02:01 +0000
4@@ -2,7 +2,7 @@
5 domain-name:
6 default: 'blank'
7 type: string
8- descript: Website domain name, ie imageboard.com or overninethousand.net. If left 'blank', the ip address will be used. Can be changed after deployment
9+ description: Website domain name, ie imageboard.com or overninethousand.net. If left 'blank', the ip address will be used. Can be changed after deployment
10 board-name:
11 default: 'juju kusaba x'
12 type: string
13@@ -12,6 +12,6 @@
14 type: string
15 description: Site slogan, set to nothing to disable its display
16 style-switcher:
17- default: 'true'
18+ default: true
19 type: boolean
20 description: If true, will allow users to change style
21
22=== added file 'icon.svg'
23--- icon.svg 1970-01-01 00:00:00 +0000
24+++ icon.svg 2014-09-09 01:02:01 +0000
25@@ -0,0 +1,292 @@
26+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
27+<!-- Created with Inkscape (http://www.inkscape.org/) -->
28+
29+<svg
30+ xmlns:dc="http://purl.org/dc/elements/1.1/"
31+ xmlns:cc="http://creativecommons.org/ns#"
32+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
33+ xmlns:svg="http://www.w3.org/2000/svg"
34+ xmlns="http://www.w3.org/2000/svg"
35+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
36+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
37+ width="96"
38+ height="96"
39+ id="svg6517"
40+ version="1.1"
41+ inkscape:version="0.48.4 r9939"
42+ sodipodi:docname="juju-icon-placeholder-k.svg">
43+ <defs
44+ id="defs6519">
45+ <linearGradient
46+ id="Background">
47+ <stop
48+ id="stop4178"
49+ offset="0"
50+ style="stop-color:#b8b8b8;stop-opacity:1" />
51+ <stop
52+ id="stop4180"
53+ offset="1"
54+ style="stop-color:#c9c9c9;stop-opacity:1" />
55+ </linearGradient>
56+ <filter
57+ style="color-interpolation-filters:sRGB;"
58+ inkscape:label="Inner Shadow"
59+ id="filter1121">
60+ <feFlood
61+ flood-opacity="0.59999999999999998"
62+ flood-color="rgb(0,0,0)"
63+ result="flood"
64+ id="feFlood1123" />
65+ <feComposite
66+ in="flood"
67+ in2="SourceGraphic"
68+ operator="out"
69+ result="composite1"
70+ id="feComposite1125" />
71+ <feGaussianBlur
72+ in="composite1"
73+ stdDeviation="1"
74+ result="blur"
75+ id="feGaussianBlur1127" />
76+ <feOffset
77+ dx="0"
78+ dy="2"
79+ result="offset"
80+ id="feOffset1129" />
81+ <feComposite
82+ in="offset"
83+ in2="SourceGraphic"
84+ operator="atop"
85+ result="composite2"
86+ id="feComposite1131" />
87+ </filter>
88+ <filter
89+ style="color-interpolation-filters:sRGB;"
90+ inkscape:label="Drop Shadow"
91+ id="filter950">
92+ <feFlood
93+ flood-opacity="0.25"
94+ flood-color="rgb(0,0,0)"
95+ result="flood"
96+ id="feFlood952" />
97+ <feComposite
98+ in="flood"
99+ in2="SourceGraphic"
100+ operator="in"
101+ result="composite1"
102+ id="feComposite954" />
103+ <feGaussianBlur
104+ in="composite1"
105+ stdDeviation="1"
106+ result="blur"
107+ id="feGaussianBlur956" />
108+ <feOffset
109+ dx="0"
110+ dy="1"
111+ result="offset"
112+ id="feOffset958" />
113+ <feComposite
114+ in="SourceGraphic"
115+ in2="offset"
116+ operator="over"
117+ result="composite2"
118+ id="feComposite960" />
119+ <feBlend
120+ blend="normal"
121+ id="feBlend3895"
122+ in2="composite2" />
123+ </filter>
124+ <clipPath
125+ clipPathUnits="userSpaceOnUse"
126+ id="clipPath873">
127+ <g
128+ transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
129+ id="g875"
130+ inkscape:label="Layer 1"
131+ style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
132+ <path
133+ style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
134+ d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
135+ id="path877"
136+ inkscape:connector-curvature="0"
137+ sodipodi:nodetypes="sssssssss" />
138+ </g>
139+ </clipPath>
140+ <filter
141+ inkscape:collect="always"
142+ id="filter891"
143+ inkscape:label="Badge Shadow">
144+ <feGaussianBlur
145+ inkscape:collect="always"
146+ stdDeviation="0.71999962"
147+ id="feGaussianBlur893" />
148+ </filter>
149+ </defs>
150+ <sodipodi:namedview
151+ id="base"
152+ pagecolor="#ffffff"
153+ bordercolor="#666666"
154+ borderopacity="1.0"
155+ inkscape:pageopacity="0.0"
156+ inkscape:pageshadow="2"
157+ inkscape:zoom="8.1490724"
158+ inkscape:cx="6.3116087"
159+ inkscape:cy="46.975739"
160+ inkscape:document-units="px"
161+ inkscape:current-layer="layer3"
162+ showgrid="true"
163+ fit-margin-top="0"
164+ fit-margin-left="0"
165+ fit-margin-right="0"
166+ fit-margin-bottom="0"
167+ inkscape:window-width="1849"
168+ inkscape:window-height="1218"
169+ inkscape:window-x="123"
170+ inkscape:window-y="68"
171+ inkscape:window-maximized="0"
172+ showborder="true"
173+ showguides="true"
174+ inkscape:guide-bbox="true"
175+ inkscape:showpageshadow="false">
176+ <inkscape:grid
177+ type="xygrid"
178+ id="grid821" />
179+ <sodipodi:guide
180+ orientation="1,0"
181+ position="16,48"
182+ id="guide823" />
183+ <sodipodi:guide
184+ orientation="0,1"
185+ position="64,80"
186+ id="guide825" />
187+ <sodipodi:guide
188+ orientation="1,0"
189+ position="80,40"
190+ id="guide827" />
191+ <sodipodi:guide
192+ orientation="0,1"
193+ position="64,16"
194+ id="guide829" />
195+ </sodipodi:namedview>
196+ <metadata
197+ id="metadata6522">
198+ <rdf:RDF>
199+ <cc:Work
200+ rdf:about="">
201+ <dc:format>image/svg+xml</dc:format>
202+ <dc:type
203+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
204+ <dc:title />
205+ </cc:Work>
206+ </rdf:RDF>
207+ </metadata>
208+ <g
209+ inkscape:label="BACKGROUND"
210+ inkscape:groupmode="layer"
211+ id="layer1"
212+ transform="translate(268,-635.29076)"
213+ style="display:inline">
214+ <path
215+ style="fill:#333333;fill-opacity:0.93333334000000001;stroke:none;display:inline;filter:url(#filter1121);opacity:0.7"
216+ d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-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 -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
217+ id="path6455"
218+ inkscape:connector-curvature="0"
219+ sodipodi:nodetypes="sssssssss" />
220+ </g>
221+ <g
222+ inkscape:groupmode="layer"
223+ id="layer3"
224+ inkscape:label="PLACEHOLDER LETTER"
225+ style="display:inline">
226+ <text
227+ xml:space="preserve"
228+ style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter950);font-family:Sans"
229+ x="30.724001"
230+ y="69.1772"
231+ id="text3891"
232+ sodipodi:linespacing="125%"><tspan
233+ sodipodi:role="line"
234+ id="tspan3893"
235+ x="30.724001"
236+ y="69.1772"
237+ style="font-size:56px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Medium">k</tspan></text>
238+ <rect
239+ style="opacity:0.7;fill:none;stroke:none"
240+ id="rect3021"
241+ width="64"
242+ height="64"
243+ x="16"
244+ y="15.449201" />
245+ </g>
246+ <g
247+ inkscape:groupmode="layer"
248+ id="layer2"
249+ inkscape:label="BADGE"
250+ style="display:none"
251+ sodipodi:insensitive="true">
252+ <g
253+ style="display:inline"
254+ transform="translate(-340.00001,-581)"
255+ id="g4394"
256+ clip-path="none">
257+ <g
258+ id="g855">
259+ <g
260+ inkscape:groupmode="maskhelper"
261+ id="g870"
262+ clip-path="url(#clipPath873)"
263+ style="opacity:0.6;filter:url(#filter891)">
264+ <path
265+ transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
266+ 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"
267+ sodipodi:ry="12"
268+ sodipodi:rx="12"
269+ sodipodi:cy="552.36218"
270+ sodipodi:cx="252"
271+ id="path844"
272+ 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"
273+ sodipodi:type="arc" />
274+ </g>
275+ <g
276+ id="g862">
277+ <path
278+ sodipodi:type="arc"
279+ 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"
280+ id="path4398"
281+ sodipodi:cx="252"
282+ sodipodi:cy="552.36218"
283+ sodipodi:rx="12"
284+ sodipodi:ry="12"
285+ 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"
286+ transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
287+ <path
288+ transform="matrix(1.25,0,0,1.25,33,-100.45273)"
289+ 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"
290+ sodipodi:ry="12"
291+ sodipodi:rx="12"
292+ sodipodi:cy="552.36218"
293+ sodipodi:cx="252"
294+ id="path4400"
295+ 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"
296+ sodipodi:type="arc" />
297+ <path
298+ sodipodi:type="star"
299+ 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"
300+ id="path4459"
301+ sodipodi:sides="5"
302+ sodipodi:cx="666.19574"
303+ sodipodi:cy="589.50385"
304+ sodipodi:r1="7.2431178"
305+ sodipodi:r2="4.3458705"
306+ sodipodi:arg1="1.0471976"
307+ sodipodi:arg2="1.6755161"
308+ inkscape:flatsided="false"
309+ inkscape:rounded="0.1"
310+ inkscape:randomized="0"
311+ 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"
312+ transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
313+ </g>
314+ </g>
315+ </g>
316+ </g>
317+</svg>

Subscribers

People subscribed via source and target branches

to all changes: