Merge lp:~fossfreedom/ubiquity-slideshow-ubuntu/kinetic into lp:ubiquity-slideshow-ubuntu

Proposed by fossfreedom
Status: Merged
Merged at revision: 930
Proposed branch: lp:~fossfreedom/ubiquity-slideshow-ubuntu/kinetic
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 158 lines (+42/-33)
3 files modified
slideshows/ubuntu-budgie/slides/01_welcome.html (+1/-1)
slideshows/ubuntu-budgie/slides/05_media.html (+17/-10)
slideshows/ubuntu-budgie/slides/link/base.css (+24/-22)
To merge this branch: bzr merge lp:~fossfreedom/ubiquity-slideshow-ubuntu/kinetic
Reviewer Review Type Date Requested Status
Utkarsh Gupta Approve
Ubiquity Slideshow Pending
Review via email: mp+430170@code.launchpad.net

Commit message

Issue LP: #1990060

Tested by building a test slideshow package - installing the built package ubiquity-slideshow-ubuntu-budgie is a kinetic live session and view the slideshow when installing.

Description of the change

Ubuntu Budgie updates for images and icons together with wording changes for the media slide

To post a comment you must log in.
Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

Hey,

Thanks for this. Sponsored the upload:

$ dput ubuntu ../ubiquity-slideshow-ubuntu_185_source.changes
Checking signature on .changes
gpg: ../ubiquity-slideshow-ubuntu_185_source.changes: Valid signature from 823E967606C34B96
Checking signature on .dsc
gpg: ../ubiquity-slideshow-ubuntu_185.dsc: Valid signature from 823E967606C34B96
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ubiquity-slideshow-ubuntu_185.dsc: done.
  Uploading ubiquity-slideshow-ubuntu_185.tar.xz: done.
  Uploading ubiquity-slideshow-ubuntu_185_source.buildinfo: done.
  Uploading ubiquity-slideshow-ubuntu_185_source.changes: done.
Successfully uploaded packages.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'slideshows/ubuntu-budgie/slides/01_welcome.html'
2--- slideshows/ubuntu-budgie/slides/01_welcome.html 2016-11-24 21:09:55 +0000
3+++ slideshows/ubuntu-budgie/slides/01_welcome.html 2022-09-20 17:30:05 +0000
4@@ -12,5 +12,5 @@
5 </div>
6
7 <img class="background" src="screenshots/welcome.png" />
8- <img class="screenshot" src="icons/ubuntu-budgie-logo.svg" />
9+ <img class="screenshot" src="icons/logo.png" />
10 </div>
11
12=== modified file 'slideshows/ubuntu-budgie/slides/05_media.html'
13--- slideshows/ubuntu-budgie/slides/05_media.html 2016-11-24 21:09:55 +0000
14+++ slideshows/ubuntu-budgie/slides/05_media.html 2022-09-20 17:30:05 +0000
15@@ -5,21 +5,28 @@
16 <div class="main">
17 <div class="text">
18 <div>
19- <p><strong>Rhythmbox</strong> lets you organize your music and listen to Internet radio, podcasts, and more.</p>
20+ <p><strong>Lollypop</strong> lets you organize your music.</p>
21 <br />
22- <p><strong>GNOME-MPV</strong> allows you to easily watch videos from your computer or DVD.</p>
23- </div>
24+ <p><strong>Parole</strong> allows you to easily watch videos from your computer or DVD.</p>
25+ <br />
26+ <p>Listen to podcasts through the excellent <strong>gPodder.</strong></p>
27+ <br />
28+ <p>Play internet radio via <strong>Goodvibes.</strong></p>
29+ </div>
30
31 <div class="bigicon">
32 <ul>
33 <li>
34- <img src="icons/rhythmbox.png" />
35- </li>
36- <li>
37- <img src="icons/gnome-videos.png" />
38- </li>
39- <li>
40- <img src="icons/pitivi.png" />
41+ <img src="icons/lollypop.png" />
42+ </li>
43+ <li>
44+ <img src="icons/parole.png" />
45+ </li>
46+ <li>
47+ <img src="icons/gpodder.png" />
48+ </li>
49+ <li>
50+ <img src="icons/goodvibes.png" />
51 </li>
52 </ul>
53 </div>
54
55=== modified file 'slideshows/ubuntu-budgie/slides/icons/chromium.png'
56Binary files slideshows/ubuntu-budgie/slides/icons/chromium.png and slideshows/ubuntu-budgie/slides/icons/chromium.png differ
57=== modified file 'slideshows/ubuntu-budgie/slides/icons/eog.png'
58Binary files slideshows/ubuntu-budgie/slides/icons/eog.png and slideshows/ubuntu-budgie/slides/icons/eog.png differ
59=== modified file 'slideshows/ubuntu-budgie/slides/icons/evince.png'
60Binary files slideshows/ubuntu-budgie/slides/icons/evince.png and slideshows/ubuntu-budgie/slides/icons/evince.png differ
61=== modified file 'slideshows/ubuntu-budgie/slides/icons/firefox.png'
62Binary files slideshows/ubuntu-budgie/slides/icons/firefox.png and slideshows/ubuntu-budgie/slides/icons/firefox.png differ
63=== modified file 'slideshows/ubuntu-budgie/slides/icons/gimp.png'
64Binary files slideshows/ubuntu-budgie/slides/icons/gimp.png and slideshows/ubuntu-budgie/slides/icons/gimp.png differ
65=== modified file 'slideshows/ubuntu-budgie/slides/icons/gnome-documents.png'
66Binary files slideshows/ubuntu-budgie/slides/icons/gnome-documents.png and slideshows/ubuntu-budgie/slides/icons/gnome-documents.png differ
67=== modified file 'slideshows/ubuntu-budgie/slides/icons/gnome-photos.png'
68Binary files slideshows/ubuntu-budgie/slides/icons/gnome-photos.png and slideshows/ubuntu-budgie/slides/icons/gnome-photos.png differ
69=== modified file 'slideshows/ubuntu-budgie/slides/icons/gnome-software.png'
70Binary files slideshows/ubuntu-budgie/slides/icons/gnome-software.png and slideshows/ubuntu-budgie/slides/icons/gnome-software.png differ
71=== modified file 'slideshows/ubuntu-budgie/slides/icons/gnome-videos.png'
72Binary files slideshows/ubuntu-budgie/slides/icons/gnome-videos.png and slideshows/ubuntu-budgie/slides/icons/gnome-videos.png differ
73=== modified file 'slideshows/ubuntu-budgie/slides/icons/libreoffice.png'
74Binary files slideshows/ubuntu-budgie/slides/icons/libreoffice.png and slideshows/ubuntu-budgie/slides/icons/libreoffice.png differ
75=== modified file 'slideshows/ubuntu-budgie/slides/icons/pitivi.png'
76Binary files slideshows/ubuntu-budgie/slides/icons/pitivi.png and slideshows/ubuntu-budgie/slides/icons/pitivi.png differ
77=== modified file 'slideshows/ubuntu-budgie/slides/icons/rhythmbox.png'
78Binary files slideshows/ubuntu-budgie/slides/icons/rhythmbox.png and slideshows/ubuntu-budgie/slides/icons/rhythmbox.png differ
79=== modified file 'slideshows/ubuntu-budgie/slides/icons/system-software-update.png'
80Binary files slideshows/ubuntu-budgie/slides/icons/system-software-update.png and slideshows/ubuntu-budgie/slides/icons/system-software-update.png differ
81=== removed file 'slideshows/ubuntu-budgie/slides/link/arrow-back.png'
82Binary files slideshows/ubuntu-budgie/slides/link/arrow-back.png and slideshows/ubuntu-budgie/slides/link/arrow-back.png differ
83=== modified file 'slideshows/ubuntu-budgie/slides/link/arrow-next.png'
84Binary files slideshows/ubuntu-budgie/slides/link/arrow-next.png and slideshows/ubuntu-budgie/slides/link/arrow-next.png differ
85=== modified file 'slideshows/ubuntu-budgie/slides/link/base.css'
86--- slideshows/ubuntu-budgie/slides/link/base.css 2016-11-24 21:09:55 +0000
87+++ slideshows/ubuntu-budgie/slides/link/base.css 2022-09-20 17:30:05 +0000
88@@ -81,35 +81,37 @@
89 height:100%;
90 }
91
92+/* */
93 .control-arrow {
94- display:block;
95- position:absolute;
96-
97- z-index:100;
98- top:378px;
99- height:64px;
100- width:33px;
101-
102- background-repeat:no-repeat;
103- cursor:pointer;
104+ z-index: 100;
105+ position: absolute;
106+ top: 290px;
107+
108+ width: 55px;
109+ height: 55px;
110+
111+ background: none;
112+ background-position: 0 0;
113 }
114 .control-arrow.disabled {
115 cursor:default;
116 }
117-.control-arrow:hover {
118- background-position: 0px -65px;
119+.control-arrow:hover, .control-arrow:focus {
120+ background-position: 0 -55px;
121 }
122 .control-arrow:active {
123- background-position: 0px -130px;
124-}
125-.control-arrow#prev-slide {
126- background-image:url('arrow-back.png');
127- left:686px;
128-}
129-.control-arrow#next-slide {
130- background-image:url('arrow-next.png');
131- left:719px; /* 752px - 33px */
132-}
133+ /*background-position: 0 -110px;*/
134+}
135+#prev-slide {
136+ left: 0;
137+ background-image: url(arrow-prev.png);
138+}
139+#next-slide {
140+ left: 700px;
141+ background-image: url(arrow-next.png);
142+}
143+
144+/* */
145
146 /* Fixed container for a slide's title */
147 .header {
148
149=== modified file 'slideshows/ubuntu-budgie/slides/screenshots/browse.png'
150Binary files slideshows/ubuntu-budgie/slides/screenshots/browse.png and slideshows/ubuntu-budgie/slides/screenshots/browse.png differ
151=== modified file 'slideshows/ubuntu-budgie/slides/screenshots/desktop.png'
152Binary files slideshows/ubuntu-budgie/slides/screenshots/desktop.png and slideshows/ubuntu-budgie/slides/screenshots/desktop.png differ
153=== modified file 'slideshows/ubuntu-budgie/slides/screenshots/media.png'
154Binary files slideshows/ubuntu-budgie/slides/screenshots/media.png and slideshows/ubuntu-budgie/slides/screenshots/media.png differ
155=== modified file 'slideshows/ubuntu-budgie/slides/screenshots/software.png'
156Binary files slideshows/ubuntu-budgie/slides/screenshots/software.png and slideshows/ubuntu-budgie/slides/screenshots/software.png differ
157=== modified file 'slideshows/ubuntu-budgie/slides/screenshots/welcome.png'
158Binary files slideshows/ubuntu-budgie/slides/screenshots/welcome.png and slideshows/ubuntu-budgie/slides/screenshots/welcome.png differ

Subscribers

People subscribed via source and target branches