Ubiquity Slideshow

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

  1. artful3
  2. Merge into html
Proposed by Aaron Honeycutt
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 Approve
Gerry Boland (community) Approve
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.
Revision history for this message
Gerry Boland (gerboland) wrote :

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

review: Approve
Revision history for this message
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
=== renamed file 'slideshows/kubuntu/slides/01_Welcome.html' => 'slideshows/kubuntu/slides/00_Welcome.html'
--- slideshows/kubuntu/slides/01_Welcome.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/00_Welcome.html 2017-07-27 20:38:11 +0000
@@ -1,7 +1,20 @@
1<div class="header">1<!DOCTYPE html>
2 <h1 class="slidetitle">Welcome to your new Plasma desktop</h1>2<title>Welcome Slide</title>
3</div>3
44<body>
5 <img class="background" src="screenshots/welcome-background.png" />5<div class="slide" id="welcome">
6<div class="main">6 <div class="header">
7</div>7 <h1 class="slidetitle">Welcome to Kubuntu</h1>
8 </div>
9
10 <div id="icon">
11 <img src="icons/kubuntu-logo.svg" alt="kubuntu logo" width="135" height="135" style="padding-top:275px; padding-left:545px;">
12 </div>
13
14 <div class="main" id="center-text">
15 <p>Thanks for picking Kubuntu!</p>
16 <br>
17 <p>Kubuntu combines the best of the KDE Community's software with Ubuntu's base to make a great desktop experience</p>
18 </div>
19</div>
20</body>
821
=== added file 'slideshows/kubuntu/slides/01_Applications.html'
--- slideshows/kubuntu/slides/01_Applications.html 1970-01-01 00:00:00 +0000
+++ slideshows/kubuntu/slides/01_Applications.html 2017-07-27 20:38:11 +0000
@@ -0,0 +1,54 @@
1<!DOCTYPE html>
2<title>Applications Slide</title>
3
4<body>
5<div class="slide" id="apps">
6 <div class="header">
7 <h1 class="slidetitle">Find everything you need on your new install</h1>
8 </div>
9
10 <div class="main">
11 <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>
12 <table>
13 <tr>
14 <td>
15 <div><img src="icons/internet-web-browser.png" width="64px" height="64px"></div>
16 <div class="title">Firefox</div>
17 <div class="description">Web Browser</div>
18 <td>
19 <div><img src="icons/email.png" width="64px" height="64px"></div>
20 <div class="title">Kontact</div>
21 <div class="description">Email, Contacts</div>
22 <td>
23 <div><img src="icons/libreoffice.png" width="64px" height="64px"></div>
24 <div class="title">LibreOffice</div>
25 <div class="description">Office Suite</div>
26 <td>
27 <div><img src="icons/discover.png" width="64px" height="64px"></div>
28 <div class="title">Discover</div>
29 <div class="description">Software Center</div>
30 <td></td>
31 </tr>
32 <tr>
33 <td>
34 <div><img src="icons/amarok.png" width="64px" height="64px"></div>
35 <div class="title">Amarok</div>
36 <div class="description">Music Player</div>
37 <td>
38 <div><img src="icons/dragonplayer.png" width="64px" height="64px"></div>
39 <div class="title">Dragon Player</div>
40 <div class="description">Video Player</div>
41 <td>
42 <div><img src="icons/okular.png"></div>
43 <div class="title">Okular</div>
44 <div class="description">Document Viewer</div>
45 <td>
46 <div><img src="icons/dolphin.png"></div>
47 <div class="title">Dophin</div>
48 <div class="description">File Manager</div>
49 </tr>
50 </table>
51 </div>
52</div>
53</body>
54
055
=== renamed file 'slideshows/kubuntu/slides/09_Accessibility.html' => 'slideshows/kubuntu/slides/02_Accessibility.html'
--- slideshows/kubuntu/slides/09_Accessibility.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/02_Accessibility.html 2017-07-27 20:38:11 +0000
@@ -1,14 +1,27 @@
1<div class="header">1<!DOCTYPE html>
2 <h1 class="slidetitle">Kubuntu: for all users</h1>2<title>Accessibility Slide</title>
3</div>3
44<body>
5 <img class="background" src="screenshots/accessibility-background.png" />5<div class="slide" id="accessibility">
6<div class="main">6 <div class="header">
7 <div class="text">7 <h1 class="slidetitle">Kubuntu: for all users</h1>
8 <div id="left-text">8 </div>
9 <div>9
10 <p>We want Kubuntu to work for everyone.</p>10 <div id="screenie">
11 </div>11 <img src="screenshots/accessibility.png" style="width:600px; height:337px; padding-left:260px; padding-top:85px;">
12 </div> 12 </div>
13 </div>13
14</div>14 <div id="icon">
15 <img src="icons/preferences-desktop-accessibility.png" style="padding-top:300px; padding-left:5px;">
16 </div>
17
18 <div class="main">
19 <div class="text">
20 <div id="left-text">
21 <div><p>We want Kubuntu to work for everyone.</p></div>
22 <br>
23 <div><p>We include a screen reader, modifier keys and more.</p></div>
24 </div>
25 </div>
26</div>
27</body>
1528
=== removed file 'slideshows/kubuntu/slides/02_Desktop.html'
--- slideshows/kubuntu/slides/02_Desktop.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/02_Desktop.html 1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
1<div class="header">
2 <h1 class="slidetitle">Launch into something new</h1>
3</div>
4
5 <img class="background" src="screenshots/desktop-background.png" />
6<div class="main">
7 <div class="text">
8 <div id="right-text">
9 <div>
10 <p><strong>KRunner</strong>, a launcher plus! launch applications, switch tasks, do quick calculations and so much more.
11 Pop it up with:</p>
12 ALT + Space bar<br/>
13 ALT + F1
14 <br/>
15 <br/><p><strong>Kickoff</strong> is your default launcher to open applications, documents and folders. Right-click on the icon to try alternates.</p>
16 </div>
17 </div>
18 </div>
19</div>
200
=== renamed file 'slideshows/kubuntu/slides/11_Get-Help.html' => 'slideshows/kubuntu/slides/03_Get-Help.html'
--- slideshows/kubuntu/slides/11_Get-Help.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/03_Get-Help.html 2017-07-27 20:38:11 +0000
@@ -1,23 +1,30 @@
1<div class="header">1<!DOCTYPE html>
2 <h1 class="slidetitle">Getting help with Kubuntu</h1>2<title>Get Help Slide</title>
3</div>3
44<body>
5 <img class="background" src="screenshots/gethelp-background.png" />5<div class="slide" id="get-help">
6<div class="main">6 <div class="header">
7 <div class="text">7 <h1 class="slidetitle">Getting help with Kubuntu</h1>
8 <ul class="center">8 </div>
9 <div>9
10 <li>If you need help, try Help from the menu, or the10 <div id="icon">
11 <img src="icons/system-help.png" style="padding-top:300px ; padding-left:565px;">
12 </div>
13
14 <div class="main">
15 <ul class="center">
16 <div>
17 <li>If you need help, try Help from the menu, or the
11 Help menu in most applications.18 Help menu in most applications.
12 Let us know about your Kubuntu experience at <a href="http://www.kubuntu.org/community">Kubuntu Community*</a>!</li>19 Let us know about your Kubuntu experience at <a href="http://www.kubuntu.org/community">Kubuntu Community*</a>!</li>
13 <br/>20 <br/>
14 <li>In addition to our extensive written help, the Kubuntu21 <li>In addition to our extensive written help, the Kubuntu
15 community in conjunction with the Ubuntu community, provides free22 community in conjunction with the Ubuntu community, provides free
16 technical support in person and over the Internet. Learn more at <a href="http://www.kubuntu.org/support">Kubuntu Support**.</a></li>23 technical support in person and over the Internet. Learn more at <a href="http://www.kubuntu.org/support">Kubuntu Support**.</a></li>
17 <br/>24 <br/>
18 * http://www.kubuntu.org/community<br/>25 * http://www.kubuntu.org/community<br/>
19 ** http://www.kubuntu.org/support26 ** http://www.kubuntu.org/support
20 </div>27 </ul>
21 </ul>28 </div>
22 </div>
23</div>29</div>
30</body>
2431
=== removed file 'slideshows/kubuntu/slides/03_Internet.html'
--- slideshows/kubuntu/slides/03_Internet.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/03_Internet.html 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
1<div class="header">
2 <h1 class="slidetitle">Explore the whole web</h1>
3</div>
4
5 <img class="background" src="screenshots/internet-background.png" />
6<div class="main">
7 <div class="text">
8 <div id="left-text">
9 <div>
10 <p><strong>Firefox</strong> gives you the power to go anywhere on the web and use all your favorite web services.</p>
11 </div>
12 </div>
13 </div>
14</div>
150
=== removed file 'slideshows/kubuntu/slides/04_Create.html'
--- slideshows/kubuntu/slides/04_Create.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/04_Create.html 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1<div class="header">
2 <h1 class="slidetitle">Be creative with Kubuntu</h1>
3</div>
4
5 <img class="background" src="screenshots/create-background.png" />
6<div class="main">
7 <div class="text">
8 <div id="left-text">
9 <div>
10 <p><strong>Kdenlive</strong> is a powerful<br/> non-linear video editor.</p>
11 <br>
12 <p><strong>Krita</strong> is a professional free and open source painting program.</p>
130
=== renamed file 'slideshows/kubuntu/slides/12_Get-Involved.html' => 'slideshows/kubuntu/slides/04_Get-Involved.html'
--- slideshows/kubuntu/slides/12_Get-Involved.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/04_Get-Involved.html 2017-07-27 20:38:11 +0000
@@ -1,31 +1,45 @@
1<div class="header">1<!DOCTYPE html>
2 <h1 class="slidetitle">Getting involved with Kubuntu</h1>2<title>Get Involved Slide</title>
3</div>3
44<body>
5 <img class="background" src="screenshots/getinvolved-background.png" />5<div class="slide" id="get-involved">
6<div class="main">6 <div class="header">
7 <div class="text">7 <h1 class="slidetitle">Getting involved with Kubuntu</h1>
8 <ul class="center">8 </div>
9 <div>9
10 <li>The Kubuntu community consists of a group of individuals, who10 <div id="icon">
11 make up one of the greatest teams in the open source community,11 <img src="icons/system-users.png" alt="breeze users icon" style="padding-top:300px; padding-left:565px;"/>
12 work on various aspects of the distribution, providing advice and12 </div>
13 technical support, as well as helping to promote Kubuntu to a wider13
14 audience.</li>14 <div class="main">
15 <br/>15 <ul class="center">
16 <li>No matter your skill level, getting involved and helping to16 <li>
17 mold the future of Kubuntu is easy, and you are more than welcome17 The Kubuntu community consists of a group of individuals, who
18 to help out.</li>18 made up one of the greatest teams in the open source community,
19 <br/>19 working on various aspects of the distribution, providing advice and
20 <li>Look over <a href="http://docs.kubuntu.org/docs/contribute.html">Kubuntu Manual*</a>20 technical support, as well as helping to promote Kubuntu to a wider
21 and see where you might be able to help out. Remember, it is easy21 audience.
22 to get involved and the work you do will be seen by millions of22 </li>
23 people around the world.</li>23 <br>
24 <br/>24 <li>
25 <li>The installation will finish soon. We hope you enjoy Kubuntu!</li>25 No matter your skill level, getting involved and helping to
26 <br/>26 mold the future of Kubuntu is easy, and you are more than welcome
27 * http://docs.kubuntu.org/docs/contribute.html27 to help out.
28 </div>28 </li>
29 </ul>29 <br>
30 </div>30 <li>
31</div>31 Look over <a href="http://docs.kubuntu.org/docs/contribute.html">Kubuntu Manual*</a>
32 and see where you might be able to help out. Remember, it is easy
33 to get involved and the work you do will be seen by millions of
34 people around the world.
35 </li>
36 <br>
37 <li>
38 The installation will finish soon. We hope you enjoy Kubuntu!
39 </li>
40 <br>
41 * http://docs.kubuntu.org/docs/contribute.html
42 </ul>
43 </div>
44</div>
45</body>
3246
=== removed file 'slideshows/kubuntu/slides/05_Multimedia.html'
--- slideshows/kubuntu/slides/05_Multimedia.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/05_Multimedia.html 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
1<div class="header">
2 <h1 class="slidetitle">Enjoy your music and videos</h1>
3</div>
4
5 <img class="background" src="screenshots/media-background.png" />
6<div class="main">
7 <div class="text">
8 <div id="left-text">
9 <div>
10 <p><strong>Dragon Player</strong> handles your videos.</p>
11 <br/>
12 <p><strong>Amarok</strong> let's you explore your music.</p>
13 </div>
14 </div>
15 </div>
16</div>
170
=== removed file 'slideshows/kubuntu/slides/06_PIM.html'
--- slideshows/kubuntu/slides/06_PIM.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/06_PIM.html 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
1<div class="header">
2 <h1 class="slidetitle">Meet your own assistant</h1>
3</div>
4
5 <img class="background" src="screenshots/pim-background.png" />
6<div class="main">
7 <div class="text">
8 <div id="left-text-alt">
9 <div>
10 <p><strong>Kontact</strong> is your personal assistant. Handles your email, calendar, to-do list, feeds and more.</p>
11 </div>
12 </div>
13 </div>
14</div>
150
=== removed file 'slideshows/kubuntu/slides/07_Office.html'
--- slideshows/kubuntu/slides/07_Office.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/07_Office.html 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
1<div class="header">
2 <h1 class="slidetitle">Take your office with you</h1>
3</div>
4
5 <img class="background" src="screenshots/office-background.png" />
6<div class="main">
7 <div class="text">
8 <div id="left-text">
9 <div>
10 <p><strong>LibreOffice</strong> can handle all your office file, from Word documents to Powerpoint slides.</p>
11 <br/>
12 <p><strong>Okular</strong> can read and edit PDF and ePub files.</p>
13 </div>
14 </div>
15 </div>
16</div>
170
=== removed file 'slideshows/kubuntu/slides/08_Games.html'
--- slideshows/kubuntu/slides/08_Games.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/08_Games.html 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
1<div class="header">
2 <h1 class="slidetitle">Plenty of games to enjoy</h1>
3</div>
4
5 <img class="background" src="screenshots/gaming-background.png" />
6<div class="main">
7 <div class="text">
8 <div id="left-text">
9 <div>
10 <p><strong>Steam</strong> offers hundreds of<br/> games ranging from first-person shooters, puzzles, strategy and more.</p>
11 </div>
12 </div>
13 </div>
14</div>
150
=== removed file 'slideshows/kubuntu/slides/10_Discover.html'
--- slideshows/kubuntu/slides/10_Discover.html 2017-05-25 18:10:27 +0000
+++ slideshows/kubuntu/slides/10_Discover.html 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
1<div class="header">
2 <h1 class="slidetitle">Discover new software</h1>
3</div>
4
5 <img class="background" src="screenshots/discover-background.png" />
6<div class="main">
7 <div class="text">
8 <div id="left-text">
9 <div>
10 <p><strong>Discover</strong> allows you to install and remove software from our repositories, carefully organized to be safe and up-to-date..</p>
11 <br/>
12 <p>Explore great software for everything from creating music and movies to producing 3D models and exploring the universe.</p>
13 </div>
14 </div>
15 </div>
16</div>
170
=== added file 'slideshows/kubuntu/slides/icons/.directory'
--- slideshows/kubuntu/slides/icons/.directory 1970-01-01 00:00:00 +0000
+++ slideshows/kubuntu/slides/icons/.directory 2017-07-27 20:38:11 +0000
@@ -0,0 +1,4 @@
1[Dolphin]
2PreviewsShown=true
3Timestamp=2017,7,27,14,29,45
4Version=3
05
=== added file 'slideshows/kubuntu/slides/icons/add.png'
1Binary 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 differ6Binary 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
=== added file 'slideshows/kubuntu/slides/icons/amarok.png'
2Binary 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 differ7Binary 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
=== renamed file 'slideshows/kubuntu/slides/icons/muondiscover.png' => 'slideshows/kubuntu/slides/icons/discover.png'
=== added file 'slideshows/kubuntu/slides/icons/dolphin.png'
3Binary 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 differ8Binary 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
=== added file 'slideshows/kubuntu/slides/icons/dragonplayer.png'
4Binary 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 differ9Binary 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
=== added file 'slideshows/kubuntu/slides/icons/internet-web-browser.png'
5Binary 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 differ10Binary 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
=== added file 'slideshows/kubuntu/slides/icons/libreoffice.png'
6Binary 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 differ11Binary 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
=== added file 'slideshows/kubuntu/slides/icons/okular.png'
7Binary 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 differ12Binary 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
=== added file 'slideshows/kubuntu/slides/icons/ubuntu_logo.png'
8Binary 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 differ13Binary 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
=== modified file 'slideshows/kubuntu/slides/index.html'
--- slideshows/kubuntu/slides/index.html 2017-05-24 23:15:14 +0000
+++ slideshows/kubuntu/slides/index.html 2017-07-27 20:38:11 +0000
@@ -3,7 +3,7 @@
3<html lang="en">3<html lang="en">
44
5<head>5<head>
6 <title>ubiquity-slideshow-ubuntu</title>6 <title>ubiquity-slideshow-kubuntu</title>
7 7
8 <link href="link/base.css" rel="stylesheet" type="text/css" />8 <link href="link/base.css" rel="stylesheet" type="text/css" />
9 9
@@ -34,25 +34,17 @@
34<body>34<body>
3535
36<div id="slideshow">36<div id="slideshow">
37 <div><a href="01_Welcome.html" class="load"></a></div>37 <div><a href="00_Welcome.html" class="load"></a></div>
38 <div><a href="02_Desktop.html" class="load"></a></div>38 <div><a href="01_Applications.html" class="load"></a></div>
39 <div><a href="03_Internet.html" class="load"></a></div>39 <div><a href="02_Accessibility.html" class="load"></a></div>
40 <div><a href="04_Create.html" class="load"></a></div>40 <div><a href="03_Get-Help.html" class="load"></a></div>
41 <div><a href="05_Multimedia.html" class="load"></a></div>41 <div><a href="04_Get-Involved.html" class="load"></a></div>
42 <div><a href="06_PIM.html" class="load"></a></div>42</div>
43 <div><a href="07_Office.html" class="load"></a></div>43
44 <div><a href="08_Games.html" class="load"></a></div>44<div id="controls">
45 <div><a href="09_Accessibility.html" class="load"></a></div>45 <a class="control-arrow" id="prev-slide" style="display:none;"></a>
46 <div><a href="10_Discover.html" class="load"></a></div>46 <a class="control-arrow" id="next-slide"></a>
47 <div><a href="11_Get-Help.html" class="load"></a></div>47 <input type="hidden" id="current-slide" />
48 <div><a href="12_Get-Involved.html" class="load"></a></div>
49
50</div>
51
52<div id="debug-controls">
53<input type="button" id="prev-slide" value="&lt;"/>
54<input type="button" id="next-slide" value="&gt;"/>
55</div>
5648
57</body>49</body>
5850
5951
=== modified file 'slideshows/kubuntu/slides/link/base.css'
--- slideshows/kubuntu/slides/link/base.css 2017-05-16 02:03:29 +0000
+++ slideshows/kubuntu/slides/link/base.css 2017-07-27 20:38:11 +0000
@@ -6,7 +6,7 @@
6b, u, i, center,6b, u, i, center,
7dl, dt, dd, ol, ul, li,7dl, dt, dd, ol, ul, li,
8fieldset, form, label, legend,8fieldset, form, label, legend,
9table, caption, tbody, tfoot, thead, tr, th, td {9caption, tbody, tfoot, thead {
10 margin:0;10 margin:0;
11 padding:0;11 padding:0;
12 border:0;12 border:0;
@@ -26,7 +26,7 @@
26 margin:0;26 margin:0;
27 padding:0;27 padding:0;
2828
29 background-color:#F7F6F6;29 background-color:#fcfcfc;
3030
31 font-family: 'Droid Sans', 'Cantarell', 'Ubuntu', 'UbuntuBeta', sans-serif;31 font-family: 'Droid Sans', 'Cantarell', 'Ubuntu', 'UbuntuBeta', sans-serif;
32 font-size:13px;32 font-size:13px;
@@ -104,7 +104,7 @@
104}104}
105.control-arrow#prev-slide {105.control-arrow#prev-slide {
106 background-image:url('arrow-back.png');106 background-image:url('arrow-back.png');
107 left:686px;107 left:20px;
108}108}
109.control-arrow#next-slide {109.control-arrow#next-slide {
110 background-image:url('arrow-next.png');110 background-image:url('arrow-next.png');
@@ -134,7 +134,7 @@
134 font-size:20px;134 font-size:20px;
135 line-height:50px;135 line-height:50px;
136 font-weight:bold;136 font-weight:bold;
137 color:#F7F6F6;137 color:#fcfcfc;
138}138}
139.header > .slidetitle img {139.header > .slidetitle img {
140 display: block;140 display: block;
@@ -151,21 +151,6 @@
151 /*background-image:url('background.png');*/151 /*background-image:url('background.png');*/
152}152}
153153
154.main.big {
155 top:68px;
156 left:0px;
157 right:0px;
158 bottom:0px;
159}
160
161.main.wide{
162 top:68px;
163 left:0px;
164 right:0px;
165 bottom:0px;
166 /*background-image:url('background.jpg');*/
167}
168
169/*154/*
170A slide's body text goes inside here.155A slide's body text goes inside here.
171Inner space is 224px wide.156Inner space is 224px wide.
@@ -182,157 +167,6 @@
182 overflow:auto;167 overflow:auto;
183}168}
184169
185.text > div {
186 margin-bottom:8px;
187 padding:6px 12px;
188}
189.text > div:last-child {
190 margin-bottom:0px;
191}
192
193.text > div > .subtitle {
194 padding-bottom:2px;
195 margin-bottom:5px;
196 font-size:inherit;
197 font-weight:normal;
198 text-decoration:none;
199 border-bottom:#F7F6F6 dotted 1px;
200}
201
202.main.big > .text {
203 top:55px;
204 width:320px;
205}
206
207.main.big > .text > div {
208 background:none;
209 font-size:13px;
210 line-height:1.2em;
211 color:#F7F6F6;
212 /*text-shadow:1px 1px 1px #333333;*/
213}
214
215.main.wide > .text {
216 position:absolute;
217 z-index:10;
218 top:235px;
219 left:36px;
220 width:680px;
221 overflow:auto;
222}
223
224.main.wide > .text > div {
225 background:none;
226 font-size:inherit;
227 line-height:1.2em;
228 margin-bottom:8px;
229 padding:6px 12px;
230 background-color:#FCFCFC;
231}
232
233/* Kubuntu addons
234 * Aaron Honeycutt <aaronhoneycutt@kubuntu.org>
235 * ahoneybun on IRC
236 */
237
238.main > .text > ul.center {
239 list-style-type:disc;
240 font-size:15px;
241 width:525px;
242 margin-left:15px;
243 padding-top:25px;
244 padding-left:15px;
245}
246
247#left-text {
248 font-size:16px;
249 text-align:left;
250 padding-top:35px;
251 padding-left:13px;
252 width:209px;
253 overflow:auto;
254}
255
256#left-text-alt {
257 font-size:16px;
258 text-align:left;
259 padding-top:35px;
260 padding-left:13px;
261 width:250px;
262 overflow:auto;
263}
264
265#right-text {
266 font-size:16px;
267 text-align:right;
268 padding-top:65px;
269 padding-left:250px;
270 width:350px;
271 overflow:auto;
272}
273
274/* End of addons by Kubuntu */
275
276.featured ul {
277 display:table;
278}
279.featured li {
280 display:table-row;
281}
282.featured li > * {
283 padding-bottom:12px;
284}
285.featured li .icon {
286 display:table-cell;
287 width:24px;
288 height:auto;
289 padding-right:12px;
290}
291.featured li .caption {
292 display:table-cell;
293 vertical-align:middle;
294}
295
296.bigicon{
297 position: absolute;
298 bottom:0px;
299}
300
301.bigicon ul{
302 width:100%;
303}
304.bigicon li{
305 margin-right:20px;
306 float:left;
307}
308
309/* Expects screenshot to be 448x347 px */
310.main > .screenshot {
311 position:absolute;
312 top:25px;
313 right:-2px; /* offsets 2px margin of .main */
314
315 z-index:2;
316
317 /* Screenshot shadow, not in use but might be useful in future releases*/
318 /* -webkit-box-shadow:#999999 0px 0px 5px;
319 -moz-box-shadow:#999999 0px 0px 5px;
320 box-shadow:#999999 0px 0px 5px; */
321}
322
323/* Expects screenshot to be 748x370 px */
324.main.wide > .background {
325 top:0px;
326 right:0px;
327 width:100%;
328 height:auto;
329 -webkit-box-shadow:none;
330 -moz-box-shadow:none;
331 box-shadow:none;
332
333 z-index:0;
334}
335
336/*170/*
337This rule disables drag-and-drop for images. See bug #448703.171This rule disables drag-and-drop for images. See bug #448703.
338*/172*/
@@ -340,8 +174,6 @@
340 -webkit-user-drag:none;174 -webkit-user-drag:none;
341}175}
342176
343
344
345/* RTL stuff */177/* RTL stuff */
346.rtl {178.rtl {
347 direction:rtl;179 direction:rtl;
@@ -356,21 +188,117 @@
356 left:686px; /* 752px - 33px */188 left:686px; /* 752px - 33px */
357}189}
358190
359.rtl .main > .text {
360 left:auto;
361 right:36px;
362}
363
364.rtl .main > .screenshot {
365 right:auto;
366 left:-2px;
367}
368
369.rtl .featured li .icon {
370 padding-right:0px;
371 padding-left:12px;
372}
373
374.l10n-string {191.l10n-string {
375 display:none;192 display:none;
376}193}
194
195/* Kubuntu addons
196 * Aaron Honeycutt <aaronhoneycutt@kubuntu.org>
197 * ahoneybun on IRC
198 */
199
200.main > ul.center {
201 list-style-type:none;
202 font-size:15px;
203 width:525px;
204 padding-top:25px;
205 padding-left:25px;
206}
207
208#center-text {
209 list-style-type:disc;
210 font-size:16px;
211 text-align:left;
212 padding-top:25px;
213 padding-left:25px;
214 width:445px;
215 overflow:auto;
216}
217
218#full-text {
219 list-style-type:disc;
220 font-size:16px;
221 text-align:left;
222 padding-top:15px;
223 padding-left:25px;
224 width:85%;
225 overflow:auto;
226}
227
228#left-text {
229 font-size:16px;
230 text-align:left;
231 padding-top:35px;
232 padding-left:25px;
233 width:211px;
234 overflow:auto;
235}
236
237#left-text-alt {
238 font-size:16px;
239 text-align:left;
240 padding-top:35px;
241 padding-left:13px;
242 width:380px;
243 overflow:auto;
244}
245
246#right-text {
247 font-size:16px;
248 text-align:right;
249 padding-top:65px;
250 padding-left:380px;
251 width:350px;
252 overflow:auto;
253}
254
255#screenie {
256 display:block;
257}
258
259#double-screenie {
260 display:block;
261 padding-top:75px;
262 padding-left:300px;
263}
264
265#icon {
266 display:block;
267}
268
269.slide#welcome {
270 background-color:#fcfcfc;
271}
272
273.slide#desktop {
274 background-color:#eff0f1;
275}
276
277.box#bubble {
278 width:185px;
279 height:90px;
280 border:1px;
281 margin-left:12px;
282 margin-top:225px;
283 padding:5px;
284 background-color:#4d4d4d;
285 color:#fcfcfc;
286}
287
288.slide#accessibility {
289 background-color: #eff0f1;
290}
291
292table {
293 border-radius: 5px;
294 padding-top: 45px;
295 width: 85%;
296 margin: 0px auto;
297 float: none;
298}
299
300td {
301 text-align: center;
302 padding-bottom: 15px;
303}
304/* End of addons by Kubuntu */
377305
=== added directory 'slideshows/kubuntu/slides/screenshots'
=== removed directory 'slideshows/kubuntu/slides/screenshots'
=== removed file 'slideshows/kubuntu/slides/screenshots/.directory'
--- slideshows/kubuntu/slides/screenshots/.directory 2017-05-16 02:03:29 +0000
+++ slideshows/kubuntu/slides/screenshots/.directory 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1[Dolphin]
2PreviewsShown=true
3Timestamp=2017,5,15,21,2,36
4Version=3
50
=== removed file 'slideshows/kubuntu/slides/screenshots/accessibility-background.png'
6Binary 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 differ1Binary 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
=== added file 'slideshows/kubuntu/slides/screenshots/accessibility.png'
7Binary 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 differ2Binary 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
=== removed file 'slideshows/kubuntu/slides/screenshots/create-background.png'
8Binary 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 differ3Binary 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
=== removed file 'slideshows/kubuntu/slides/screenshots/desktop-background.png'
9Binary 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 differ4Binary 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
=== removed file 'slideshows/kubuntu/slides/screenshots/discover-background.png'
10Binary 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 differ5Binary 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
=== removed file 'slideshows/kubuntu/slides/screenshots/gaming-background.png'
11Binary 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 differ6Binary 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
=== removed file 'slideshows/kubuntu/slides/screenshots/gethelp-background.png'
12Binary 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 differ7Binary 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
=== removed file 'slideshows/kubuntu/slides/screenshots/getinvolved-background.png'
13Binary 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 differ8Binary 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
=== removed file 'slideshows/kubuntu/slides/screenshots/internet-background.png'
14Binary 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 differ9Binary 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
=== removed file 'slideshows/kubuntu/slides/screenshots/media-background.png'
15Binary 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 differ10Binary 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
=== removed file 'slideshows/kubuntu/slides/screenshots/office-background.png'
16Binary 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 differ11Binary 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
=== removed file 'slideshows/kubuntu/slides/screenshots/pim-background.png'
17Binary 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 differ12Binary 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
=== removed file 'slideshows/kubuntu/slides/screenshots/welcome-background.png'
18Binary 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 differ13Binary 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