Merge lp:~xnox/ubiquity/shade into lp:ubiquity

[Dimitri John Ledkov]

Shade the "white" ubuntu one icons and logo to color #DED9CB

https://plus.google.com/photos/105922848292507689403/albums/5885590889398435329/5885590891757603618?pid=5885590891757603618&oid=105922848292507689403

[Michael Vogt (mvo)]

On Tue, Jun 04, 2013 at 11:50:27AM -0000, Dmitrijs Ledkovs wrote:
> Dmitrijs Ledkovs has proposed merging lp:~xnox/ubiquity/shade into lp:ubiquity.
>
> Requested reviews:
> Xi Zhu (xi.zhu)
> Ubuntu Installer Team (ubuntu-installer)
>
> For more details, see:
> https://code.launchpad.net/~xnox/ubiquity/shade/+merge/167243
>
> Shade the "white" ubuntu one icons and logo to color #DED9CB
>
> https://plus.google.com/photos/105922848292507689403/albums/5885590889398435329/5885590891757603618?pid=5885590891757603618&oid=105922848292507689403
> --
> https://code.launchpad.net/~xnox/ubiquity/shade/+merge/167243
> Your team Ubuntu Installer Team is requested to review the proposed merge of lp:~xnox/ubiquity/shade into lp:ubiquity.
[..]

Is the below change to "ubi-ubuntuone.py" intentional? It looks like
its overriding the already defined UBUNTU_ONE_URL plus its pointing to
staging instead of production.

> === modified file 'debian/changelog'
> --- debian/changelog 2013-05-29 11:10:06 +0000
> +++ debian/changelog 2013-06-04 11:48:19 +0000
> @@ -1,3 +1,9 @@
> +ubiquity (2.15.7) UNRELEASED; urgency=low
> +
> + * Shade U1 logos with #DED9CB to match color scheme.
> +
> + -- Dmitrijs Ledkovs <email address hidden> Tue, 04 Jun 2013 12:37:06 +0100
> +
[..]
> === modified file 'ubiquity/plugins/ubi-ubuntuone.py'
> --- ubiquity/plugins/ubi-ubuntuone.py 2013-05-29 11:08:55 +0000
> +++ ubiquity/plugins/ubi-ubuntuone.py 2013-06-04 11:48:19 +0000
> @@ -37,6 +37,9 @@
> UBUNTU_ONE_URL = "https://one.ubuntu.com/"
> UBUNTU_TC_URL = "https://one.ubuntu.com/terms/embedded/"
>
> +UBUNTU_SSO_URL="https://login.staging.ubuntu.com/api/v2/"
> +UBUNTU_ONE_URL="https://staging.one.ubuntu.com/"
> +
> TOKEN_SEPARATOR = ' @ '
> SEPARATOR_REPLACEMENT = ' AT '
> U1_APP_NAME = "Ubuntu One"

[Dimitri John Ledkov (xnox)]

On 4 June 2013 17:13, Michael Vogt <email address hidden> wrote:
> On Tue, Jun 04, 2013 at 11:50:27AM -0000, Dmitrijs Ledkovs wrote:
>> Dmitrijs Ledkovs has proposed merging lp:~xnox/ubiquity/shade into lp:ubiquity.
>>
>> Requested reviews:
>> Xi Zhu (xi.zhu)
>> Ubuntu Installer Team (ubuntu-installer)
>>
>> For more details, see:
>> https://code.launchpad.net/~xnox/ubiquity/shade/+merge/167243
>>
>> Shade the "white" ubuntu one icons and logo to color #DED9CB
>>
>> https://plus.google.com/photos/105922848292507689403/albums/5885590889398435329/5885590891757603618?pid=5885590891757603618&oid=105922848292507689403
>> --
>> https://code.launchpad.net/~xnox/ubiquity/shade/+merge/167243
>> Your team Ubuntu Installer Team is requested to review the proposed merge of lp:~xnox/ubiquity/shade into lp:ubiquity.
> [..]
>
> Is the below change to "ubi-ubuntuone.py" intentional? It looks like
> its overriding the already defined UBUNTU_ONE_URL plus its pointing to
> staging instead of production.
>

That was not meant to be part of this merge proposal, just left over
debugging stuff =)

ps. I am shade!

Regards,

Dmitrijs.

[lp:~xnox/ubiquity/shade]

5937. By Dimitri John Ledkov on 2013-06-04

I am shade!
Revert accidental debugging leftovers, not meant for this merge proposal.

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-29 11:10:06 +0000
+++ debian/changelog	2013-06-04 23:11:26 +0000
@@ -1,3 +1,9 @@
+ubiquity (2.15.7) UNRELEASED; urgency=low
+
+  * Shade U1 logos with #DED9CB to match color scheme.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Tue, 04 Jun 2013 12:37:06 +0100
+
 ubiquity (2.15.6) saucy; urgency=low
 
   * Merge U1 plugin, without activating it by default at the moment. This

=== modified file 'pixmaps/u1/apps_40px.svg'
--- pixmaps/u1/apps_40px.svg	2013-03-07 14:40:59 +0000
+++ pixmaps/u1/apps_40px.svg	2013-06-04 23:11:26 +0000
@@ -1,10 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
-<path fill="#FFFFFF" d="M20,0C8.972,0,0,8.972,0,20.001C0,31.028,8.972,40,20,40s20-8.972,20-19.999C40,8.972,31.027,0,20,0z
-	 M5.979,30.579l0-5.005l4.335,2.503L5.979,30.579z M25.016,24.996h-2.201v-3.737h-0.625v3.737h-1.875v-2.501h-0.625v2.501h-1.875
-	v-3.737h-0.625v3.737h-2.174v-5h10V24.996z M20.015,11.255l-9.082,15.731l-4.33-2.5L17.853,5h4.325l11.249,19.486l-4.329,2.5
-	L20.015,11.255z M34.051,30.579l-4.334-2.502l4.335-2.503L34.051,30.579z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="40px"
+   height="40px"
+   viewBox="0 0 40 40"
+   enable-background="new 0 0 40 40"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="apps_40px.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="5.9"
+     inkscape:cx="-9.8305085"
+     inkscape:cy="20"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     fill="#FFFFFF"
+     d="M20,0C8.972,0,0,8.972,0,20.001C0,31.028,8.972,40,20,40s20-8.972,20-19.999C40,8.972,31.027,0,20,0z   M5.979,30.579l0-5.005l4.335,2.503L5.979,30.579z M25.016,24.996h-2.201v-3.737h-0.625v3.737h-1.875v-2.501h-0.625v2.501h-1.875  v-3.737h-0.625v3.737h-2.174v-5h10V24.996z M20.015,11.255l-9.082,15.731l-4.33-2.5L17.853,5h4.325l11.249,19.486l-4.329,2.5  L20.015,11.255z M34.051,30.579l-4.334-2.502l4.335-2.503L34.051,30.579z"
+     id="path3"
+     style="fill:#ded9cb;fill-opacity:1" /></svg>
\ No newline at end of file

=== modified file 'pixmaps/u1/cloud_40px.svg'
--- pixmaps/u1/cloud_40px.svg	2013-03-07 14:40:59 +0000
+++ pixmaps/u1/cloud_40px.svg	2013-06-04 23:11:26 +0000
@@ -1,20 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
-<g>
-	<path fill="#FFFFFF" d="M19.988,8.763c-4.133,0-7.495,3.361-7.495,7.493c0,0.017,0,0.033,0.001,0.05
-		c0.025,0.668,0.575,1.202,1.249,1.202h1.873v1.242h0.626c0.69,0,1.251-0.561,1.251-1.25c0-0.346,0.28-0.625,0.625-0.625
-		c0.345,0,0.625,0.279,0.625,0.625c0,1.378-1.122,2.5-2.501,2.5h-0.626v1.663c0,0.447,0.238,0.859,0.624,1.083
-		c1.137,0.657,2.434,1.005,3.748,1.005c4.134,0,7.496-3.362,7.496-7.495C27.484,12.125,24.122,8.763,19.988,8.763z M18.115,13.75
-		c-0.346,0-0.625-0.279-0.625-0.625c0-0.346,0.279-0.625,0.625-0.625c0.345,0,0.625,0.279,0.625,0.625
-		C18.74,13.47,18.46,13.75,18.115,13.75z"/>
-	<path fill="#FFFFFF" d="M34.141,5.858C30.362,2.081,25.339,0,19.995,0C14.652,0,9.628,2.081,5.85,5.858
-		c-7.799,7.798-7.799,20.486,0,28.284C9.628,37.919,14.651,40,19.994,40c0.001,0,0.001,0,0.002,0c5.343,0,10.366-2.081,14.145-5.857
-		C37.919,30.364,40,25.343,40,20S37.919,9.636,34.141,5.858z M29.369,25.004h-18.75c-3.108,0-5.627-2.519-5.627-5.625
-		c0-2.991,2.333-5.434,5.278-5.614c-1.316-2.639-0.366-5.881,2.224-7.376c2.589-1.495,5.872-0.697,7.5,1.763
-		c1.629-2.459,4.911-3.258,7.501-1.762c2.589,1.495,3.539,4.736,2.223,7.375c2.945,0.18,5.277,2.623,5.277,5.614
-		C34.995,22.485,32.477,25.004,29.369,25.004z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="40px"
+   height="40px"
+   viewBox="0 0 40 40"
+   enable-background="new 0 0 40 40"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="cloud_40px.svg"><metadata
+     id="metadata13"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs11" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="5.9"
+     inkscape:cx="20"
+     inkscape:cy="20"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><g
+     id="g3"
+     style="fill:#ded9cb;fill-opacity:1"><path
+       fill="#FFFFFF"
+       d="M19.988,8.763c-4.133,0-7.495,3.361-7.495,7.493c0,0.017,0,0.033,0.001,0.05   c0.025,0.668,0.575,1.202,1.249,1.202h1.873v1.242h0.626c0.69,0,1.251-0.561,1.251-1.25c0-0.346,0.28-0.625,0.625-0.625   c0.345,0,0.625,0.279,0.625,0.625c0,1.378-1.122,2.5-2.501,2.5h-0.626v1.663c0,0.447,0.238,0.859,0.624,1.083   c1.137,0.657,2.434,1.005,3.748,1.005c4.134,0,7.496-3.362,7.496-7.495C27.484,12.125,24.122,8.763,19.988,8.763z M18.115,13.75   c-0.346,0-0.625-0.279-0.625-0.625c0-0.346,0.279-0.625,0.625-0.625c0.345,0,0.625,0.279,0.625,0.625   C18.74,13.47,18.46,13.75,18.115,13.75z"
+       id="path5"
+       style="fill:#ded9cb;fill-opacity:1" /><path
+       fill="#FFFFFF"
+       d="M34.141,5.858C30.362,2.081,25.339,0,19.995,0C14.652,0,9.628,2.081,5.85,5.858   c-7.799,7.798-7.799,20.486,0,28.284C9.628,37.919,14.651,40,19.994,40c0.001,0,0.001,0,0.002,0c5.343,0,10.366-2.081,14.145-5.857   C37.919,30.364,40,25.343,40,20S37.919,9.636,34.141,5.858z M29.369,25.004h-18.75c-3.108,0-5.627-2.519-5.627-5.625   c0-2.991,2.333-5.434,5.278-5.614c-1.316-2.639-0.366-5.881,2.224-7.376c2.589-1.495,5.872-0.697,7.5,1.763   c1.629-2.459,4.911-3.258,7.501-1.762c2.589,1.495,3.539,4.736,2.223,7.375c2.945,0.18,5.277,2.623,5.277,5.614   C34.995,22.485,32.477,25.004,29.369,25.004z"
+       id="path7"
+       style="fill:#ded9cb;fill-opacity:1" /></g></svg>
\ No newline at end of file

=== modified file 'pixmaps/u1/music_40px.svg'
--- pixmaps/u1/music_40px.svg	2013-03-07 02:53:09 +0000
+++ pixmaps/u1/music_40px.svg	2013-06-04 23:11:26 +0000
@@ -1,14 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
-<path fill="#FFFFFF" d="M19.999-0.001C8.953-0.001,0,8.953,0,20c0,11.046,8.953,20.001,19.999,20.001C31.046,40.001,40,31.046,40,20
-	C40,8.953,31.046-0.001,19.999-0.001z M20.005,16.249c0.595,0,1.16,0.085,1.687,0.235V6.896c0-0.584,0.301-1.127,0.797-1.437
-	s1.116-0.341,1.642-0.083l5.107,2.504c0.84,0.411,1.187,1.426,0.774,2.266c-0.411,0.84-1.426,1.186-2.266,0.774l-2.671-1.31v10.756
-	c0.002,0.038,0.008,0.074,0.008,0.113c0,2.373-2.23,4.232-5.078,4.232c-2.847,0-5.079-1.859-5.079-4.232
-	S17.158,16.249,20.005,16.249z M14.946,26.405c1.35,1.378,3.155,2.148,5.083,2.168c1.934,0.02,3.75-0.712,5.128-2.062l1.443,1.475
-	c-1.747,1.712-4.05,2.651-6.493,2.651c-0.033,0-0.066,0-0.1-0.001c-2.48-0.025-4.801-1.016-6.537-2.788L14.946,26.405z
-	 M20.109,35.795c-0.052,0-0.104,0-0.156,0c-3.858-0.041-7.468-1.58-10.167-4.338l1.475-1.443c2.313,2.363,5.408,3.684,8.714,3.719
-	c3.312,0.042,6.429-1.221,8.791-3.535l1.443,1.475C27.49,34.335,23.909,35.795,20.109,35.795z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="40px"
+   height="40px"
+   viewBox="0 0 40 40"
+   enable-background="new 0 0 40 40"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="music_40px.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="5.9"
+     inkscape:cx="-9.8305085"
+     inkscape:cy="20"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     fill="#FFFFFF"
+     d="M19.999-0.001C8.953-0.001,0,8.953,0,20c0,11.046,8.953,20.001,19.999,20.001C31.046,40.001,40,31.046,40,20  C40,8.953,31.046-0.001,19.999-0.001z M20.005,16.249c0.595,0,1.16,0.085,1.687,0.235V6.896c0-0.584,0.301-1.127,0.797-1.437  s1.116-0.341,1.642-0.083l5.107,2.504c0.84,0.411,1.187,1.426,0.774,2.266c-0.411,0.84-1.426,1.186-2.266,0.774l-2.671-1.31v10.756  c0.002,0.038,0.008,0.074,0.008,0.113c0,2.373-2.23,4.232-5.078,4.232c-2.847,0-5.079-1.859-5.079-4.232  S17.158,16.249,20.005,16.249z M14.946,26.405c1.35,1.378,3.155,2.148,5.083,2.168c1.934,0.02,3.75-0.712,5.128-2.062l1.443,1.475  c-1.747,1.712-4.05,2.651-6.493,2.651c-0.033,0-0.066,0-0.1-0.001c-2.48-0.025-4.801-1.016-6.537-2.788L14.946,26.405z   M20.109,35.795c-0.052,0-0.104,0-0.156,0c-3.858-0.041-7.468-1.58-10.167-4.338l1.475-1.443c2.313,2.363,5.408,3.684,8.714,3.719  c3.312,0.042,6.429-1.221,8.791-3.535l1.443,1.475C27.49,34.335,23.909,35.795,20.109,35.795z"
+     id="path3"
+     style="fill:#ded9cb;fill-opacity:1" /></svg>
\ No newline at end of file

=== modified file 'pixmaps/u1/photos_40px.svg'
--- pixmaps/u1/photos_40px.svg	2013-03-07 02:53:09 +0000
+++ pixmaps/u1/photos_40px.svg	2013-06-04 23:11:26 +0000
@@ -1,13 +1,49 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve">
-<path fill="#FFFFFF" d="M20,0C8.953,0,0,8.954,0,20c0,11.046,8.953,20,20,20c11.045,0,20-8.954,20-20C40,8.954,31.045,0,20,0z
-	 M33.334,28.007c0,1.474-1.195,2.666-2.668,2.666H9.333c-1.473,0-2.667-1.192-2.667-2.666v-16c0-1.473,1.194-2.667,2.667-2.667h8.63
-	V8.009c0-0.737,0.597-1.334,1.333-1.334h1.333c0.736,0,1.334,0.597,1.334,1.334V9.34h8.703c1.473,0,2.667,1.193,2.667,2.667
-	L33.334,28.007L33.334,28.007z M17.333,12.006c-4.411,0-8,3.589-8,8c0,4.411,3.589,8.001,8,8.001c4.412,0,8-3.59,8-8.001
-	C25.333,15.595,21.745,12.006,17.333,12.006z M17.333,22.674c-1.47,0-2.666-1.197-2.666-2.668c0-1.47,1.196-2.667,2.666-2.667
-	S20,18.535,20,20.006S18.804,22.674,17.333,22.674z M30.682,13.327v1.334c0,0.736-0.598,1.333-1.333,1.333h-1.333
-	c-0.736,0-1.334-0.597-1.334-1.333v-1.334c0-0.736,0.598-1.333,1.334-1.333h1.333C30.084,11.994,30.682,12.591,30.682,13.327z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="40px"
+   height="40px"
+   viewBox="0 0 40 40"
+   enable-background="new 0 0 40 40"
+   xml:space="preserve"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="photos_40px.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="5.9"
+     inkscape:cx="-9.8305085"
+     inkscape:cy="20"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     fill="#FFFFFF"
+     d="M20,0C8.953,0,0,8.954,0,20c0,11.046,8.953,20,20,20c11.045,0,20-8.954,20-20C40,8.954,31.045,0,20,0z   M33.334,28.007c0,1.474-1.195,2.666-2.668,2.666H9.333c-1.473,0-2.667-1.192-2.667-2.666v-16c0-1.473,1.194-2.667,2.667-2.667h8.63  V8.009c0-0.737,0.597-1.334,1.333-1.334h1.333c0.736,0,1.334,0.597,1.334,1.334V9.34h8.703c1.473,0,2.667,1.193,2.667,2.667  L33.334,28.007L33.334,28.007z M17.333,12.006c-4.411,0-8,3.589-8,8c0,4.411,3.589,8.001,8,8.001c4.412,0,8-3.59,8-8.001  C25.333,15.595,21.745,12.006,17.333,12.006z M17.333,22.674c-1.47,0-2.666-1.197-2.666-2.668c0-1.47,1.196-2.667,2.666-2.667  S20,18.535,20,20.006S18.804,22.674,17.333,22.674z M30.682,13.327v1.334c0,0.736-0.598,1.333-1.333,1.333h-1.333  c-0.736,0-1.334-0.597-1.334-1.333v-1.334c0-0.736,0.598-1.333,1.334-1.333h1.333C30.084,11.994,30.682,12.591,30.682,13.327z"
+     id="path3"
+     style="fill:#ded9cb;fill-opacity:1" /></svg>
\ No newline at end of file

=== modified file 'pixmaps/u1/ubuntu_one_logo.svg'
--- pixmaps/u1/ubuntu_one_logo.svg	2013-03-07 02:53:09 +0000
+++ pixmaps/u1/ubuntu_one_logo.svg	2013-06-04 23:11:26 +0000
@@ -1,43 +1,95 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="74.969px" height="30.129px" viewBox="0 0 74.969 30.129" enable-background="new 0 0 74.969 30.129" xml:space="preserve">
-<g id="Layer_3">
-</g>
-<g id="Layer_1">
-	<g>
-		<g>
-			<path fill="#FFFFFF" d="M13.989,4.058v19.449h-6.37V10.601h-3.03l3.487-6.543H0v14.335c0,1.738,0.181,3.315,0.542,4.738
-				c0.359,1.425,0.95,2.662,1.766,3.708c0.817,1.046,1.903,1.857,3.241,2.431c1.343,0.573,3.162,0.858,5.125,0.858
-				c2.259,0,4.34-0.148,6.055-0.438c1.721-0.296,3.193-0.574,4.241-0.837V4.058H13.989z"/>
-			<path fill="#FFFFFF" d="M32.978,12.06c-0.682,0.171-1.837,0.412-3.298,0.412c-2.536,0-3.439-1.567-3.439-3.787V4.058h1.474v4.31
-				c0,2.012,0.621,2.802,2.126,2.802c0.619,0,1.458-0.077,1.664-0.156V4.058h1.474V12.06z"/>
-			<path fill="#FFFFFF" d="M50.995,12.06c-0.681,0.171-1.842,0.412-3.299,0.412c-2.535,0-3.44-1.567-3.44-3.787V4.058h1.476v4.31
-				c0,2.012,0.619,2.802,2.123,2.802c0.62,0,1.461-0.077,1.668-0.156V4.058h1.473V12.06z"/>
-			<path fill="#FFFFFF" d="M74.969,12.06c-0.68,0.171-1.841,0.412-3.299,0.412c-2.534,0-3.439-1.567-3.439-3.787V4.058h1.474v4.31
-				c0,2.012,0.619,2.802,2.126,2.802c0.618,0,1.457-0.077,1.66-0.156V4.058h1.479V12.06z"/>
-			<path fill="#FFFFFF" d="M36.708,4.423c0.363-0.238,1.17-0.556,2.119-0.556c2.367,0,3.746,1.777,3.746,4.314
-				c0,2.667-1.646,4.314-4.172,4.314c-1.379,0-2.488-0.238-3.173-0.428V0.254L36.708,0V4.423z M36.708,11.018
-				c0.297,0.083,0.869,0.177,1.678,0.177c1.587,0,2.648-1.093,2.648-3.014c0-1.711-0.684-3.012-2.396-3.012
-				c-0.806,0-1.567,0.333-1.931,0.634V11.018z"/>
-			<path fill="#FFFFFF" d="M53.255,4.292c0.68-0.17,1.84-0.412,3.292-0.412c2.61,0,3.433,1.551,3.433,3.781v4.618h-1.473v-4.3
-				c0-2.04-0.554-2.798-2.119-2.798c-0.635,0-1.439,0.109-1.663,0.156v6.942h-1.47V4.292z"/>
-			<path fill="#FFFFFF" d="M63.533,4.061h3.198v1.233h-3.198V9.09c0,1.648,0.536,2.072,1.55,2.072c0.884,0,1.469-0.285,1.673-0.365
-				l0.285,1.218c-0.298,0.144-1.136,0.44-2.088,0.44c-2.212,0-2.893-1.151-2.893-3.349V1.768l1.473-0.254V4.061z"/>
-			<path fill="#FFFFFF" d="M35.313,15.299c0.686-0.174,1.853-0.412,3.325-0.412c2.641,0,3.466,1.563,3.466,3.818v4.671h-1.488
-				v-4.351c0-2.062-0.555-2.831-2.143-2.831c-0.635,0-1.451,0.113-1.674,0.16v7.021h-1.486V15.299z"/>
-			<path fill="#FFFFFF" d="M43.378,19.205c0-2.892,1.867-4.307,3.77-4.307c2.204,0,3.445,1.351,3.445,4.162
-				c0,0.125,0,0.345-0.012,0.521h-5.677c0.123,1.701,0.974,2.598,2.798,2.598c1.021,0,1.76-0.221,2.123-0.395l0.203,1.226
-				c-0.361,0.188-1.355,0.458-2.486,0.458C44.7,23.468,43.378,21.659,43.378,19.205L43.378,19.205z M49.071,18.404
-				c0.011-1.322-0.742-2.265-1.934-2.265c-1.355,0-2.076,1.131-2.205,2.265H49.071z"/>
-			<path fill="#FFFFFF" d="M33.86,19.186c0,2.583-1.649,4.295-3.884,4.295c-2.233,0-3.883-1.712-3.883-4.295
-				c0-2.573,1.65-4.287,3.883-4.287C32.211,14.898,33.86,16.612,33.86,19.186L33.86,19.186z M32.335,19.186
-				c0-1.836-0.927-3.001-2.359-3.001c-1.429,0-2.355,1.165-2.355,3.001c0,1.844,0.926,3.004,2.355,3.004
-				C31.408,22.189,32.335,21.029,32.335,19.186z"/>
-		</g>
-	</g>
-</g>
-<g id="Layer_2">
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<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"
+   x="0px"
+   y="0px"
+   width="74.969px"
+   height="30.129px"
+   viewBox="0 0 74.969 30.129"
+   enable-background="new 0 0 74.969 30.129"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ubuntu_one_logo.svg"><metadata
+     id="metadata35"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs33" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     id="namedview31"
+     showgrid="false"
+     inkscape:zoom="3.8949432"
+     inkscape:cx="37.484501"
+     inkscape:cy="15.0645"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><g
+     id="Layer_3"
+     style="fill:#ded9cb;fill-opacity:1" /><g
+     id="Layer_1"
+     style="fill:#ded9cb;fill-opacity:1"><g
+       id="g6"
+       style="fill:#ded9cb;fill-opacity:1"><g
+         id="g8"
+         style="fill:#ded9cb;fill-opacity:1"><path
+           fill="#FFFFFF"
+           d="M13.989,4.058v19.449h-6.37V10.601h-3.03l3.487-6.543H0v14.335c0,1.738,0.181,3.315,0.542,4.738     c0.359,1.425,0.95,2.662,1.766,3.708c0.817,1.046,1.903,1.857,3.241,2.431c1.343,0.573,3.162,0.858,5.125,0.858     c2.259,0,4.34-0.148,6.055-0.438c1.721-0.296,3.193-0.574,4.241-0.837V4.058H13.989z"
+           id="path10"
+           style="fill:#ded9cb;fill-opacity:1" /><path
+           fill="#FFFFFF"
+           d="M32.978,12.06c-0.682,0.171-1.837,0.412-3.298,0.412c-2.536,0-3.439-1.567-3.439-3.787V4.058h1.474v4.31     c0,2.012,0.621,2.802,2.126,2.802c0.619,0,1.458-0.077,1.664-0.156V4.058h1.474V12.06z"
+           id="path12"
+           style="fill:#ded9cb;fill-opacity:1" /><path
+           fill="#FFFFFF"
+           d="M50.995,12.06c-0.681,0.171-1.842,0.412-3.299,0.412c-2.535,0-3.44-1.567-3.44-3.787V4.058h1.476v4.31     c0,2.012,0.619,2.802,2.123,2.802c0.62,0,1.461-0.077,1.668-0.156V4.058h1.473V12.06z"
+           id="path14"
+           style="fill:#ded9cb;fill-opacity:1" /><path
+           fill="#FFFFFF"
+           d="M74.969,12.06c-0.68,0.171-1.841,0.412-3.299,0.412c-2.534,0-3.439-1.567-3.439-3.787V4.058h1.474v4.31     c0,2.012,0.619,2.802,2.126,2.802c0.618,0,1.457-0.077,1.66-0.156V4.058h1.479V12.06z"
+           id="path16"
+           style="fill:#ded9cb;fill-opacity:1" /><path
+           fill="#FFFFFF"
+           d="M36.708,4.423c0.363-0.238,1.17-0.556,2.119-0.556c2.367,0,3.746,1.777,3.746,4.314     c0,2.667-1.646,4.314-4.172,4.314c-1.379,0-2.488-0.238-3.173-0.428V0.254L36.708,0V4.423z M36.708,11.018     c0.297,0.083,0.869,0.177,1.678,0.177c1.587,0,2.648-1.093,2.648-3.014c0-1.711-0.684-3.012-2.396-3.012     c-0.806,0-1.567,0.333-1.931,0.634V11.018z"
+           id="path18"
+           style="fill:#ded9cb;fill-opacity:1" /><path
+           fill="#FFFFFF"
+           d="M53.255,4.292c0.68-0.17,1.84-0.412,3.292-0.412c2.61,0,3.433,1.551,3.433,3.781v4.618h-1.473v-4.3     c0-2.04-0.554-2.798-2.119-2.798c-0.635,0-1.439,0.109-1.663,0.156v6.942h-1.47V4.292z"
+           id="path20"
+           style="fill:#ded9cb;fill-opacity:1" /><path
+           fill="#FFFFFF"
+           d="M63.533,4.061h3.198v1.233h-3.198V9.09c0,1.648,0.536,2.072,1.55,2.072c0.884,0,1.469-0.285,1.673-0.365     l0.285,1.218c-0.298,0.144-1.136,0.44-2.088,0.44c-2.212,0-2.893-1.151-2.893-3.349V1.768l1.473-0.254V4.061z"
+           id="path22"
+           style="fill:#ded9cb;fill-opacity:1" /><path
+           fill="#FFFFFF"
+           d="M35.313,15.299c0.686-0.174,1.853-0.412,3.325-0.412c2.641,0,3.466,1.563,3.466,3.818v4.671h-1.488     v-4.351c0-2.062-0.555-2.831-2.143-2.831c-0.635,0-1.451,0.113-1.674,0.16v7.021h-1.486V15.299z"
+           id="path24"
+           style="fill:#ded9cb;fill-opacity:1" /><path
+           fill="#FFFFFF"
+           d="M43.378,19.205c0-2.892,1.867-4.307,3.77-4.307c2.204,0,3.445,1.351,3.445,4.162     c0,0.125,0,0.345-0.012,0.521h-5.677c0.123,1.701,0.974,2.598,2.798,2.598c1.021,0,1.76-0.221,2.123-0.395l0.203,1.226     c-0.361,0.188-1.355,0.458-2.486,0.458C44.7,23.468,43.378,21.659,43.378,19.205L43.378,19.205z M49.071,18.404     c0.011-1.322-0.742-2.265-1.934-2.265c-1.355,0-2.076,1.131-2.205,2.265H49.071z"
+           id="path26"
+           style="fill:#ded9cb;fill-opacity:1" /><path
+           fill="#FFFFFF"
+           d="M33.86,19.186c0,2.583-1.649,4.295-3.884,4.295c-2.233,0-3.883-1.712-3.883-4.295     c0-2.573,1.65-4.287,3.883-4.287C32.211,14.898,33.86,16.612,33.86,19.186L33.86,19.186z M32.335,19.186     c0-1.836-0.927-3.001-2.359-3.001c-1.429,0-2.355,1.165-2.355,3.001c0,1.844,0.926,3.004,2.355,3.004     C31.408,22.189,32.335,21.029,32.335,19.186z"
+           id="path28"
+           style="fill:#ded9cb;fill-opacity:1" /></g></g></g><g
+     id="Layer_2"
+     style="fill:#ded9cb;fill-opacity:1" /></svg>
\ No newline at end of file