Merge lp:~flexiondotorg/ubiquity-slideshow-ubuntu/ubuntu-mate-focal into lp:ubiquity-slideshow-ubuntu

Proposed by Martin Wimpress on 2020-03-12
Status: Merged
Approved by: Sebastien Bacher on 2020-03-13
Approved revision: 867
Merged at revision: 872
Proposed branch: lp:~flexiondotorg/ubiquity-slideshow-ubuntu/ubuntu-mate-focal
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 419 lines (+82/-147)
3 files modified
slideshows/ubuntu-mate/slides/01_welcome.html (+6/-10)
slideshows/ubuntu-mate/slides/02_about.html (+7/-4)
slideshows/ubuntu-mate/slides/link/base.css (+69/-133)
To merge this branch: bzr merge lp:~flexiondotorg/ubiquity-slideshow-ubuntu/ubuntu-mate-focal
Reviewer Review Type Date Requested Status
Sebastien Bacher 2020-03-12 Approve on 2020-03-13
Review via email: mp+380605@code.launchpad.net

Description of the change

This merge proposal add a new design for Ubuntu MATE slideshow and updates the screenshots. No language strings have been changed.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

looks fine thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'slideshows/ubuntu-mate/slides/01_welcome.html'
2--- slideshows/ubuntu-mate/slides/01_welcome.html 2017-08-23 22:42:54 +0000
3+++ slideshows/ubuntu-mate/slides/01_welcome.html 2020-03-12 01:37:20 +0000
4@@ -1,12 +1,8 @@
5-<div class="header">
6- <h1 class="slidetitle">Welcome to Ubuntu MATE</h1>
7-</div>
8-<div class="main wide">
9- <div class="text">
10- <div>
11+<div class="wide">
12+ <div class="welcome">
13+ <h1>Welcome to Ubuntu MATE</h1>
14 <p>A community developed Ubuntu based operating system that
15 beautifully integrates the MATE desktop.</p>
16- </div>
17- </div>
18- <img class="background" src="screenshots/01_welcome.png" />
19-</div>
20\ No newline at end of file
21+ </div>
22+ <div class="whitebar"><!-- css background image here --></div>
23+</div>
24
25=== modified file 'slideshows/ubuntu-mate/slides/02_about.html'
26--- slideshows/ubuntu-mate/slides/02_about.html 2018-09-27 19:09:45 +0000
27+++ slideshows/ubuntu-mate/slides/02_about.html 2020-03-12 01:37:20 +0000
28@@ -7,10 +7,13 @@
29 <p>Ubuntu MATE is a stable, easy-to-use operating system with a
30 configurable desktop environment. Ideal for those who want the
31 most out of their computers and prefer a traditional desktop
32- metaphor. With modest hardware requirements it is suitable for
33+ metaphor. <br />
34+ With modest hardware requirements it is suitable for
35 modern workstations, single board computers and older hardware
36- alike.</p>
37- <br />
38+ alike.
39+ </p>
40+ </div>
41+ <div>
42 <p>For users coming from other operating systems, Ubuntu MATE can
43 adapt the user interface with one-click to something more modern
44 or something that you might be more familiar with via
45@@ -18,4 +21,4 @@
46 </div>
47 </div>
48 <img class="screenshot" src="screenshots/02_about.png"/>
49-</div>
50\ No newline at end of file
51+</div>
52
53=== modified file 'slideshows/ubuntu-mate/slides/icons/firefox.png'
54Binary files slideshows/ubuntu-mate/slides/icons/firefox.png 2018-08-13 19:41:51 +0000 and slideshows/ubuntu-mate/slides/icons/firefox.png 2020-03-12 01:37:20 +0000 differ
55=== modified file 'slideshows/ubuntu-mate/slides/icons/welcome.png'
56Binary files slideshows/ubuntu-mate/slides/icons/welcome.png 2016-01-10 15:19:40 +0000 and slideshows/ubuntu-mate/slides/icons/welcome.png 2020-03-12 01:37:20 +0000 differ
57=== modified file 'slideshows/ubuntu-mate/slides/link/base.css'
58--- slideshows/ubuntu-mate/slides/link/base.css 2017-08-23 22:42:54 +0000
59+++ slideshows/ubuntu-mate/slides/link/base.css 2020-03-12 01:37:20 +0000
60@@ -27,15 +27,11 @@
61 html, body {
62 margin:0;
63 padding:0;
64-
65- background-color:#F7F6F6;
66-
67 font-family:'Ubuntu', 'UbuntuBeta', sans-serif;
68 font-size:12px;
69 line-height:1.4em;
70-
71- color:#333333;
72-
73+ color: #ffffff;
74+
75 /* no reason to expose this extra stuff to the user */
76 -webkit-user-select:none;
77 -moz-user-select:none;
78@@ -47,7 +43,7 @@
79 Hyperlink-style text
80 */
81 a {
82- color:#87a556;
83+ color: #ffffff;
84 text-decoration:none;
85 display:inline;
86 }
87@@ -62,13 +58,14 @@
88
89 #wrapper {
90 position:absolute;
91-
92+
93 width:752px;
94 height:100%;
95 }
96
97 #slideshow {
98- background-image:url('background2.png');
99+ background: #3a4724 radial-gradient( circle farthest-corner at 20% -120%, #3a4724 0%, #a3ba79 90% );
100+ background-image:url('bg.jpg');
101 width:752px;
102 min-height:442px;
103 height:100%;
104@@ -83,12 +80,12 @@
105 .control-arrow {
106 display:block;
107 position:absolute;
108-
109+
110 z-index:100;
111 top:218px;
112 height:64px;
113 width:33px;
114-
115+
116 background-repeat:no-repeat;
117 cursor:pointer;
118 }
119@@ -120,18 +117,19 @@
120 top:0px;
121 width:100%;
122 height:68px;
123- background-color:#3C3B37;
124+ /* background-color:#3C3B37;
125+ background-image:url('background2.png'); */
126 }
127
128 .header > .slidetitle {
129 display:table-cell;
130 padding:0px 25px;
131 vertical-align:middle;
132-
133+
134 font-size:24px;
135 line-height:30px;
136 font-weight:normal;
137- color:#DED9CB;
138+ color:#f8f8f8;
139 }
140 .header > .slidetitle img {
141 display: block;
142@@ -139,18 +137,18 @@
143
144 .main {
145 position:absolute;
146- top:70px; /* 68px + 2px margin */
147+ top:50px; /* 68px + 2px margin */
148 bottom:2px;
149 left:2px;
150 right:2px;
151 min-height:370px; /* 442px (from #slideshow) - 70px - 2px */
152-
153+
154 /* move this to #slideshow if we don't want the background image to move with slides */
155 /* background-image:url('background2.png');*/
156 }
157
158 .main.wide {
159- top:68px;
160+ top:48px;
161 left:0px;
162 right:0px;
163 bottom:0px;
164@@ -161,12 +159,54 @@
165 A slide's body text goes inside here.
166 Inner space is 224px wide.
167 */
168+
169+.welcome {
170+ position:absolute;
171+ z-index:10;
172+ top: 40px;
173+ left: 40px;
174+ width: 700px;
175+ overflow:auto;
176+
177+}
178+.welcome > p {
179+ background:none;
180+ font-size:16px;
181+ width: 400px;
182+ line-height:1.5em;
183+ font-family: 'ubuntu';
184+}
185+
186+.whitebar {
187+ height: 108px;
188+ margin-top: 200px;
189+ background: #ffffff;
190+ width:100%;
191+ background-repeat: no-repeat;
192+ background-position: center;
193+ background-image: url('welcome_logos.jpg');
194+ }
195+
196+
197+h1 {
198+ clear: both;
199+
200+ font-size: 240%;
201+ font-weight: normal;
202+ line-height: 1.3em;
203+
204+ box-sizing: border-box;
205+ margin-bottom: 1em;
206+}
207+
208+
209+
210 .main > .text {
211 position:absolute;
212 z-index:10;
213 top:25px;
214- right:36px;
215- width:248px;
216+ right: 36px;
217+ width:250px;
218 bottom:35px;
219 min-height:329px; /* 369 - 25 - 15 (for bottom) */
220 overflow:auto;
221@@ -175,7 +215,8 @@
222 .text > div {
223 margin-bottom:8px;
224 padding:6px 12px;
225- /* background-color:#F7F6F6; */
226+ background-color: rgba(0, 0, 0, 0.35);
227+ border-radius: 4px;
228 }
229 .text > div:last-child {
230 margin-bottom:0px;
231@@ -187,7 +228,7 @@
232 font-size:inherit;
233 font-weight:normal;
234 text-decoration:none;
235- border-bottom:#333333 dotted 1px;
236+ border-bottom:#87a556 dotted 1px;
237 }
238
239 .main.wide > .text {
240@@ -195,13 +236,7 @@
241 width:650px;
242 }
243
244-.main.wide > .text > div {
245- background:none;
246- font-size:24px;
247- line-height:1.5em;
248- color:#F7F6F6;
249- text-shadow:2px 2px 4px #333333;
250-}
251+
252
253 .featured ul {
254 display:table;
255@@ -234,124 +269,26 @@
256 position:absolute;
257 top:25px;
258 left:-2px; /* offsets 2px margin of .main */
259-
260 z-index:2;
261-
262- -webkit-box-shadow:#999999 0px 0px 5px;
263- -moz-box-shadow:#999999 0px 0px 5px;
264- box-shadow:#999999 0px 0px 5px;
265-}
266-
267-/* Expects screenshot to be 748x370 px */
268-.main.wide > .background {
269- top:0px;
270- right:0px;
271- width:100%;
272- height:auto;
273- -webkit-box-shadow:none;
274- -moz-box-shadow:none;
275- box-shadow:none;
276-
277- z-index:0;
278-}
279+}
280+
281+
282
283 .main.wide > .twitter-stream {
284 display:none; /* always revealed by javascript */
285-
286+
287 position:absolute;
288 width:334px;
289 height:304px; /* 304 - 22 (for .twitter-stream-input) */
290 top:25px;
291 right:16px;
292 z-index:2;
293-
294+
295 padding:0 6px;
296-
297+
298 color:#eee;
299 }
300
301-.twitter-stream .twitter-stream-header {
302- display:block;
303- padding:6px 2px 0px 2px;
304-}
305-.twitter-stream .twitter-stream-header h2 {
306- display:inline;
307- color:#fff;
308-
309- font-size:16px;
310-}
311-.twitter-stream .twitter-stream-header img {
312- opacity:0.6;
313- float:right;
314-
315- margin-left:22px;
316-
317- -webkit-transition:opacity 150ms linear;
318-}
319-.twitter-stream .twitter-stream-header:hover img {
320- opacity:0.8;
321-}
322-
323-.twitter-stream .twitter-stream-tweets {
324- overflow:hidden;
325-
326- height:100%;
327-
328- /* Warning: this is non-standard, only works in Webkit, could break at any time */
329- -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%);
330-}
331-
332-.twitter-stream .tweet {
333- padding:6px 2px;
334- border-bottom:1px dotted rgba(255, 255, 255, 0.2);
335-}
336-.tweet .tweet-avatar {
337- display:table-cell;
338- vertical-align:top;
339- padding:0 6px;
340-}
341-
342-.tweet .tweet-author-details {
343- display:inline-block;
344-}
345-
346-.tweet .tweet-author-name {
347- color:#fff;
348- font-weight:bold;
349-}
350-.tweet .tweet-author-id {
351- color:#bbb;
352- font-weight:normal;
353- margin-left:1em;
354- font-size:0.9em;
355-}
356-
357-.tweet .tweet-text {
358- display:block;
359-}
360-
361-.tweet .tweet-text a {
362- color:#bbb;
363-}
364-
365-.twitter-stream input.twitter-stream-input {
366- width:100%;
367-
368- -webkit-box-sizing:border-box;
369- padding:4px 2px 4px 22px;
370-
371- background-color:rgba(0, 0, 0, 0);
372- border:none;
373- outline:none;
374- color:#fff;
375-
376- background-image:url('twitter-bird-16.png');
377- background-position:left center;
378- background-repeat:no-repeat;
379-}
380-.twitter-stream input.twitter-stream-input:focus {
381- background-color:rgba(0, 0, 0, 0.1);
382-}
383
384 /*
385 This rule disables drag-and-drop for images. See bug #448703.
386@@ -410,4 +347,3 @@
387 .l10n-string {
388 display:none;
389 }
390-
391
392=== added file 'slideshows/ubuntu-mate/slides/link/bg.jpg'
393Binary files slideshows/ubuntu-mate/slides/link/bg.jpg 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-mate/slides/link/bg.jpg 2020-03-12 01:37:20 +0000 differ
394=== added file 'slideshows/ubuntu-mate/slides/link/welcome_logos.jpg'
395Binary files slideshows/ubuntu-mate/slides/link/welcome_logos.jpg 1970-01-01 00:00:00 +0000 and slideshows/ubuntu-mate/slides/link/welcome_logos.jpg 2020-03-12 01:37:20 +0000 differ
396=== removed file 'slideshows/ubuntu-mate/slides/screenshots/01_welcome.png'
397Binary files slideshows/ubuntu-mate/slides/screenshots/01_welcome.png 2017-08-23 22:42:54 +0000 and slideshows/ubuntu-mate/slides/screenshots/01_welcome.png 1970-01-01 00:00:00 +0000 differ
398=== modified file 'slideshows/ubuntu-mate/slides/screenshots/02_about.png'
399Binary files slideshows/ubuntu-mate/slides/screenshots/02_about.png 2017-08-23 22:42:54 +0000 and slideshows/ubuntu-mate/slides/screenshots/02_about.png 2020-03-12 01:37:20 +0000 differ
400=== modified file 'slideshows/ubuntu-mate/slides/screenshots/03_getting_started.png'
401Binary files slideshows/ubuntu-mate/slides/screenshots/03_getting_started.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/03_getting_started.png 2020-03-12 01:37:20 +0000 differ
402=== modified file 'slideshows/ubuntu-mate/slides/screenshots/04_software.png'
403Binary files slideshows/ubuntu-mate/slides/screenshots/04_software.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/04_software.png 2020-03-12 01:37:20 +0000 differ
404=== modified file 'slideshows/ubuntu-mate/slides/screenshots/05_tweak.png'
405Binary files slideshows/ubuntu-mate/slides/screenshots/05_tweak.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/05_tweak.png 2020-03-12 01:37:20 +0000 differ
406=== modified file 'slideshows/ubuntu-mate/slides/screenshots/06_browse.png'
407Binary files slideshows/ubuntu-mate/slides/screenshots/06_browse.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/06_browse.png 2020-03-12 01:37:20 +0000 differ
408=== modified file 'slideshows/ubuntu-mate/slides/screenshots/07_games.png'
409Binary files slideshows/ubuntu-mate/slides/screenshots/07_games.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/07_games.png 2020-03-12 01:37:20 +0000 differ
410=== modified file 'slideshows/ubuntu-mate/slides/screenshots/08_music.png'
411Binary files slideshows/ubuntu-mate/slides/screenshots/08_music.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/08_music.png 2020-03-12 01:37:20 +0000 differ
412=== modified file 'slideshows/ubuntu-mate/slides/screenshots/09_photos.png'
413Binary files slideshows/ubuntu-mate/slides/screenshots/09_photos.png 2017-08-23 22:42:54 +0000 and slideshows/ubuntu-mate/slides/screenshots/09_photos.png 2020-03-12 01:37:20 +0000 differ
414=== modified file 'slideshows/ubuntu-mate/slides/screenshots/10_video.png'
415Binary files slideshows/ubuntu-mate/slides/screenshots/10_video.png 2019-09-28 11:30:41 +0000 and slideshows/ubuntu-mate/slides/screenshots/10_video.png 2020-03-12 01:37:20 +0000 differ
416=== modified file 'slideshows/ubuntu-mate/slides/screenshots/12_accessibility.png'
417Binary files slideshows/ubuntu-mate/slides/screenshots/12_accessibility.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/12_accessibility.png 2020-03-12 01:37:20 +0000 differ
418=== modified file 'slideshows/ubuntu-mate/slides/screenshots/13_community.png'
419Binary files slideshows/ubuntu-mate/slides/screenshots/13_community.png 2017-09-23 16:06:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/13_community.png 2020-03-12 01:37:20 +0000 differ

Subscribers

People subscribed via source and target branches