Merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/artful3 into lp:ubiquity-slideshow-ubuntu

Proposed by Aaron Honeycutt on 2017-07-27
Status: Merged
Merged at revision: 785
Proposed branch: lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/artful3
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 907 lines (+302/-402)
17 files modified
slideshows/kubuntu/slides/00_Welcome.html (+20/-7)
slideshows/kubuntu/slides/01_Applications.html (+54/-0)
slideshows/kubuntu/slides/02_Accessibility.html (+27/-14)
slideshows/kubuntu/slides/02_Desktop.html (+0/-19)
slideshows/kubuntu/slides/03_Get-Help.html (+25/-18)
slideshows/kubuntu/slides/03_Internet.html (+0/-14)
slideshows/kubuntu/slides/04_Create.html (+0/-12)
slideshows/kubuntu/slides/04_Get-Involved.html (+45/-31)
slideshows/kubuntu/slides/05_Multimedia.html (+0/-16)
slideshows/kubuntu/slides/06_PIM.html (+0/-14)
slideshows/kubuntu/slides/07_Office.html (+0/-16)
slideshows/kubuntu/slides/08_Games.html (+0/-14)
slideshows/kubuntu/slides/10_Discover.html (+0/-16)
slideshows/kubuntu/slides/icons/.directory (+4/-0)
slideshows/kubuntu/slides/index.html (+12/-20)
slideshows/kubuntu/slides/link/base.css (+115/-187)
slideshows/kubuntu/slides/screenshots/.directory (+0/-4)
To merge this branch: bzr merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/artful3
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2017-07-27 Approve on 2017-08-16
Gerry Boland (community) Approve on 2017-08-03
Review via email: mp+328193@code.launchpad.net

Description of the change

Redid everything with proper bzr commands, cloned a base slideshow and merged with this branch locally and found no conflicts or errors.

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

Have just given this the once-over, it looks great

review: Approve
Mathieu Trudel-Lapierre (cyphermox) wrote :

There are multiple issues with the proposed changes; I've attempted to fix them locally, but the response a few weeks ago was that it didn't look better (although test-slideshow looks a lot better to me after applying this -- fixes some spacing issues and text size, etc.). A lot of the changes are basically in the CSS, rather than the html

My proposed changes I have saved here: http://paste.ubuntu.com/25326881/

In the meantime, I'm merging this MP mostly as-is, fixing the issues found: multiple tags that are wrong or unclosed:

- img tags need a closing / at the end
- same for br, but br is usually better not used at all
- don't need a body or title, this is html but not a complete html document.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'slideshows/kubuntu/slides/01_Welcome.html' => 'slideshows/kubuntu/slides/00_Welcome.html'
2--- slideshows/kubuntu/slides/01_Welcome.html 2017-05-25 18:10:27 +0000
3+++ slideshows/kubuntu/slides/00_Welcome.html 2017-07-27 20:38:11 +0000
4@@ -1,7 +1,20 @@
5-<div class="header">
6- <h1 class="slidetitle">Welcome to your new Plasma desktop</h1>
7-</div>
8-
9- <img class="background" src="screenshots/welcome-background.png" />
10-<div class="main">
11-</div>
12+<!DOCTYPE html>
13+<title>Welcome Slide</title>
14+
15+<body>
16+<div class="slide" id="welcome">
17+ <div class="header">
18+ <h1 class="slidetitle">Welcome to Kubuntu</h1>
19+ </div>
20+
21+ <div id="icon">
22+ <img src="icons/kubuntu-logo.svg" alt="kubuntu logo" width="135" height="135" style="padding-top:275px; padding-left:545px;">
23+ </div>
24+
25+ <div class="main" id="center-text">
26+ <p>Thanks for picking Kubuntu!</p>
27+ <br>
28+ <p>Kubuntu combines the best of the KDE Community's software with Ubuntu's base to make a great desktop experience</p>
29+ </div>
30+</div>
31+</body>
32
33=== added file 'slideshows/kubuntu/slides/01_Applications.html'
34--- slideshows/kubuntu/slides/01_Applications.html 1970-01-01 00:00:00 +0000
35+++ slideshows/kubuntu/slides/01_Applications.html 2017-07-27 20:38:11 +0000
36@@ -0,0 +1,54 @@
37+<!DOCTYPE html>
38+<title>Applications Slide</title>
39+
40+<body>
41+<div class="slide" id="apps">
42+ <div class="header">
43+ <h1 class="slidetitle">Find everything you need on your new install</h1>
44+ </div>
45+
46+ <div class="main">
47+ <p id="full-text">Kubuntu comes with most of the applications that you need on a daily basis. <br> For everything else you can install more software in Discover our software center</p>
48+ <table>
49+ <tr>
50+ <td>
51+ <div><img src="icons/internet-web-browser.png" width="64px" height="64px"></div>
52+ <div class="title">Firefox</div>
53+ <div class="description">Web Browser</div>
54+ <td>
55+ <div><img src="icons/email.png" width="64px" height="64px"></div>
56+ <div class="title">Kontact</div>
57+ <div class="description">Email, Contacts</div>
58+ <td>
59+ <div><img src="icons/libreoffice.png" width="64px" height="64px"></div>
60+ <div class="title">LibreOffice</div>
61+ <div class="description">Office Suite</div>
62+ <td>
63+ <div><img src="icons/discover.png" width="64px" height="64px"></div>
64+ <div class="title">Discover</div>
65+ <div class="description">Software Center</div>
66+ <td></td>
67+ </tr>
68+ <tr>
69+ <td>
70+ <div><img src="icons/amarok.png" width="64px" height="64px"></div>
71+ <div class="title">Amarok</div>
72+ <div class="description">Music Player</div>
73+ <td>
74+ <div><img src="icons/dragonplayer.png" width="64px" height="64px"></div>
75+ <div class="title">Dragon Player</div>
76+ <div class="description">Video Player</div>
77+ <td>
78+ <div><img src="icons/okular.png"></div>
79+ <div class="title">Okular</div>
80+ <div class="description">Document Viewer</div>
81+ <td>
82+ <div><img src="icons/dolphin.png"></div>
83+ <div class="title">Dophin</div>
84+ <div class="description">File Manager</div>
85+ </tr>
86+ </table>
87+ </div>
88+</div>
89+</body>
90+
91
92=== renamed file 'slideshows/kubuntu/slides/09_Accessibility.html' => 'slideshows/kubuntu/slides/02_Accessibility.html'
93--- slideshows/kubuntu/slides/09_Accessibility.html 2017-05-25 18:10:27 +0000
94+++ slideshows/kubuntu/slides/02_Accessibility.html 2017-07-27 20:38:11 +0000
95@@ -1,14 +1,27 @@
96-<div class="header">
97- <h1 class="slidetitle">Kubuntu: for all users</h1>
98-</div>
99-
100- <img class="background" src="screenshots/accessibility-background.png" />
101-<div class="main">
102- <div class="text">
103- <div id="left-text">
104- <div>
105- <p>We want Kubuntu to work for everyone.</p>
106- </div>
107- </div>
108- </div>
109-</div>
110+<!DOCTYPE html>
111+<title>Accessibility Slide</title>
112+
113+<body>
114+<div class="slide" id="accessibility">
115+ <div class="header">
116+ <h1 class="slidetitle">Kubuntu: for all users</h1>
117+ </div>
118+
119+ <div id="screenie">
120+ <img src="screenshots/accessibility.png" style="width:600px; height:337px; padding-left:260px; padding-top:85px;">
121+ </div>
122+
123+ <div id="icon">
124+ <img src="icons/preferences-desktop-accessibility.png" style="padding-top:300px; padding-left:5px;">
125+ </div>
126+
127+ <div class="main">
128+ <div class="text">
129+ <div id="left-text">
130+ <div><p>We want Kubuntu to work for everyone.</p></div>
131+ <br>
132+ <div><p>We include a screen reader, modifier keys and more.</p></div>
133+ </div>
134+ </div>
135+</div>
136+</body>
137
138=== removed file 'slideshows/kubuntu/slides/02_Desktop.html'
139--- slideshows/kubuntu/slides/02_Desktop.html 2017-05-25 18:10:27 +0000
140+++ slideshows/kubuntu/slides/02_Desktop.html 1970-01-01 00:00:00 +0000
141@@ -1,19 +0,0 @@
142-<div class="header">
143- <h1 class="slidetitle">Launch into something new</h1>
144-</div>
145-
146- <img class="background" src="screenshots/desktop-background.png" />
147-<div class="main">
148- <div class="text">
149- <div id="right-text">
150- <div>
151- <p><strong>KRunner</strong>, a launcher plus! launch applications, switch tasks, do quick calculations and so much more.
152- Pop it up with:</p>
153- ALT + Space bar<br/>
154- ALT + F1
155- <br/>
156- <br/><p><strong>Kickoff</strong> is your default launcher to open applications, documents and folders. Right-click on the icon to try alternates.</p>
157- </div>
158- </div>
159- </div>
160-</div>
161
162=== renamed file 'slideshows/kubuntu/slides/11_Get-Help.html' => 'slideshows/kubuntu/slides/03_Get-Help.html'
163--- slideshows/kubuntu/slides/11_Get-Help.html 2017-05-25 18:10:27 +0000
164+++ slideshows/kubuntu/slides/03_Get-Help.html 2017-07-27 20:38:11 +0000
165@@ -1,23 +1,30 @@
166-<div class="header">
167- <h1 class="slidetitle">Getting help with Kubuntu</h1>
168-</div>
169-
170- <img class="background" src="screenshots/gethelp-background.png" />
171-<div class="main">
172- <div class="text">
173- <ul class="center">
174- <div>
175- <li>If you need help, try Help from the menu, or the
176+<!DOCTYPE html>
177+<title>Get Help Slide</title>
178+
179+<body>
180+<div class="slide" id="get-help">
181+ <div class="header">
182+ <h1 class="slidetitle">Getting help with Kubuntu</h1>
183+ </div>
184+
185+ <div id="icon">
186+ <img src="icons/system-help.png" style="padding-top:300px ; padding-left:565px;">
187+ </div>
188+
189+ <div class="main">
190+ <ul class="center">
191+ <div>
192+ <li>If you need help, try Help from the menu, or the
193 Help menu in most applications.
194 Let us know about your Kubuntu experience at <a href="http://www.kubuntu.org/community">Kubuntu Community*</a>!</li>
195- <br/>
196- <li>In addition to our extensive written help, the Kubuntu
197+ <br/>
198+ <li>In addition to our extensive written help, the Kubuntu
199 community in conjunction with the Ubuntu community, provides free
200 technical support in person and over the Internet. Learn more at <a href="http://www.kubuntu.org/support">Kubuntu Support**.</a></li>
201- <br/>
202- * http://www.kubuntu.org/community<br/>
203- ** http://www.kubuntu.org/support
204- </div>
205- </ul>
206- </div>
207+ <br/>
208+ * http://www.kubuntu.org/community<br/>
209+ ** http://www.kubuntu.org/support
210+ </ul>
211+ </div>
212 </div>
213+</body>
214
215=== removed file 'slideshows/kubuntu/slides/03_Internet.html'
216--- slideshows/kubuntu/slides/03_Internet.html 2017-05-25 18:10:27 +0000
217+++ slideshows/kubuntu/slides/03_Internet.html 1970-01-01 00:00:00 +0000
218@@ -1,14 +0,0 @@
219-<div class="header">
220- <h1 class="slidetitle">Explore the whole web</h1>
221-</div>
222-
223- <img class="background" src="screenshots/internet-background.png" />
224-<div class="main">
225- <div class="text">
226- <div id="left-text">
227- <div>
228- <p><strong>Firefox</strong> gives you the power to go anywhere on the web and use all your favorite web services.</p>
229- </div>
230- </div>
231- </div>
232-</div>
233
234=== removed file 'slideshows/kubuntu/slides/04_Create.html'
235--- slideshows/kubuntu/slides/04_Create.html 2017-05-25 18:10:27 +0000
236+++ slideshows/kubuntu/slides/04_Create.html 1970-01-01 00:00:00 +0000
237@@ -1,12 +0,0 @@
238-<div class="header">
239- <h1 class="slidetitle">Be creative with Kubuntu</h1>
240-</div>
241-
242- <img class="background" src="screenshots/create-background.png" />
243-<div class="main">
244- <div class="text">
245- <div id="left-text">
246- <div>
247- <p><strong>Kdenlive</strong> is a powerful<br/> non-linear video editor.</p>
248- <br>
249- <p><strong>Krita</strong> is a professional free and open source painting program.</p>
250
251=== renamed file 'slideshows/kubuntu/slides/12_Get-Involved.html' => 'slideshows/kubuntu/slides/04_Get-Involved.html'
252--- slideshows/kubuntu/slides/12_Get-Involved.html 2017-05-25 18:10:27 +0000
253+++ slideshows/kubuntu/slides/04_Get-Involved.html 2017-07-27 20:38:11 +0000
254@@ -1,31 +1,45 @@
255-<div class="header">
256- <h1 class="slidetitle">Getting involved with Kubuntu</h1>
257-</div>
258-
259- <img class="background" src="screenshots/getinvolved-background.png" />
260-<div class="main">
261- <div class="text">
262- <ul class="center">
263- <div>
264- <li>The Kubuntu community consists of a group of individuals, who
265- make up one of the greatest teams in the open source community,
266- work on various aspects of the distribution, providing advice and
267- technical support, as well as helping to promote Kubuntu to a wider
268- audience.</li>
269- <br/>
270- <li>No matter your skill level, getting involved and helping to
271- mold the future of Kubuntu is easy, and you are more than welcome
272- to help out.</li>
273- <br/>
274- <li>Look over <a href="http://docs.kubuntu.org/docs/contribute.html">Kubuntu Manual*</a>
275- and see where you might be able to help out. Remember, it is easy
276- to get involved and the work you do will be seen by millions of
277- people around the world.</li>
278- <br/>
279- <li>The installation will finish soon. We hope you enjoy Kubuntu!</li>
280- <br/>
281- * http://docs.kubuntu.org/docs/contribute.html
282- </div>
283- </ul>
284- </div>
285-</div>
286+<!DOCTYPE html>
287+<title>Get Involved Slide</title>
288+
289+<body>
290+<div class="slide" id="get-involved">
291+ <div class="header">
292+ <h1 class="slidetitle">Getting involved with Kubuntu</h1>
293+ </div>
294+
295+ <div id="icon">
296+ <img src="icons/system-users.png" alt="breeze users icon" style="padding-top:300px; padding-left:565px;"/>
297+ </div>
298+
299+ <div class="main">
300+ <ul class="center">
301+ <li>
302+ The Kubuntu community consists of a group of individuals, who
303+ made up one of the greatest teams in the open source community,
304+ working on various aspects of the distribution, providing advice and
305+ technical support, as well as helping to promote Kubuntu to a wider
306+ audience.
307+ </li>
308+ <br>
309+ <li>
310+ No matter your skill level, getting involved and helping to
311+ mold the future of Kubuntu is easy, and you are more than welcome
312+ to help out.
313+ </li>
314+ <br>
315+ <li>
316+ Look over <a href="http://docs.kubuntu.org/docs/contribute.html">Kubuntu Manual*</a>
317+ and see where you might be able to help out. Remember, it is easy
318+ to get involved and the work you do will be seen by millions of
319+ people around the world.
320+ </li>
321+ <br>
322+ <li>
323+ The installation will finish soon. We hope you enjoy Kubuntu!
324+ </li>
325+ <br>
326+ * http://docs.kubuntu.org/docs/contribute.html
327+ </ul>
328+ </div>
329+</div>
330+</body>
331
332=== removed file 'slideshows/kubuntu/slides/05_Multimedia.html'
333--- slideshows/kubuntu/slides/05_Multimedia.html 2017-05-25 18:10:27 +0000
334+++ slideshows/kubuntu/slides/05_Multimedia.html 1970-01-01 00:00:00 +0000
335@@ -1,16 +0,0 @@
336-<div class="header">
337- <h1 class="slidetitle">Enjoy your music and videos</h1>
338-</div>
339-
340- <img class="background" src="screenshots/media-background.png" />
341-<div class="main">
342- <div class="text">
343- <div id="left-text">
344- <div>
345- <p><strong>Dragon Player</strong> handles your videos.</p>
346- <br/>
347- <p><strong>Amarok</strong> let's you explore your music.</p>
348- </div>
349- </div>
350- </div>
351-</div>
352
353=== removed file 'slideshows/kubuntu/slides/06_PIM.html'
354--- slideshows/kubuntu/slides/06_PIM.html 2017-05-25 18:10:27 +0000
355+++ slideshows/kubuntu/slides/06_PIM.html 1970-01-01 00:00:00 +0000
356@@ -1,14 +0,0 @@
357-<div class="header">
358- <h1 class="slidetitle">Meet your own assistant</h1>
359-</div>
360-
361- <img class="background" src="screenshots/pim-background.png" />
362-<div class="main">
363- <div class="text">
364- <div id="left-text-alt">
365- <div>
366- <p><strong>Kontact</strong> is your personal assistant. Handles your email, calendar, to-do list, feeds and more.</p>
367- </div>
368- </div>
369- </div>
370-</div>
371
372=== removed file 'slideshows/kubuntu/slides/07_Office.html'
373--- slideshows/kubuntu/slides/07_Office.html 2017-05-25 18:10:27 +0000
374+++ slideshows/kubuntu/slides/07_Office.html 1970-01-01 00:00:00 +0000
375@@ -1,16 +0,0 @@
376-<div class="header">
377- <h1 class="slidetitle">Take your office with you</h1>
378-</div>
379-
380- <img class="background" src="screenshots/office-background.png" />
381-<div class="main">
382- <div class="text">
383- <div id="left-text">
384- <div>
385- <p><strong>LibreOffice</strong> can handle all your office file, from Word documents to Powerpoint slides.</p>
386- <br/>
387- <p><strong>Okular</strong> can read and edit PDF and ePub files.</p>
388- </div>
389- </div>
390- </div>
391-</div>
392
393=== removed file 'slideshows/kubuntu/slides/08_Games.html'
394--- slideshows/kubuntu/slides/08_Games.html 2017-05-25 18:10:27 +0000
395+++ slideshows/kubuntu/slides/08_Games.html 1970-01-01 00:00:00 +0000
396@@ -1,14 +0,0 @@
397-<div class="header">
398- <h1 class="slidetitle">Plenty of games to enjoy</h1>
399-</div>
400-
401- <img class="background" src="screenshots/gaming-background.png" />
402-<div class="main">
403- <div class="text">
404- <div id="left-text">
405- <div>
406- <p><strong>Steam</strong> offers hundreds of<br/> games ranging from first-person shooters, puzzles, strategy and more.</p>
407- </div>
408- </div>
409- </div>
410-</div>
411
412=== removed file 'slideshows/kubuntu/slides/10_Discover.html'
413--- slideshows/kubuntu/slides/10_Discover.html 2017-05-25 18:10:27 +0000
414+++ slideshows/kubuntu/slides/10_Discover.html 1970-01-01 00:00:00 +0000
415@@ -1,16 +0,0 @@
416-<div class="header">
417- <h1 class="slidetitle">Discover new software</h1>
418-</div>
419-
420- <img class="background" src="screenshots/discover-background.png" />
421-<div class="main">
422- <div class="text">
423- <div id="left-text">
424- <div>
425- <p><strong>Discover</strong> allows you to install and remove software from our repositories, carefully organized to be safe and up-to-date..</p>
426- <br/>
427- <p>Explore great software for everything from creating music and movies to producing 3D models and exploring the universe.</p>
428- </div>
429- </div>
430- </div>
431-</div>
432
433=== added file 'slideshows/kubuntu/slides/icons/.directory'
434--- slideshows/kubuntu/slides/icons/.directory 1970-01-01 00:00:00 +0000
435+++ slideshows/kubuntu/slides/icons/.directory 2017-07-27 20:38:11 +0000
436@@ -0,0 +1,4 @@
437+[Dolphin]
438+PreviewsShown=true
439+Timestamp=2017,7,27,14,29,45
440+Version=3
441
442=== added file 'slideshows/kubuntu/slides/icons/add.png'
443Binary files slideshows/kubuntu/slides/icons/add.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/add.png 2017-07-27 20:38:11 +0000 differ
444=== added file 'slideshows/kubuntu/slides/icons/amarok.png'
445Binary files slideshows/kubuntu/slides/icons/amarok.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/amarok.png 2017-07-27 20:38:11 +0000 differ
446=== renamed file 'slideshows/kubuntu/slides/icons/muondiscover.png' => 'slideshows/kubuntu/slides/icons/discover.png'
447=== added file 'slideshows/kubuntu/slides/icons/dolphin.png'
448Binary files slideshows/kubuntu/slides/icons/dolphin.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/dolphin.png 2017-07-27 20:38:11 +0000 differ
449=== added file 'slideshows/kubuntu/slides/icons/dragonplayer.png'
450Binary files slideshows/kubuntu/slides/icons/dragonplayer.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/dragonplayer.png 2017-07-27 20:38:11 +0000 differ
451=== added file 'slideshows/kubuntu/slides/icons/internet-web-browser.png'
452Binary files slideshows/kubuntu/slides/icons/internet-web-browser.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/internet-web-browser.png 2017-07-27 20:38:11 +0000 differ
453=== added file 'slideshows/kubuntu/slides/icons/libreoffice.png'
454Binary files slideshows/kubuntu/slides/icons/libreoffice.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/libreoffice.png 2017-07-27 20:38:11 +0000 differ
455=== added file 'slideshows/kubuntu/slides/icons/okular.png'
456Binary files slideshows/kubuntu/slides/icons/okular.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/okular.png 2017-07-27 20:38:11 +0000 differ
457=== added file 'slideshows/kubuntu/slides/icons/ubuntu_logo.png'
458Binary files slideshows/kubuntu/slides/icons/ubuntu_logo.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/ubuntu_logo.png 2017-07-27 20:38:11 +0000 differ
459=== modified file 'slideshows/kubuntu/slides/index.html'
460--- slideshows/kubuntu/slides/index.html 2017-05-24 23:15:14 +0000
461+++ slideshows/kubuntu/slides/index.html 2017-07-27 20:38:11 +0000
462@@ -3,7 +3,7 @@
463 <html lang="en">
464
465 <head>
466- <title>ubiquity-slideshow-ubuntu</title>
467+ <title>ubiquity-slideshow-kubuntu</title>
468
469 <link href="link/base.css" rel="stylesheet" type="text/css" />
470
471@@ -34,25 +34,17 @@
472 <body>
473
474 <div id="slideshow">
475- <div><a href="01_Welcome.html" class="load"></a></div>
476- <div><a href="02_Desktop.html" class="load"></a></div>
477- <div><a href="03_Internet.html" class="load"></a></div>
478- <div><a href="04_Create.html" class="load"></a></div>
479- <div><a href="05_Multimedia.html" class="load"></a></div>
480- <div><a href="06_PIM.html" class="load"></a></div>
481- <div><a href="07_Office.html" class="load"></a></div>
482- <div><a href="08_Games.html" class="load"></a></div>
483- <div><a href="09_Accessibility.html" class="load"></a></div>
484- <div><a href="10_Discover.html" class="load"></a></div>
485- <div><a href="11_Get-Help.html" class="load"></a></div>
486- <div><a href="12_Get-Involved.html" class="load"></a></div>
487-
488-</div>
489-
490-<div id="debug-controls">
491-<input type="button" id="prev-slide" value="&lt;"/>
492-<input type="button" id="next-slide" value="&gt;"/>
493-</div>
494+ <div><a href="00_Welcome.html" class="load"></a></div>
495+ <div><a href="01_Applications.html" class="load"></a></div>
496+ <div><a href="02_Accessibility.html" class="load"></a></div>
497+ <div><a href="03_Get-Help.html" class="load"></a></div>
498+ <div><a href="04_Get-Involved.html" class="load"></a></div>
499+</div>
500+
501+<div id="controls">
502+ <a class="control-arrow" id="prev-slide" style="display:none;"></a>
503+ <a class="control-arrow" id="next-slide"></a>
504+ <input type="hidden" id="current-slide" />
505
506 </body>
507
508
509=== modified file 'slideshows/kubuntu/slides/link/base.css'
510--- slideshows/kubuntu/slides/link/base.css 2017-05-16 02:03:29 +0000
511+++ slideshows/kubuntu/slides/link/base.css 2017-07-27 20:38:11 +0000
512@@ -6,7 +6,7 @@
513 b, u, i, center,
514 dl, dt, dd, ol, ul, li,
515 fieldset, form, label, legend,
516-table, caption, tbody, tfoot, thead, tr, th, td {
517+caption, tbody, tfoot, thead {
518 margin:0;
519 padding:0;
520 border:0;
521@@ -26,7 +26,7 @@
522 margin:0;
523 padding:0;
524
525- background-color:#F7F6F6;
526+ background-color:#fcfcfc;
527
528 font-family: 'Droid Sans', 'Cantarell', 'Ubuntu', 'UbuntuBeta', sans-serif;
529 font-size:13px;
530@@ -104,7 +104,7 @@
531 }
532 .control-arrow#prev-slide {
533 background-image:url('arrow-back.png');
534- left:686px;
535+ left:20px;
536 }
537 .control-arrow#next-slide {
538 background-image:url('arrow-next.png');
539@@ -134,7 +134,7 @@
540 font-size:20px;
541 line-height:50px;
542 font-weight:bold;
543- color:#F7F6F6;
544+ color:#fcfcfc;
545 }
546 .header > .slidetitle img {
547 display: block;
548@@ -151,21 +151,6 @@
549 /*background-image:url('background.png');*/
550 }
551
552-.main.big {
553- top:68px;
554- left:0px;
555- right:0px;
556- bottom:0px;
557-}
558-
559-.main.wide{
560- top:68px;
561- left:0px;
562- right:0px;
563- bottom:0px;
564- /*background-image:url('background.jpg');*/
565-}
566-
567 /*
568 A slide's body text goes inside here.
569 Inner space is 224px wide.
570@@ -182,157 +167,6 @@
571 overflow:auto;
572 }
573
574-.text > div {
575- margin-bottom:8px;
576- padding:6px 12px;
577-}
578-.text > div:last-child {
579- margin-bottom:0px;
580-}
581-
582-.text > div > .subtitle {
583- padding-bottom:2px;
584- margin-bottom:5px;
585- font-size:inherit;
586- font-weight:normal;
587- text-decoration:none;
588- border-bottom:#F7F6F6 dotted 1px;
589-}
590-
591-.main.big > .text {
592- top:55px;
593- width:320px;
594-}
595-
596-.main.big > .text > div {
597- background:none;
598- font-size:13px;
599- line-height:1.2em;
600- color:#F7F6F6;
601- /*text-shadow:1px 1px 1px #333333;*/
602-}
603-
604-.main.wide > .text {
605- position:absolute;
606- z-index:10;
607- top:235px;
608- left:36px;
609- width:680px;
610- overflow:auto;
611-}
612-
613-.main.wide > .text > div {
614- background:none;
615- font-size:inherit;
616- line-height:1.2em;
617- margin-bottom:8px;
618- padding:6px 12px;
619- background-color:#FCFCFC;
620-}
621-
622-/* Kubuntu addons
623- * Aaron Honeycutt <aaronhoneycutt@kubuntu.org>
624- * ahoneybun on IRC
625- */
626-
627-.main > .text > ul.center {
628- list-style-type:disc;
629- font-size:15px;
630- width:525px;
631- margin-left:15px;
632- padding-top:25px;
633- padding-left:15px;
634-}
635-
636-#left-text {
637- font-size:16px;
638- text-align:left;
639- padding-top:35px;
640- padding-left:13px;
641- width:209px;
642- overflow:auto;
643-}
644-
645-#left-text-alt {
646- font-size:16px;
647- text-align:left;
648- padding-top:35px;
649- padding-left:13px;
650- width:250px;
651- overflow:auto;
652-}
653-
654-#right-text {
655- font-size:16px;
656- text-align:right;
657- padding-top:65px;
658- padding-left:250px;
659- width:350px;
660- overflow:auto;
661-}
662-
663-/* End of addons by Kubuntu */
664-
665-.featured ul {
666- display:table;
667-}
668-.featured li {
669- display:table-row;
670-}
671-.featured li > * {
672- padding-bottom:12px;
673-}
674-.featured li .icon {
675- display:table-cell;
676- width:24px;
677- height:auto;
678- padding-right:12px;
679-}
680-.featured li .caption {
681- display:table-cell;
682- vertical-align:middle;
683-}
684-
685-.bigicon{
686- position: absolute;
687- bottom:0px;
688-}
689-
690-.bigicon ul{
691- width:100%;
692-}
693-.bigicon li{
694- margin-right:20px;
695- float:left;
696-}
697-
698-/* Expects screenshot to be 448x347 px */
699-.main > .screenshot {
700- position:absolute;
701- top:25px;
702- right:-2px; /* offsets 2px margin of .main */
703-
704- z-index:2;
705-
706- /* Screenshot shadow, not in use but might be useful in future releases*/
707- /* -webkit-box-shadow:#999999 0px 0px 5px;
708- -moz-box-shadow:#999999 0px 0px 5px;
709- box-shadow:#999999 0px 0px 5px; */
710-}
711-
712-/* Expects screenshot to be 748x370 px */
713-.main.wide > .background {
714- top:0px;
715- right:0px;
716- width:100%;
717- height:auto;
718- -webkit-box-shadow:none;
719- -moz-box-shadow:none;
720- box-shadow:none;
721-
722- z-index:0;
723-}
724-
725 /*
726 This rule disables drag-and-drop for images. See bug #448703.
727 */
728@@ -340,8 +174,6 @@
729 -webkit-user-drag:none;
730 }
731
732-
733-
734 /* RTL stuff */
735 .rtl {
736 direction:rtl;
737@@ -356,21 +188,117 @@
738 left:686px; /* 752px - 33px */
739 }
740
741-.rtl .main > .text {
742- left:auto;
743- right:36px;
744-}
745-
746-.rtl .main > .screenshot {
747- right:auto;
748- left:-2px;
749-}
750-
751-.rtl .featured li .icon {
752- padding-right:0px;
753- padding-left:12px;
754-}
755-
756 .l10n-string {
757 display:none;
758 }
759+
760+/* Kubuntu addons
761+ * Aaron Honeycutt <aaronhoneycutt@kubuntu.org>
762+ * ahoneybun on IRC
763+ */
764+
765+.main > ul.center {
766+ list-style-type:none;
767+ font-size:15px;
768+ width:525px;
769+ padding-top:25px;
770+ padding-left:25px;
771+}
772+
773+#center-text {
774+ list-style-type:disc;
775+ font-size:16px;
776+ text-align:left;
777+ padding-top:25px;
778+ padding-left:25px;
779+ width:445px;
780+ overflow:auto;
781+}
782+
783+#full-text {
784+ list-style-type:disc;
785+ font-size:16px;
786+ text-align:left;
787+ padding-top:15px;
788+ padding-left:25px;
789+ width:85%;
790+ overflow:auto;
791+}
792+
793+#left-text {
794+ font-size:16px;
795+ text-align:left;
796+ padding-top:35px;
797+ padding-left:25px;
798+ width:211px;
799+ overflow:auto;
800+}
801+
802+#left-text-alt {
803+ font-size:16px;
804+ text-align:left;
805+ padding-top:35px;
806+ padding-left:13px;
807+ width:380px;
808+ overflow:auto;
809+}
810+
811+#right-text {
812+ font-size:16px;
813+ text-align:right;
814+ padding-top:65px;
815+ padding-left:380px;
816+ width:350px;
817+ overflow:auto;
818+}
819+
820+#screenie {
821+ display:block;
822+}
823+
824+#double-screenie {
825+ display:block;
826+ padding-top:75px;
827+ padding-left:300px;
828+}
829+
830+#icon {
831+ display:block;
832+}
833+
834+.slide#welcome {
835+ background-color:#fcfcfc;
836+}
837+
838+.slide#desktop {
839+ background-color:#eff0f1;
840+}
841+
842+.box#bubble {
843+ width:185px;
844+ height:90px;
845+ border:1px;
846+ margin-left:12px;
847+ margin-top:225px;
848+ padding:5px;
849+ background-color:#4d4d4d;
850+ color:#fcfcfc;
851+}
852+
853+.slide#accessibility {
854+ background-color: #eff0f1;
855+}
856+
857+table {
858+ border-radius: 5px;
859+ padding-top: 45px;
860+ width: 85%;
861+ margin: 0px auto;
862+ float: none;
863+}
864+
865+td {
866+ text-align: center;
867+ padding-bottom: 15px;
868+}
869+/* End of addons by Kubuntu */
870
871=== added directory 'slideshows/kubuntu/slides/screenshots'
872=== removed directory 'slideshows/kubuntu/slides/screenshots'
873=== removed file 'slideshows/kubuntu/slides/screenshots/.directory'
874--- slideshows/kubuntu/slides/screenshots/.directory 2017-05-16 02:03:29 +0000
875+++ slideshows/kubuntu/slides/screenshots/.directory 1970-01-01 00:00:00 +0000
876@@ -1,4 +0,0 @@
877-[Dolphin]
878-PreviewsShown=true
879-Timestamp=2017,5,15,21,2,36
880-Version=3
881
882=== removed file 'slideshows/kubuntu/slides/screenshots/accessibility-background.png'
883Binary files slideshows/kubuntu/slides/screenshots/accessibility-background.png 2017-05-16 02:03:29 +0000 and slideshows/kubuntu/slides/screenshots/accessibility-background.png 1970-01-01 00:00:00 +0000 differ
884=== added file 'slideshows/kubuntu/slides/screenshots/accessibility.png'
885Binary files slideshows/kubuntu/slides/screenshots/accessibility.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/screenshots/accessibility.png 2017-07-27 20:38:11 +0000 differ
886=== removed file 'slideshows/kubuntu/slides/screenshots/create-background.png'
887Binary files slideshows/kubuntu/slides/screenshots/create-background.png 2017-05-24 23:15:14 +0000 and slideshows/kubuntu/slides/screenshots/create-background.png 1970-01-01 00:00:00 +0000 differ
888=== removed file 'slideshows/kubuntu/slides/screenshots/desktop-background.png'
889Binary files slideshows/kubuntu/slides/screenshots/desktop-background.png 2017-05-16 02:03:29 +0000 and slideshows/kubuntu/slides/screenshots/desktop-background.png 1970-01-01 00:00:00 +0000 differ
890=== removed file 'slideshows/kubuntu/slides/screenshots/discover-background.png'
891Binary files slideshows/kubuntu/slides/screenshots/discover-background.png 2017-05-14 21:42:51 +0000 and slideshows/kubuntu/slides/screenshots/discover-background.png 1970-01-01 00:00:00 +0000 differ
892=== removed file 'slideshows/kubuntu/slides/screenshots/gaming-background.png'
893Binary files slideshows/kubuntu/slides/screenshots/gaming-background.png 2017-05-14 20:45:35 +0000 and slideshows/kubuntu/slides/screenshots/gaming-background.png 1970-01-01 00:00:00 +0000 differ
894=== removed file 'slideshows/kubuntu/slides/screenshots/gethelp-background.png'
895Binary files slideshows/kubuntu/slides/screenshots/gethelp-background.png 2017-05-14 21:42:51 +0000 and slideshows/kubuntu/slides/screenshots/gethelp-background.png 1970-01-01 00:00:00 +0000 differ
896=== removed file 'slideshows/kubuntu/slides/screenshots/getinvolved-background.png'
897Binary files slideshows/kubuntu/slides/screenshots/getinvolved-background.png 2017-05-14 21:42:51 +0000 and slideshows/kubuntu/slides/screenshots/getinvolved-background.png 1970-01-01 00:00:00 +0000 differ
898=== removed file 'slideshows/kubuntu/slides/screenshots/internet-background.png'
899Binary files slideshows/kubuntu/slides/screenshots/internet-background.png 2017-05-14 20:45:35 +0000 and slideshows/kubuntu/slides/screenshots/internet-background.png 1970-01-01 00:00:00 +0000 differ
900=== removed file 'slideshows/kubuntu/slides/screenshots/media-background.png'
901Binary files slideshows/kubuntu/slides/screenshots/media-background.png 2017-05-16 02:03:29 +0000 and slideshows/kubuntu/slides/screenshots/media-background.png 1970-01-01 00:00:00 +0000 differ
902=== removed file 'slideshows/kubuntu/slides/screenshots/office-background.png'
903Binary files slideshows/kubuntu/slides/screenshots/office-background.png 2017-05-14 20:45:35 +0000 and slideshows/kubuntu/slides/screenshots/office-background.png 1970-01-01 00:00:00 +0000 differ
904=== removed file 'slideshows/kubuntu/slides/screenshots/pim-background.png'
905Binary files slideshows/kubuntu/slides/screenshots/pim-background.png 2017-05-14 20:45:35 +0000 and slideshows/kubuntu/slides/screenshots/pim-background.png 1970-01-01 00:00:00 +0000 differ
906=== removed file 'slideshows/kubuntu/slides/screenshots/welcome-background.png'
907Binary files slideshows/kubuntu/slides/screenshots/welcome-background.png 2017-05-16 02:03:29 +0000 and slideshows/kubuntu/slides/screenshots/welcome-background.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches