Ubiquity Slideshow

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

  1. ubuntu-slide-refresh
  2. Merge into html
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
1=== modified file 'slideshows/ubuntu/slides/browse.html'
2--- slideshows/ubuntu/slides/browse.html 2019-03-13 09:17:40 +0000
3+++ slideshows/ubuntu/slides/browse.html 2020-01-17 01:40:40 +0000
4@@ -19,6 +19,10 @@
5 <h2 class="subtitle">Supported software</h2>
6 <ul>
7 <li>
8+ <img class="icon" src="icons/thunderbird.png" />
9+ <p class="caption">Thunderbird</p>
10+ </li>
11+ <li>
12 <img class="icon" src="icons/chromium.png" />
13 <p class="caption">Chromium</p>
14 </li>
15
16=== removed file 'slideshows/ubuntu/slides/icons/U_One_logo.png'
17Binary 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
18=== removed file 'slideshows/ubuntu/slides/icons/flash.png'
19Binary 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
20=== modified file 'slideshows/ubuntu/slides/icons/libreoffice-calc.png'
21Binary 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
22=== modified file 'slideshows/ubuntu/slides/icons/libreoffice-impress.png'
23Binary 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
24=== modified file 'slideshows/ubuntu/slides/icons/libreoffice-writer.png'
25Binary 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
26=== modified file 'slideshows/ubuntu/slides/icons/rhythmbox.png'
27Binary 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
28=== modified file 'slideshows/ubuntu/slides/icons/shotwell.png'
29Binary 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
30=== modified file 'slideshows/ubuntu/slides/icons/themes.png'
31Binary 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
32=== added file 'slideshows/ubuntu/slides/icons/thunderbird.png'
33Binary 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
34=== 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 differ
36=== removed file 'slideshows/ubuntu/slides/icons/u1-icon-music.png'
37Binary 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
38=== removed file 'slideshows/ubuntu/slides/icons/u1-icon-photos.png'
39Binary 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
40=== modified file 'slideshows/ubuntu/slides/link/background.png'
41Binary 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
42=== modified file 'slideshows/ubuntu/slides/link/base.css'
43--- slideshows/ubuntu/slides/link/base.css 2018-10-04 14:13:34 +0000
44+++ slideshows/ubuntu/slides/link/base.css 2020-01-17 01:40:40 +0000
45@@ -27,15 +27,15 @@
46 html, body {
47 margin:0;
48 padding:0;
49-
50+
51 background-color:#F7F6F6;
52-
53+
54 font-family:'Ubuntu', 'UbuntuBeta', sans-serif;
55 font-size:12px;
56 line-height:1.4em;
57-
58+
59 color:#333333;
60-
61+
62 /* no reason to expose this extra stuff to the user */
63 -webkit-user-select:none;
64 -moz-user-select:none;
65@@ -47,8 +47,9 @@
66 Hyperlink-style text
67 */
68 a {
69- color:#19B6EE;
70+ color: #ffffff;
71 text-decoration:none;
72+ font-weight: bold;
73 display:inline;
74 }
75
76@@ -62,7 +63,7 @@
77
78 #wrapper {
79 position:absolute;
80-
81+
82 width:752px;
83 height:100%;
84 }
85@@ -82,12 +83,12 @@
86 .control-arrow {
87 display:block;
88 position:absolute;
89-
90+
91 z-index:100;
92 top:218px;
93 height:64px;
94 width:33px;
95-
96+
97 background-repeat:no-repeat;
98 cursor:pointer;
99 }
100@@ -119,18 +120,17 @@
101 top:0px;
102 width:100%;
103 height:68px;
104- background-color:#2b2929;
105+ background-color:#3C3B37;
106 }
107
108 .header > .slidetitle {
109 display:table-cell;
110 padding:0px 25px;
111 vertical-align:middle;
112-
113 font-size:24px;
114 line-height:30px;
115 font-weight:normal;
116- color:#f9f9f9;
117+ color: #f9f9f9; /*#DED9CB; */
118 }
119 .header > .slidetitle img {
120 display: block;
121@@ -138,14 +138,15 @@
122
123 .main {
124 position:absolute;
125- top:70px; /* 68px + 2px margin */
126- bottom:2px;
127- left:2px;
128- right:2px;
129+ top:68px; /* 68px + 2px margin */
130+ bottom:0px;
131+ left:0px;
132+ right:0px;
133 min-height:370px; /* 442px (from #slideshow) - 70px - 2px */
134-
135+ background-image:url('background.png');
136+ background-repeat: no-repeat;
137 /* move this to #slideshow if we don't want the background image to move with slides */
138- background-image:url('background.png');
139+ /* background-image:url('background.png'); */
140 }
141
142 .main.wide {
143@@ -174,7 +175,9 @@
144 .text > div {
145 margin-bottom:8px;
146 padding:6px 12px;
147- background-color:#F7F6F6;
148+ color: #ffffff;
149+ background: rgba(0, 0, 0, 0.2);
150+ border-radius: 4px;
151 }
152 .text > div:last-child {
153 margin-bottom:0px;
154@@ -186,7 +189,7 @@
155 font-size:inherit;
156 font-weight:normal;
157 text-decoration:none;
158- border-bottom:#333333 dotted 1px;
159+ border-bottom:#d04e21 dotted 1px;
160 }
161
162 .main.wide > .text {
163@@ -227,12 +230,12 @@
164 position:absolute;
165 top:25px;
166 right:-2px; /* offsets 2px margin of .main */
167-
168+
169 z-index:2;
170-
171- -webkit-box-shadow:#999999 0px 0px 5px;
172+
173+ /* -webkit-box-shadow:#999999 0px 0px 5px;
174 -moz-box-shadow:#999999 0px 0px 5px;
175- box-shadow:#999999 0px 0px 5px;
176+ box-shadow:#999999 0px 0px 5px; */
177 }
178
179 /* Expects screenshot to be 748x370 px */
180@@ -244,22 +247,22 @@
181 -webkit-box-shadow:none;
182 -moz-box-shadow:none;
183 box-shadow:none;
184-
185+
186 z-index:0;
187 }
188
189 .main.wide > .twitter-stream {
190 display:none; /* always revealed by javascript */
191-
192+
193 position:absolute;
194 width:334px;
195 height:304px; /* 304 - 22 (for .twitter-stream-input) */
196 top:25px;
197 right:16px;
198 z-index:2;
199-
200+
201 padding:0 6px;
202-
203+
204 color:#eee;
205 }
206
207@@ -270,15 +273,15 @@
208 .twitter-stream .twitter-stream-header h2 {
209 display:inline;
210 color:#fff;
211-
212+
213 font-size:16px;
214 }
215 .twitter-stream .twitter-stream-header img {
216 opacity:0.6;
217 float:right;
218-
219+
220 margin-left:22px;
221-
222+
223 -webkit-transition:opacity 150ms linear;
224 }
225 .twitter-stream .twitter-stream-header:hover img {
226@@ -287,9 +290,9 @@
227
228 .twitter-stream .twitter-stream-tweets {
229 overflow:hidden;
230-
231+
232 height:100%;
233-
234+
235 /* Warning: this is non-standard, only works in Webkit, could break at any time */
236 -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%);
237 }
238@@ -329,15 +332,15 @@
239
240 .twitter-stream input.twitter-stream-input {
241 width:100%;
242-
243+
244 -webkit-box-sizing:border-box;
245 padding:4px 2px 4px 22px;
246-
247+
248 background-color:rgba(0, 0, 0, 0);
249 border:none;
250 outline:none;
251 color:#fff;
252-
253+
254 background-image:url('twitter-bird-16.png');
255 background-position:left center;
256 background-repeat:no-repeat;
257@@ -403,4 +406,3 @@
258 .l10n-string {
259 display:none;
260 }
261-
262
263=== removed file 'slideshows/ubuntu/slides/link/twitter-bird-16.png'
264Binary 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
265=== removed file 'slideshows/ubuntu/slides/link/twitter-logo-16.png'
266Binary 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
267=== modified file 'slideshows/ubuntu/slides/screenshots/browse.png'
268Binary 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
269=== modified file 'slideshows/ubuntu/slides/screenshots/customize.png'
270Binary 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
271=== modified file 'slideshows/ubuntu/slides/screenshots/gs.png'
272Binary 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
273=== modified file 'slideshows/ubuntu/slides/screenshots/music.png'
274Binary 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
275=== modified file 'slideshows/ubuntu/slides/screenshots/office.png'
276Binary 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
277=== modified file 'slideshows/ubuntu/slides/screenshots/photos.png'
278Binary 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