Merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/kubuntu-artful into lp:ubiquity-slideshow-ubuntu

Proposed by Aaron Honeycutt on 2017-09-03
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2017-09-20
Approved revision: 789
Merged at revision: 795
Proposed branch: lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/kubuntu-artful
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 130 lines (+10/-31)
5 files modified
slideshows/kubuntu/slides/01_Applications.html (+3/-8)
slideshows/kubuntu/slides/02_Accessibility.html (+1/-5)
slideshows/kubuntu/slides/03_Get-Help.html (+1/-1)
slideshows/kubuntu/slides/04_Get-Involved.html (+1/-1)
slideshows/kubuntu/slides/link/base.css (+4/-16)
To merge this branch: bzr merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/kubuntu-artful
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2017-09-03 Approve on 2017-09-20
Review via email: mp+330128@code.launchpad.net
To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks good; merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'slideshows/kubuntu/slides/01_Applications.html'
2--- slideshows/kubuntu/slides/01_Applications.html 2017-08-17 13:13:00 +0000
3+++ slideshows/kubuntu/slides/01_Applications.html 2017-09-03 21:36:39 +0000
4@@ -31,14 +31,9 @@
5 </tr>
6 <tr>
7 <td>
8- <div><img src="icons/amarok.png" width="64px" height="64px"/></div>
9- <div class="title">Amarok</div>
10- <div class="description">Music Player</div>
11- </td>
12- <td>
13- <div><img src="icons/dragonplayer.png" width="64px" height="64px"/></div>
14- <div class="title">Dragon Player</div>
15- <div class="description">Video Player</div>
16+ <div><img src="icons/vlc.png" width="64px" height="64px"/></div>
17+ <div class="title">VLC</div>
18+ <div class="description">Music/Video Player</div>
19 </td>
20 <td>
21 <div><img src="icons/okular.png"/></div>
22
23=== modified file 'slideshows/kubuntu/slides/02_Accessibility.html'
24--- slideshows/kubuntu/slides/02_Accessibility.html 2017-08-17 13:13:00 +0000
25+++ slideshows/kubuntu/slides/02_Accessibility.html 2017-09-03 21:36:39 +0000
26@@ -1,16 +1,12 @@
27 <div class="slide" id="accessibility">
28 <div class="header">
29- <h1 class="slidetitle">Kubuntu: for all users</h1>
30+ <h1 class="slidetitle">Kubuntu: for all users</h1>
31 </div>
32
33 <div id="screenie">
34 <img src="screenshots/accessibility.png" style="width:600px; height:337px; padding-left:260px; padding-top:85px;" />
35 </div>
36
37- <div id="icon">
38- <img src="icons/preferences-desktop-accessibility.png" /> <!--style="padding-top:300px; padding-left:5px;" />-->
39- </div>
40-
41 <div class="main" id="left-text">
42 <p>We want Kubuntu to work for everyone.</p>
43 <p>We include a screen reader, modifier keys and more.</p>
44
45=== modified file 'slideshows/kubuntu/slides/03_Get-Help.html'
46--- slideshows/kubuntu/slides/03_Get-Help.html 2017-08-17 13:13:00 +0000
47+++ slideshows/kubuntu/slides/03_Get-Help.html 2017-09-03 21:36:39 +0000
48@@ -16,7 +16,7 @@
49 technical support in person and over the Internet. Learn more at <a href="http://www.kubuntu.org/support">Kubuntu Support</a>.
50 <ul>
51 <li>Kubuntu Community: <a href="http://www.kubuntu.org/community">http://www.kubuntu.org/community</a></li>
52- <li>Kubuntu Support:<a href="http://www.kubuntu.org/support">http://www.kubuntu.org/support</a></li>
53+ <li>Kubuntu Support: <a href="http://www.kubuntu.org/support">http://www.kubuntu.org/support</a></li>
54 </ul>
55 </p>
56 </div>
57
58=== modified file 'slideshows/kubuntu/slides/04_Get-Involved.html'
59--- slideshows/kubuntu/slides/04_Get-Involved.html 2017-08-17 13:13:00 +0000
60+++ slideshows/kubuntu/slides/04_Get-Involved.html 2017-09-03 21:36:39 +0000
61@@ -30,7 +30,7 @@
62 The installation will finish soon. We hope you enjoy Kubuntu!
63 </p>
64 <ul>
65- <li>Kubuntu Manual: <a href="http://docs.kubuntu.org/docs/contribute.html">http://docs.kubuntu.org/docs/contribute.html</a></li>
66+ <li>Kubuntu Manual: <a href="http://docs.kubuntu.org/1704/docs/contribute.html">http://docs.kubuntu.org/1704/docs/contribute.html</a></li>
67 </ul>
68 </div>
69 </div>
70
71=== added file 'slideshows/kubuntu/slides/icons/vlc.png'
72Binary files slideshows/kubuntu/slides/icons/vlc.png 1970-01-01 00:00:00 +0000 and slideshows/kubuntu/slides/icons/vlc.png 2017-09-03 21:36:39 +0000 differ
73=== modified file 'slideshows/kubuntu/slides/link/base.css'
74--- slideshows/kubuntu/slides/link/base.css 2017-08-17 13:13:00 +0000
75+++ slideshows/kubuntu/slides/link/base.css 2017-09-03 21:36:39 +0000
76@@ -30,7 +30,7 @@
77 margin:0;
78 padding:0;
79
80- background-color:#fcfcfc;
81+ background-color:#eff0f1;
82
83 font-family: 'Droid Sans', 'Cantarell', 'Ubuntu', 'UbuntuBeta', sans-serif;
84 font-size:13px;
85@@ -65,8 +65,8 @@
86
87 #icon {
88 position: absolute;
89- bottom: 15px;
90- right: 45px;
91+ bottom: -15px;
92+ right: 55px;
93 width: 135px;
94 height: 135px;
95 }
96@@ -223,7 +223,7 @@
97 text-align:left;
98 /* padding-top:25px; */
99 padding-left:25px;
100- width:445px;
101+ width:455px;
102 overflow:auto;
103 }
104
105@@ -278,14 +278,6 @@
106 display:block;
107 }
108
109-.slide#welcome {
110- background-color:#fcfcfc;
111-}
112-
113-.slide#desktop {
114- background-color:#eff0f1;
115-}
116-
117 .box#bubble {
118 width:185px;
119 height:90px;
120@@ -297,10 +289,6 @@
121 color:#fcfcfc;
122 }
123
124-.slide#accessibility {
125- background-color: #eff0f1;
126-}
127-
128 table {
129 border-radius: 5px;
130 /*padding-top: 45px;*/

Subscribers

People subscribed via source and target branches