Merge lp:~xnox/ubiquity/shade into lp:ubiquity
- shade
- Merge into trunk
Proposed by
Dimitri John Ledkov
| Status: | Merged |
|---|---|
| Merged at revision: | 5941 |
| Proposed branch: | lp:~xnox/ubiquity/shade |
| Merge into: | lp:ubiquity |
| Diff against target: |
440 lines (+303/-100) 6 files modified
debian/changelog (+6/-0) pixmaps/u1/apps_40px.svg (+49/-10) pixmaps/u1/cloud_40px.svg (+55/-20) pixmaps/u1/music_40px.svg (+49/-14) pixmaps/u1/photos_40px.svg (+49/-13) pixmaps/u1/ubuntu_one_logo.svg (+95/-43) |
| To merge this branch: | bzr merge lp:~xnox/ubiquity/shade |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Xi Zhu | Pending | ||
| Ubuntu Installer Team | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
Shade the "white" ubuntu one icons and logo to color #DED9CB
To post a comment you must log in.
Revision history for this message
| Michael Vogt (mvo) wrote : | # |
Revision history for this message
| Dimitri John Ledkov (xnox) wrote : | # |
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:/
>>
>> Shade the "white" ubuntu one icons and logo to color #DED9CB
>>
>> https:/
>> --
>> https:/
>> 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
updated
- 5937. By Dimitri John Ledkov
-
I am shade!
Revert accidental debugging leftovers, not meant for this merge proposal.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'debian/changelog' | |||
| 2 | --- debian/changelog 2013-05-29 11:10:06 +0000 | |||
| 3 | +++ debian/changelog 2013-06-04 23:11:26 +0000 | |||
| 4 | @@ -1,3 +1,9 @@ | |||
| 5 | 1 | ubiquity (2.15.7) UNRELEASED; urgency=low | ||
| 6 | 2 | |||
| 7 | 3 | * Shade U1 logos with #DED9CB to match color scheme. | ||
| 8 | 4 | |||
| 9 | 5 | -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Tue, 04 Jun 2013 12:37:06 +0100 | ||
| 10 | 6 | |||
| 11 | 1 | ubiquity (2.15.6) saucy; urgency=low | 7 | ubiquity (2.15.6) saucy; urgency=low |
| 12 | 2 | 8 | ||
| 13 | 3 | * Merge U1 plugin, without activating it by default at the moment. This | 9 | * Merge U1 plugin, without activating it by default at the moment. This |
| 14 | 4 | 10 | ||
| 15 | === modified file 'pixmaps/u1/apps_40px.svg' | |||
| 16 | --- pixmaps/u1/apps_40px.svg 2013-03-07 14:40:59 +0000 | |||
| 17 | +++ pixmaps/u1/apps_40px.svg 2013-06-04 23:11:26 +0000 | |||
| 18 | @@ -1,10 +1,49 @@ | |||
| 29 | 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 30 | 2 | <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | 2 | <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> |
| 31 | 3 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | 3 | |
| 32 | 4 | <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" | 4 | <svg |
| 33 | 5 | width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve"> | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" |
| 34 | 6 | <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 | 6 | xmlns:cc="http://creativecommons.org/ns#" |
| 35 | 7 | 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 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
| 36 | 8 | 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 | 8 | xmlns:svg="http://www.w3.org/2000/svg" |
| 37 | 9 | L20.015,11.255z M34.051,30.579l-4.334-2.502l4.335-2.503L34.051,30.579z"/> | 9 | xmlns="http://www.w3.org/2000/svg" |
| 38 | 10 | </svg> | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
| 39 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | ||
| 40 | 12 | version="1.1" | ||
| 41 | 13 | id="Layer_1" | ||
| 42 | 14 | x="0px" | ||
| 43 | 15 | y="0px" | ||
| 44 | 16 | width="40px" | ||
| 45 | 17 | height="40px" | ||
| 46 | 18 | viewBox="0 0 40 40" | ||
| 47 | 19 | enable-background="new 0 0 40 40" | ||
| 48 | 20 | xml:space="preserve" | ||
| 49 | 21 | inkscape:version="0.48.4 r9939" | ||
| 50 | 22 | sodipodi:docname="apps_40px.svg"><metadata | ||
| 51 | 23 | id="metadata9"><rdf:RDF><cc:Work | ||
| 52 | 24 | rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type | ||
| 53 | 25 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs | ||
| 54 | 26 | id="defs7" /><sodipodi:namedview | ||
| 55 | 27 | pagecolor="#ffffff" | ||
| 56 | 28 | bordercolor="#666666" | ||
| 57 | 29 | borderopacity="1" | ||
| 58 | 30 | objecttolerance="10" | ||
| 59 | 31 | gridtolerance="10" | ||
| 60 | 32 | guidetolerance="10" | ||
| 61 | 33 | inkscape:pageopacity="0" | ||
| 62 | 34 | inkscape:pageshadow="2" | ||
| 63 | 35 | inkscape:window-width="1855" | ||
| 64 | 36 | inkscape:window-height="1056" | ||
| 65 | 37 | id="namedview5" | ||
| 66 | 38 | showgrid="false" | ||
| 67 | 39 | inkscape:zoom="5.9" | ||
| 68 | 40 | inkscape:cx="-9.8305085" | ||
| 69 | 41 | inkscape:cy="20" | ||
| 70 | 42 | inkscape:window-x="65" | ||
| 71 | 43 | inkscape:window-y="24" | ||
| 72 | 44 | inkscape:window-maximized="1" | ||
| 73 | 45 | inkscape:current-layer="Layer_1" /><path | ||
| 74 | 46 | fill="#FFFFFF" | ||
| 75 | 47 | 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" | ||
| 76 | 48 | id="path3" | ||
| 77 | 49 | style="fill:#ded9cb;fill-opacity:1" /></svg> | ||
| 78 | 11 | \ No newline at end of file | 50 | \ No newline at end of file |
| 79 | 12 | 51 | ||
| 80 | === modified file 'pixmaps/u1/cloud_40px.svg' | |||
| 81 | --- pixmaps/u1/cloud_40px.svg 2013-03-07 14:40:59 +0000 | |||
| 82 | +++ pixmaps/u1/cloud_40px.svg 2013-06-04 23:11:26 +0000 | |||
| 83 | @@ -1,20 +1,55 @@ | |||
| 104 | 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 105 | 2 | <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | 2 | <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> |
| 106 | 3 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | 3 | |
| 107 | 4 | <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" | 4 | <svg |
| 108 | 5 | width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve"> | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" |
| 109 | 6 | <g> | 6 | xmlns:cc="http://creativecommons.org/ns#" |
| 110 | 7 | <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 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
| 111 | 8 | 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 | 8 | xmlns:svg="http://www.w3.org/2000/svg" |
| 112 | 9 | 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 | 9 | xmlns="http://www.w3.org/2000/svg" |
| 113 | 10 | 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 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
| 114 | 11 | 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 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
| 115 | 12 | C18.74,13.47,18.46,13.75,18.115,13.75z"/> | 12 | version="1.1" |
| 116 | 13 | <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 | 13 | id="Layer_1" |
| 117 | 14 | 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 | 14 | x="0px" |
| 118 | 15 | 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 | 15 | y="0px" |
| 119 | 16 | 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 | 16 | width="40px" |
| 120 | 17 | 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 | 17 | height="40px" |
| 121 | 18 | C34.995,22.485,32.477,25.004,29.369,25.004z"/> | 18 | viewBox="0 0 40 40" |
| 122 | 19 | </g> | 19 | enable-background="new 0 0 40 40" |
| 123 | 20 | </svg> | 20 | xml:space="preserve" |
| 124 | 21 | inkscape:version="0.48.4 r9939" | ||
| 125 | 22 | sodipodi:docname="cloud_40px.svg"><metadata | ||
| 126 | 23 | id="metadata13"><rdf:RDF><cc:Work | ||
| 127 | 24 | rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type | ||
| 128 | 25 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs | ||
| 129 | 26 | id="defs11" /><sodipodi:namedview | ||
| 130 | 27 | pagecolor="#ffffff" | ||
| 131 | 28 | bordercolor="#666666" | ||
| 132 | 29 | borderopacity="1" | ||
| 133 | 30 | objecttolerance="10" | ||
| 134 | 31 | gridtolerance="10" | ||
| 135 | 32 | guidetolerance="10" | ||
| 136 | 33 | inkscape:pageopacity="0" | ||
| 137 | 34 | inkscape:pageshadow="2" | ||
| 138 | 35 | inkscape:window-width="1855" | ||
| 139 | 36 | inkscape:window-height="1056" | ||
| 140 | 37 | id="namedview9" | ||
| 141 | 38 | showgrid="false" | ||
| 142 | 39 | inkscape:zoom="5.9" | ||
| 143 | 40 | inkscape:cx="20" | ||
| 144 | 41 | inkscape:cy="20" | ||
| 145 | 42 | inkscape:window-x="65" | ||
| 146 | 43 | inkscape:window-y="24" | ||
| 147 | 44 | inkscape:window-maximized="1" | ||
| 148 | 45 | inkscape:current-layer="Layer_1" /><g | ||
| 149 | 46 | id="g3" | ||
| 150 | 47 | style="fill:#ded9cb;fill-opacity:1"><path | ||
| 151 | 48 | fill="#FFFFFF" | ||
| 152 | 49 | 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" | ||
| 153 | 50 | id="path5" | ||
| 154 | 51 | style="fill:#ded9cb;fill-opacity:1" /><path | ||
| 155 | 52 | fill="#FFFFFF" | ||
| 156 | 53 | 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" | ||
| 157 | 54 | id="path7" | ||
| 158 | 55 | style="fill:#ded9cb;fill-opacity:1" /></g></svg> | ||
| 159 | 21 | \ No newline at end of file | 56 | \ No newline at end of file |
| 160 | 22 | 57 | ||
| 161 | === modified file 'pixmaps/u1/music_40px.svg' | |||
| 162 | --- pixmaps/u1/music_40px.svg 2013-03-07 02:53:09 +0000 | |||
| 163 | +++ pixmaps/u1/music_40px.svg 2013-06-04 23:11:26 +0000 | |||
| 164 | @@ -1,14 +1,49 @@ | |||
| 179 | 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 180 | 2 | <!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | 2 | <!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> |
| 181 | 3 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | 3 | |
| 182 | 4 | <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" | 4 | <svg |
| 183 | 5 | width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve"> | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" |
| 184 | 6 | <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 | 6 | xmlns:cc="http://creativecommons.org/ns#" |
| 185 | 7 | 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 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
| 186 | 8 | 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 | 8 | xmlns:svg="http://www.w3.org/2000/svg" |
| 187 | 9 | 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 | 9 | xmlns="http://www.w3.org/2000/svg" |
| 188 | 10 | 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 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
| 189 | 11 | 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 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
| 190 | 12 | 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 | 12 | version="1.1" |
| 191 | 13 | 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"/> | 13 | id="Layer_1" |
| 192 | 14 | </svg> | 14 | x="0px" |
| 193 | 15 | y="0px" | ||
| 194 | 16 | width="40px" | ||
| 195 | 17 | height="40px" | ||
| 196 | 18 | viewBox="0 0 40 40" | ||
| 197 | 19 | enable-background="new 0 0 40 40" | ||
| 198 | 20 | xml:space="preserve" | ||
| 199 | 21 | inkscape:version="0.48.4 r9939" | ||
| 200 | 22 | sodipodi:docname="music_40px.svg"><metadata | ||
| 201 | 23 | id="metadata9"><rdf:RDF><cc:Work | ||
| 202 | 24 | rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type | ||
| 203 | 25 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs | ||
| 204 | 26 | id="defs7" /><sodipodi:namedview | ||
| 205 | 27 | pagecolor="#ffffff" | ||
| 206 | 28 | bordercolor="#666666" | ||
| 207 | 29 | borderopacity="1" | ||
| 208 | 30 | objecttolerance="10" | ||
| 209 | 31 | gridtolerance="10" | ||
| 210 | 32 | guidetolerance="10" | ||
| 211 | 33 | inkscape:pageopacity="0" | ||
| 212 | 34 | inkscape:pageshadow="2" | ||
| 213 | 35 | inkscape:window-width="1855" | ||
| 214 | 36 | inkscape:window-height="1056" | ||
| 215 | 37 | id="namedview5" | ||
| 216 | 38 | showgrid="false" | ||
| 217 | 39 | inkscape:zoom="5.9" | ||
| 218 | 40 | inkscape:cx="-9.8305085" | ||
| 219 | 41 | inkscape:cy="20" | ||
| 220 | 42 | inkscape:window-x="65" | ||
| 221 | 43 | inkscape:window-y="24" | ||
| 222 | 44 | inkscape:window-maximized="1" | ||
| 223 | 45 | inkscape:current-layer="Layer_1" /><path | ||
| 224 | 46 | fill="#FFFFFF" | ||
| 225 | 47 | 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" | ||
| 226 | 48 | id="path3" | ||
| 227 | 49 | style="fill:#ded9cb;fill-opacity:1" /></svg> | ||
| 228 | 15 | \ No newline at end of file | 50 | \ No newline at end of file |
| 229 | 16 | 51 | ||
| 230 | === modified file 'pixmaps/u1/photos_40px.svg' | |||
| 231 | --- pixmaps/u1/photos_40px.svg 2013-03-07 02:53:09 +0000 | |||
| 232 | +++ pixmaps/u1/photos_40px.svg 2013-06-04 23:11:26 +0000 | |||
| 233 | @@ -1,13 +1,49 @@ | |||
| 247 | 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 248 | 2 | <!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> | 2 | <!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> |
| 249 | 3 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | 3 | |
| 250 | 4 | <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" | 4 | <svg |
| 251 | 5 | width="40px" height="40px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve"> | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" |
| 252 | 6 | <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 | 6 | xmlns:cc="http://creativecommons.org/ns#" |
| 253 | 7 | 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 | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
| 254 | 8 | 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 | 8 | xmlns:svg="http://www.w3.org/2000/svg" |
| 255 | 9 | 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 | 9 | xmlns="http://www.w3.org/2000/svg" |
| 256 | 10 | 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 | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
| 257 | 11 | 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 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
| 258 | 12 | 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"/> | 12 | version="1.1" |
| 259 | 13 | </svg> | 13 | id="Layer_1" |
| 260 | 14 | x="0px" | ||
| 261 | 15 | y="0px" | ||
| 262 | 16 | width="40px" | ||
| 263 | 17 | height="40px" | ||
| 264 | 18 | viewBox="0 0 40 40" | ||
| 265 | 19 | enable-background="new 0 0 40 40" | ||
| 266 | 20 | xml:space="preserve" | ||
| 267 | 21 | inkscape:version="0.48.4 r9939" | ||
| 268 | 22 | sodipodi:docname="photos_40px.svg"><metadata | ||
| 269 | 23 | id="metadata9"><rdf:RDF><cc:Work | ||
| 270 | 24 | rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type | ||
| 271 | 25 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs | ||
| 272 | 26 | id="defs7" /><sodipodi:namedview | ||
| 273 | 27 | pagecolor="#ffffff" | ||
| 274 | 28 | bordercolor="#666666" | ||
| 275 | 29 | borderopacity="1" | ||
| 276 | 30 | objecttolerance="10" | ||
| 277 | 31 | gridtolerance="10" | ||
| 278 | 32 | guidetolerance="10" | ||
| 279 | 33 | inkscape:pageopacity="0" | ||
| 280 | 34 | inkscape:pageshadow="2" | ||
| 281 | 35 | inkscape:window-width="1855" | ||
| 282 | 36 | inkscape:window-height="1056" | ||
| 283 | 37 | id="namedview5" | ||
| 284 | 38 | showgrid="false" | ||
| 285 | 39 | inkscape:zoom="5.9" | ||
| 286 | 40 | inkscape:cx="-9.8305085" | ||
| 287 | 41 | inkscape:cy="20" | ||
| 288 | 42 | inkscape:window-x="65" | ||
| 289 | 43 | inkscape:window-y="24" | ||
| 290 | 44 | inkscape:window-maximized="1" | ||
| 291 | 45 | inkscape:current-layer="Layer_1" /><path | ||
| 292 | 46 | fill="#FFFFFF" | ||
| 293 | 47 | 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" | ||
| 294 | 48 | id="path3" | ||
| 295 | 49 | style="fill:#ded9cb;fill-opacity:1" /></svg> | ||
| 296 | 14 | \ No newline at end of file | 50 | \ No newline at end of file |
| 297 | 15 | 51 | ||
| 298 | === modified file 'pixmaps/u1/ubuntu_one_logo.svg' | |||
| 299 | --- pixmaps/u1/ubuntu_one_logo.svg 2013-03-07 02:53:09 +0000 | |||
| 300 | +++ pixmaps/u1/ubuntu_one_logo.svg 2013-06-04 23:11:26 +0000 | |||
| 301 | @@ -1,43 +1,95 @@ | |||
| 345 | 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 346 | 2 | <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) --> | 2 | <!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) --> |
| 347 | 3 | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | 3 | |
| 348 | 4 | <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" | 4 | <svg |
| 349 | 5 | 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"> | 5 | xmlns:dc="http://purl.org/dc/elements/1.1/" |
| 350 | 6 | <g id="Layer_3"> | 6 | xmlns:cc="http://creativecommons.org/ns#" |
| 351 | 7 | </g> | 7 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
| 352 | 8 | <g id="Layer_1"> | 8 | xmlns:svg="http://www.w3.org/2000/svg" |
| 353 | 9 | <g> | 9 | xmlns="http://www.w3.org/2000/svg" |
| 354 | 10 | <g> | 10 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
| 355 | 11 | <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 | 11 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" |
| 356 | 12 | 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 | 12 | version="1.1" |
| 357 | 13 | c2.259,0,4.34-0.148,6.055-0.438c1.721-0.296,3.193-0.574,4.241-0.837V4.058H13.989z"/> | 13 | x="0px" |
| 358 | 14 | <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 | 14 | y="0px" |
| 359 | 15 | c0,2.012,0.621,2.802,2.126,2.802c0.619,0,1.458-0.077,1.664-0.156V4.058h1.474V12.06z"/> | 15 | width="74.969px" |
| 360 | 16 | <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 | 16 | height="30.129px" |
| 361 | 17 | c0,2.012,0.619,2.802,2.123,2.802c0.62,0,1.461-0.077,1.668-0.156V4.058h1.473V12.06z"/> | 17 | viewBox="0 0 74.969 30.129" |
| 362 | 18 | <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 | 18 | enable-background="new 0 0 74.969 30.129" |
| 363 | 19 | c0,2.012,0.619,2.802,2.126,2.802c0.618,0,1.457-0.077,1.66-0.156V4.058h1.479V12.06z"/> | 19 | xml:space="preserve" |
| 364 | 20 | <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 | 20 | id="svg2" |
| 365 | 21 | 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 | 21 | inkscape:version="0.48.4 r9939" |
| 366 | 22 | 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 | 22 | sodipodi:docname="ubuntu_one_logo.svg"><metadata |
| 367 | 23 | c-0.806,0-1.567,0.333-1.931,0.634V11.018z"/> | 23 | id="metadata35"><rdf:RDF><cc:Work |
| 368 | 24 | <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 | 24 | rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type |
| 369 | 25 | 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"/> | 25 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs |
| 370 | 26 | <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 | 26 | id="defs33" /><sodipodi:namedview |
| 371 | 27 | 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"/> | 27 | pagecolor="#ffffff" |
| 372 | 28 | <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 | 28 | bordercolor="#666666" |
| 373 | 29 | 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"/> | 29 | borderopacity="1" |
| 374 | 30 | <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 | 30 | objecttolerance="10" |
| 375 | 31 | 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 | 31 | gridtolerance="10" |
| 376 | 32 | 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 | 32 | guidetolerance="10" |
| 377 | 33 | c0.011-1.322-0.742-2.265-1.934-2.265c-1.355,0-2.076,1.131-2.205,2.265H49.071z"/> | 33 | inkscape:pageopacity="0" |
| 378 | 34 | <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 | 34 | inkscape:pageshadow="2" |
| 379 | 35 | 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 | 35 | inkscape:window-width="1855" |
| 380 | 36 | 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 | 36 | inkscape:window-height="1056" |
| 381 | 37 | C31.408,22.189,32.335,21.029,32.335,19.186z"/> | 37 | id="namedview31" |
| 382 | 38 | </g> | 38 | showgrid="false" |
| 383 | 39 | </g> | 39 | inkscape:zoom="3.8949432" |
| 384 | 40 | </g> | 40 | inkscape:cx="37.484501" |
| 385 | 41 | <g id="Layer_2"> | 41 | inkscape:cy="15.0645" |
| 386 | 42 | </g> | 42 | inkscape:window-x="65" |
| 387 | 43 | </svg> | 43 | inkscape:window-y="24" |
| 388 | 44 | inkscape:window-maximized="1" | ||
| 389 | 45 | inkscape:current-layer="svg2" /><g | ||
| 390 | 46 | id="Layer_3" | ||
| 391 | 47 | style="fill:#ded9cb;fill-opacity:1" /><g | ||
| 392 | 48 | id="Layer_1" | ||
| 393 | 49 | style="fill:#ded9cb;fill-opacity:1"><g | ||
| 394 | 50 | id="g6" | ||
| 395 | 51 | style="fill:#ded9cb;fill-opacity:1"><g | ||
| 396 | 52 | id="g8" | ||
| 397 | 53 | style="fill:#ded9cb;fill-opacity:1"><path | ||
| 398 | 54 | fill="#FFFFFF" | ||
| 399 | 55 | 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" | ||
| 400 | 56 | id="path10" | ||
| 401 | 57 | style="fill:#ded9cb;fill-opacity:1" /><path | ||
| 402 | 58 | fill="#FFFFFF" | ||
| 403 | 59 | 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" | ||
| 404 | 60 | id="path12" | ||
| 405 | 61 | style="fill:#ded9cb;fill-opacity:1" /><path | ||
| 406 | 62 | fill="#FFFFFF" | ||
| 407 | 63 | 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" | ||
| 408 | 64 | id="path14" | ||
| 409 | 65 | style="fill:#ded9cb;fill-opacity:1" /><path | ||
| 410 | 66 | fill="#FFFFFF" | ||
| 411 | 67 | 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" | ||
| 412 | 68 | id="path16" | ||
| 413 | 69 | style="fill:#ded9cb;fill-opacity:1" /><path | ||
| 414 | 70 | fill="#FFFFFF" | ||
| 415 | 71 | 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" | ||
| 416 | 72 | id="path18" | ||
| 417 | 73 | style="fill:#ded9cb;fill-opacity:1" /><path | ||
| 418 | 74 | fill="#FFFFFF" | ||
| 419 | 75 | 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" | ||
| 420 | 76 | id="path20" | ||
| 421 | 77 | style="fill:#ded9cb;fill-opacity:1" /><path | ||
| 422 | 78 | fill="#FFFFFF" | ||
| 423 | 79 | 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" | ||
| 424 | 80 | id="path22" | ||
| 425 | 81 | style="fill:#ded9cb;fill-opacity:1" /><path | ||
| 426 | 82 | fill="#FFFFFF" | ||
| 427 | 83 | 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" | ||
| 428 | 84 | id="path24" | ||
| 429 | 85 | style="fill:#ded9cb;fill-opacity:1" /><path | ||
| 430 | 86 | fill="#FFFFFF" | ||
| 431 | 87 | 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" | ||
| 432 | 88 | id="path26" | ||
| 433 | 89 | style="fill:#ded9cb;fill-opacity:1" /><path | ||
| 434 | 90 | fill="#FFFFFF" | ||
| 435 | 91 | 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" | ||
| 436 | 92 | id="path28" | ||
| 437 | 93 | style="fill:#ded9cb;fill-opacity:1" /></g></g></g><g | ||
| 438 | 94 | id="Layer_2" | ||
| 439 | 95 | style="fill:#ded9cb;fill-opacity:1" /></svg> | ||
| 440 | 44 | \ No newline at end of file | 96 | \ No newline at end of file |
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:/
>
> Shade the "white" ubuntu one icons and logo to color #DED9CB
>
> https:/
> --
> https:/
> 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/
> --- ubiquity/
> +++ ubiquity/
> @@ -37,6 +37,9 @@
> UBUNTU_ONE_URL = "https:/
> UBUNTU_TC_URL = "https:/
>
> +UBUNTU_SSO_URL="https:/
> +UBUNTU_ONE_URL="https:/
> +
> TOKEN_SEPARATOR = ' @ '
> SEPARATOR_
> U1_APP_NAME = "Ubuntu One"