Merge lp:~flexiondotorg/ubiquity-slideshow-ubuntu/ubuntu-slide-refresh into lp:ubiquity-slideshow-ubuntu

Proposed by Martin Wimpress 
Status: Merged
Merged at revision: 857
Proposed branch: lp:~flexiondotorg/ubiquity-slideshow-ubuntu/ubuntu-slide-refresh
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 278 lines (+42/-36)
2 files modified
slideshows/ubuntu/slides/browse.html (+4/-0)
slideshows/ubuntu/slides/link/base.css (+38/-36)
To merge this branch: bzr merge lp:~flexiondotorg/ubiquity-slideshow-ubuntu/ubuntu-slide-refresh
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+377753@code.launchpad.net

Description of the change

Updates the style of the Ubiquity slideshow for Ubuntu to match Yaru. Also, refresh the screenshots in the slideshow for 20.04 and removes some obsolete images.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'slideshows/ubuntu/slides/browse.html'
--- slideshows/ubuntu/slides/browse.html 2019-03-13 09:17:40 +0000
+++ slideshows/ubuntu/slides/browse.html 2020-01-17 01:40:40 +0000
@@ -19,6 +19,10 @@
19<h2 class="subtitle">Supported software</h2>19<h2 class="subtitle">Supported software</h2>
20<ul>20<ul>
21 <li>21 <li>
22 <img class="icon" src="icons/thunderbird.png" />
23 <p class="caption">Thunderbird</p>
24 </li>
25 <li>
22 <img class="icon" src="icons/chromium.png" />26 <img class="icon" src="icons/chromium.png" />
23 <p class="caption">Chromium</p>27 <p class="caption">Chromium</p>
24 </li>28 </li>
2529
=== removed file 'slideshows/ubuntu/slides/icons/U_One_logo.png'
26Binary files slideshows/ubuntu/slides/icons/U_One_logo.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu/slides/icons/U_One_logo.png 1970-01-01 00:00:00 +0000 differ30Binary files slideshows/ubuntu/slides/icons/U_One_logo.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu/slides/icons/U_One_logo.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'slideshows/ubuntu/slides/icons/flash.png'
27Binary files slideshows/ubuntu/slides/icons/flash.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu/slides/icons/flash.png 1970-01-01 00:00:00 +0000 differ31Binary files slideshows/ubuntu/slides/icons/flash.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu/slides/icons/flash.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slideshows/ubuntu/slides/icons/libreoffice-calc.png'
28Binary files slideshows/ubuntu/slides/icons/libreoffice-calc.png 2018-10-05 11:00:02 +0000 and slideshows/ubuntu/slides/icons/libreoffice-calc.png 2020-01-17 01:40:40 +0000 differ32Binary files slideshows/ubuntu/slides/icons/libreoffice-calc.png 2018-10-05 11:00:02 +0000 and slideshows/ubuntu/slides/icons/libreoffice-calc.png 2020-01-17 01:40:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/icons/libreoffice-impress.png'
29Binary files slideshows/ubuntu/slides/icons/libreoffice-impress.png 2018-10-05 11:00:02 +0000 and slideshows/ubuntu/slides/icons/libreoffice-impress.png 2020-01-17 01:40:40 +0000 differ33Binary files slideshows/ubuntu/slides/icons/libreoffice-impress.png 2018-10-05 11:00:02 +0000 and slideshows/ubuntu/slides/icons/libreoffice-impress.png 2020-01-17 01:40:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/icons/libreoffice-writer.png'
30Binary files slideshows/ubuntu/slides/icons/libreoffice-writer.png 2018-10-05 11:00:02 +0000 and slideshows/ubuntu/slides/icons/libreoffice-writer.png 2020-01-17 01:40:40 +0000 differ34Binary files slideshows/ubuntu/slides/icons/libreoffice-writer.png 2018-10-05 11:00:02 +0000 and slideshows/ubuntu/slides/icons/libreoffice-writer.png 2020-01-17 01:40:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/icons/rhythmbox.png'
31Binary files slideshows/ubuntu/slides/icons/rhythmbox.png 2018-10-03 22:29:28 +0000 and slideshows/ubuntu/slides/icons/rhythmbox.png 2020-01-17 01:40:40 +0000 differ35Binary files slideshows/ubuntu/slides/icons/rhythmbox.png 2018-10-03 22:29:28 +0000 and slideshows/ubuntu/slides/icons/rhythmbox.png 2020-01-17 01:40:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/icons/shotwell.png'
32Binary files slideshows/ubuntu/slides/icons/shotwell.png 2018-10-03 22:29:28 +0000 and slideshows/ubuntu/slides/icons/shotwell.png 2020-01-17 01:40:40 +0000 differ36Binary files slideshows/ubuntu/slides/icons/shotwell.png 2018-10-03 22:29:28 +0000 and slideshows/ubuntu/slides/icons/shotwell.png 2020-01-17 01:40:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/icons/themes.png'
33Binary files slideshows/ubuntu/slides/icons/themes.png 2018-10-03 22:29:28 +0000 and slideshows/ubuntu/slides/icons/themes.png 2020-01-17 01:40:40 +0000 differ37Binary files slideshows/ubuntu/slides/icons/themes.png 2018-10-03 22:29:28 +0000 and slideshows/ubuntu/slides/icons/themes.png 2020-01-17 01:40:40 +0000 differ
=== added file 'slideshows/ubuntu/slides/icons/thunderbird.png'
34Binary files slideshows/ubuntu/slides/icons/thunderbird.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/thunderbird.png 2020-01-17 01:40:40 +0000 differ38Binary files slideshows/ubuntu/slides/icons/thunderbird.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/thunderbird.png 2020-01-17 01:40:40 +0000 differ
=== removed file 'slideshows/ubuntu/slides/icons/u1-icon-apps.png'
35Binary files slideshows/ubuntu/slides/icons/u1-icon-apps.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu/slides/icons/u1-icon-apps.png 1970-01-01 00:00:00 +0000 differ39Binary files slideshows/ubuntu/slides/icons/u1-icon-apps.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu/slides/icons/u1-icon-apps.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'slideshows/ubuntu/slides/icons/u1-icon-music.png'
36Binary files slideshows/ubuntu/slides/icons/u1-icon-music.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu/slides/icons/u1-icon-music.png 1970-01-01 00:00:00 +0000 differ40Binary files slideshows/ubuntu/slides/icons/u1-icon-music.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu/slides/icons/u1-icon-music.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'slideshows/ubuntu/slides/icons/u1-icon-photos.png'
37Binary files slideshows/ubuntu/slides/icons/u1-icon-photos.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu/slides/icons/u1-icon-photos.png 1970-01-01 00:00:00 +0000 differ41Binary files slideshows/ubuntu/slides/icons/u1-icon-photos.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu/slides/icons/u1-icon-photos.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slideshows/ubuntu/slides/link/background.png'
38Binary files slideshows/ubuntu/slides/link/background.png 2015-04-01 00:03:36 +0000 and slideshows/ubuntu/slides/link/background.png 2020-01-17 01:40:40 +0000 differ42Binary files slideshows/ubuntu/slides/link/background.png 2015-04-01 00:03:36 +0000 and slideshows/ubuntu/slides/link/background.png 2020-01-17 01:40:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/link/base.css'
--- slideshows/ubuntu/slides/link/base.css 2018-10-04 14:13:34 +0000
+++ slideshows/ubuntu/slides/link/base.css 2020-01-17 01:40:40 +0000
@@ -27,15 +27,15 @@
27html, body {27html, body {
28 margin:0;28 margin:0;
29 padding:0;29 padding:0;
30 30
31 background-color:#F7F6F6;31 background-color:#F7F6F6;
32 32
33 font-family:'Ubuntu', 'UbuntuBeta', sans-serif;33 font-family:'Ubuntu', 'UbuntuBeta', sans-serif;
34 font-size:12px;34 font-size:12px;
35 line-height:1.4em;35 line-height:1.4em;
36 36
37 color:#333333;37 color:#333333;
38 38
39 /* no reason to expose this extra stuff to the user */39 /* no reason to expose this extra stuff to the user */
40 -webkit-user-select:none;40 -webkit-user-select:none;
41 -moz-user-select:none;41 -moz-user-select:none;
@@ -47,8 +47,9 @@
47Hyperlink-style text47Hyperlink-style text
48*/48*/
49a {49a {
50 color:#19B6EE;50 color: #ffffff;
51 text-decoration:none;51 text-decoration:none;
52 font-weight: bold;
52 display:inline;53 display:inline;
53}54}
5455
@@ -62,7 +63,7 @@
6263
63#wrapper {64#wrapper {
64 position:absolute;65 position:absolute;
65 66
66 width:752px;67 width:752px;
67 height:100%;68 height:100%;
68}69}
@@ -82,12 +83,12 @@
82.control-arrow {83.control-arrow {
83 display:block;84 display:block;
84 position:absolute;85 position:absolute;
85 86
86 z-index:100;87 z-index:100;
87 top:218px;88 top:218px;
88 height:64px;89 height:64px;
89 width:33px;90 width:33px;
90 91
91 background-repeat:no-repeat;92 background-repeat:no-repeat;
92 cursor:pointer;93 cursor:pointer;
93}94}
@@ -119,18 +120,17 @@
119 top:0px;120 top:0px;
120 width:100%;121 width:100%;
121 height:68px;122 height:68px;
122 background-color:#2b2929;123 background-color:#3C3B37;
123}124}
124125
125.header > .slidetitle {126.header > .slidetitle {
126 display:table-cell;127 display:table-cell;
127 padding:0px 25px;128 padding:0px 25px;
128 vertical-align:middle;129 vertical-align:middle;
129
130 font-size:24px;130 font-size:24px;
131 line-height:30px;131 line-height:30px;
132 font-weight:normal;132 font-weight:normal;
133 color:#f9f9f9;133 color: #f9f9f9; /*#DED9CB; */
134}134}
135.header > .slidetitle img {135.header > .slidetitle img {
136 display: block;136 display: block;
@@ -138,14 +138,15 @@
138138
139.main {139.main {
140 position:absolute;140 position:absolute;
141 top:70px; /* 68px + 2px margin */141 top:68px; /* 68px + 2px margin */
142 bottom:2px;142 bottom:0px;
143 left:2px;143 left:0px;
144 right:2px;144 right:0px;
145 min-height:370px; /* 442px (from #slideshow) - 70px - 2px */145 min-height:370px; /* 442px (from #slideshow) - 70px - 2px */
146 146 background-image:url('background.png');
147 background-repeat: no-repeat;
147 /* move this to #slideshow if we don't want the background image to move with slides */148 /* move this to #slideshow if we don't want the background image to move with slides */
148 background-image:url('background.png');149 /* background-image:url('background.png'); */
149}150}
150151
151.main.wide {152.main.wide {
@@ -174,7 +175,9 @@
174.text > div {175.text > div {
175 margin-bottom:8px;176 margin-bottom:8px;
176 padding:6px 12px;177 padding:6px 12px;
177 background-color:#F7F6F6;178 color: #ffffff;
179 background: rgba(0, 0, 0, 0.2);
180 border-radius: 4px;
178}181}
179.text > div:last-child {182.text > div:last-child {
180 margin-bottom:0px;183 margin-bottom:0px;
@@ -186,7 +189,7 @@
186 font-size:inherit;189 font-size:inherit;
187 font-weight:normal;190 font-weight:normal;
188 text-decoration:none;191 text-decoration:none;
189 border-bottom:#333333 dotted 1px;192 border-bottom:#d04e21 dotted 1px;
190}193}
191194
192.main.wide > .text {195.main.wide > .text {
@@ -227,12 +230,12 @@
227 position:absolute;230 position:absolute;
228 top:25px;231 top:25px;
229 right:-2px; /* offsets 2px margin of .main */232 right:-2px; /* offsets 2px margin of .main */
230 233
231 z-index:2;234 z-index:2;
232 235
233 -webkit-box-shadow:#999999 0px 0px 5px;236 /* -webkit-box-shadow:#999999 0px 0px 5px;
234 -moz-box-shadow:#999999 0px 0px 5px;237 -moz-box-shadow:#999999 0px 0px 5px;
235 box-shadow:#999999 0px 0px 5px;238 box-shadow:#999999 0px 0px 5px; */
236}239}
237240
238/* Expects screenshot to be 748x370 px */241/* Expects screenshot to be 748x370 px */
@@ -244,22 +247,22 @@
244 -webkit-box-shadow:none;247 -webkit-box-shadow:none;
245 -moz-box-shadow:none;248 -moz-box-shadow:none;
246 box-shadow:none;249 box-shadow:none;
247 250
248 z-index:0;251 z-index:0;
249}252}
250253
251.main.wide > .twitter-stream {254.main.wide > .twitter-stream {
252 display:none; /* always revealed by javascript */255 display:none; /* always revealed by javascript */
253 256
254 position:absolute;257 position:absolute;
255 width:334px;258 width:334px;
256 height:304px; /* 304 - 22 (for .twitter-stream-input) */259 height:304px; /* 304 - 22 (for .twitter-stream-input) */
257 top:25px;260 top:25px;
258 right:16px;261 right:16px;
259 z-index:2;262 z-index:2;
260 263
261 padding:0 6px;264 padding:0 6px;
262 265
263 color:#eee;266 color:#eee;
264}267}
265268
@@ -270,15 +273,15 @@
270.twitter-stream .twitter-stream-header h2 {273.twitter-stream .twitter-stream-header h2 {
271 display:inline;274 display:inline;
272 color:#fff;275 color:#fff;
273 276
274 font-size:16px;277 font-size:16px;
275}278}
276.twitter-stream .twitter-stream-header img {279.twitter-stream .twitter-stream-header img {
277 opacity:0.6;280 opacity:0.6;
278 float:right;281 float:right;
279 282
280 margin-left:22px;283 margin-left:22px;
281 284
282 -webkit-transition:opacity 150ms linear;285 -webkit-transition:opacity 150ms linear;
283}286}
284.twitter-stream .twitter-stream-header:hover img {287.twitter-stream .twitter-stream-header:hover img {
@@ -287,9 +290,9 @@
287290
288.twitter-stream .twitter-stream-tweets {291.twitter-stream .twitter-stream-tweets {
289 overflow:hidden;292 overflow:hidden;
290 293
291 height:100%;294 height:100%;
292 295
293 /* Warning: this is non-standard, only works in Webkit, could break at any time */296 /* Warning: this is non-standard, only works in Webkit, could break at any time */
294 -webkit-mask-image:-webkit-linear-gradient(top, rgba(0,0,0,1) 0%, rgba(0,0,0,1) 70%, rgba(0,0,0,0) 100%);297 -webkit-mask-image:-webkit-linear-gradient(top, rgba(0,0,0,1) 0%, rgba(0,0,0,1) 70%, rgba(0,0,0,0) 100%);
295}298}
@@ -329,15 +332,15 @@
329332
330.twitter-stream input.twitter-stream-input {333.twitter-stream input.twitter-stream-input {
331 width:100%;334 width:100%;
332 335
333 -webkit-box-sizing:border-box;336 -webkit-box-sizing:border-box;
334 padding:4px 2px 4px 22px;337 padding:4px 2px 4px 22px;
335 338
336 background-color:rgba(0, 0, 0, 0);339 background-color:rgba(0, 0, 0, 0);
337 border:none;340 border:none;
338 outline:none;341 outline:none;
339 color:#fff;342 color:#fff;
340 343
341 background-image:url('twitter-bird-16.png');344 background-image:url('twitter-bird-16.png');
342 background-position:left center;345 background-position:left center;
343 background-repeat:no-repeat;346 background-repeat:no-repeat;
@@ -403,4 +406,3 @@
403.l10n-string {406.l10n-string {
404 display:none;407 display:none;
405}408}
406
407409
=== removed file 'slideshows/ubuntu/slides/link/twitter-bird-16.png'
408Binary files slideshows/ubuntu/slides/link/twitter-bird-16.png 2015-04-01 00:03:36 +0000 and slideshows/ubuntu/slides/link/twitter-bird-16.png 1970-01-01 00:00:00 +0000 differ410Binary files slideshows/ubuntu/slides/link/twitter-bird-16.png 2015-04-01 00:03:36 +0000 and slideshows/ubuntu/slides/link/twitter-bird-16.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'slideshows/ubuntu/slides/link/twitter-logo-16.png'
409Binary files slideshows/ubuntu/slides/link/twitter-logo-16.png 2015-04-01 00:03:36 +0000 and slideshows/ubuntu/slides/link/twitter-logo-16.png 1970-01-01 00:00:00 +0000 differ411Binary files slideshows/ubuntu/slides/link/twitter-logo-16.png 2015-04-01 00:03:36 +0000 and slideshows/ubuntu/slides/link/twitter-logo-16.png 1970-01-01 00:00:00 +0000 differ
=== modified file 'slideshows/ubuntu/slides/screenshots/browse.png'
410Binary files slideshows/ubuntu/slides/screenshots/browse.png 2019-09-23 16:21:55 +0000 and slideshows/ubuntu/slides/screenshots/browse.png 2020-01-17 01:40:40 +0000 differ412Binary files slideshows/ubuntu/slides/screenshots/browse.png 2019-09-23 16:21:55 +0000 and slideshows/ubuntu/slides/screenshots/browse.png 2020-01-17 01:40:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/screenshots/customize.png'
411Binary files slideshows/ubuntu/slides/screenshots/customize.png 2019-09-24 11:57:34 +0000 and slideshows/ubuntu/slides/screenshots/customize.png 2020-01-17 01:40:40 +0000 differ413Binary files slideshows/ubuntu/slides/screenshots/customize.png 2019-09-24 11:57:34 +0000 and slideshows/ubuntu/slides/screenshots/customize.png 2020-01-17 01:40:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/screenshots/gs.png'
412Binary files slideshows/ubuntu/slides/screenshots/gs.png 2019-09-23 16:21:55 +0000 and slideshows/ubuntu/slides/screenshots/gs.png 2020-01-17 01:40:40 +0000 differ414Binary files slideshows/ubuntu/slides/screenshots/gs.png 2019-09-23 16:21:55 +0000 and slideshows/ubuntu/slides/screenshots/gs.png 2020-01-17 01:40:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/screenshots/music.png'
413Binary files slideshows/ubuntu/slides/screenshots/music.png 2019-09-23 16:21:55 +0000 and slideshows/ubuntu/slides/screenshots/music.png 2020-01-17 01:40:40 +0000 differ415Binary files slideshows/ubuntu/slides/screenshots/music.png 2019-09-23 16:21:55 +0000 and slideshows/ubuntu/slides/screenshots/music.png 2020-01-17 01:40:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/screenshots/office.png'
414Binary files slideshows/ubuntu/slides/screenshots/office.png 2019-09-23 16:21:55 +0000 and slideshows/ubuntu/slides/screenshots/office.png 2020-01-17 01:40:40 +0000 differ416Binary files slideshows/ubuntu/slides/screenshots/office.png 2019-09-23 16:21:55 +0000 and slideshows/ubuntu/slides/screenshots/office.png 2020-01-17 01:40:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/screenshots/photos.png'
415Binary files slideshows/ubuntu/slides/screenshots/photos.png 2019-09-23 16:21:55 +0000 and slideshows/ubuntu/slides/screenshots/photos.png 2020-01-17 01:40:40 +0000 differ417Binary files slideshows/ubuntu/slides/screenshots/photos.png 2019-09-23 16:21:55 +0000 and slideshows/ubuntu/slides/screenshots/photos.png 2020-01-17 01:40:40 +0000 differ

Subscribers

People subscribed via source and target branches