Ubiquity Slideshow

Merge lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubuntu-mate-welcome into lp:ubiquity-slideshow-ubuntu

  1. ubuntu-mate-welcome
  2. Merge into html
Proposed by Martin Wimpress on 2015-08-27
Status: Merged
Approved by: Mathieu Trudel-Lapierre on 2015-08-31
Approved revision: 700
Merged at revision: 702
Proposed branch: lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubuntu-mate-welcome
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 42 lines (+8/-8)
1 file modified
slideshows/ubuntu-mate/slides/03_usc.html (+8/-8)
To merge this branch: bzr merge lp:~ubuntu-mate-dev/ubiquity-slideshow-ubuntu/ubuntu-mate-welcome
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre 2015-08-27 Approve on 2015-08-31
Ubuntu Sponsors Team 2015-08-27 Pending
Review via email: mp+269336@code.launchpad.net

Description of the Change

This merge proposal is a UI change to reference Ubuntu MATE Welcome, including a screen shot, and changes the order of Included and Supported software to reflect what Ubuntu MATE ships and supports.

To post a comment you must log in.
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks good; approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'slideshows/ubuntu-mate/slides/03_usc.html'
2--- slideshows/ubuntu-mate/slides/03_usc.html 2015-05-18 09:47:49 +0000
3+++ slideshows/ubuntu-mate/slides/03_usc.html 2015-08-27 11:10:05 +0000
4@@ -4,27 +4,27 @@
5
6 <div class="text">
7 <div>
8- <p>Say goodbye to searching the web for new software. With Ubuntu Software Center, you can find and install new apps with ease. Just type in what you're looking for, or explore categories such as Science, Education and Games, alongside helpful reviews from other users.</p>
9+ <p>Say goodbye to searching the web for new software. With Ubuntu MATE Welcome, you can find and install new apps with ease. If you want to discover more applications then use one of the supported software centres to search for what you're looking for, or explore categories such as Science, Education and Games, alongside helpful reviews from other users.</p>
10 </div>
11
12 <div class="featured">
13 <h2 class="subtitle">Included software</h2>
14 <ul>
15+ <li>
16+ <img class="icon" src="icons/gdebi.png"/>
17+ <p class="caption">GDebi Package Installer</p>
18+ </li>
19+ </ul>
20+ <h2 class="subtitle">Supported software</h2>
21+ <ul>
22 <li>
23 <img class="icon" src="icons/softwarecenter.png"/>
24 <p class="caption">Ubuntu Software Center</p>
25 </li>
26- </ul>
27- <h2 class="subtitle">Supported software</h2>
28- <ul>
29 <li>
30 <img class="icon" src="icons/system-software-install.png"/>
31 <p class="caption">Synaptic Package Manager</p>
32 </li>
33- <li>
34- <img class="icon" src="icons/gdebi.png"/>
35- <p class="caption">gdebi Package Installer</p>
36- </li>
37 </ul>
38 </div>
39
40
41=== modified file 'slideshows/ubuntu-mate/slides/screenshots/03_usc.png'
42Binary files slideshows/ubuntu-mate/slides/screenshots/03_usc.png 2015-04-01 00:01:34 +0000 and slideshows/ubuntu-mate/slides/screenshots/03_usc.png 2015-08-27 11:10:05 +0000 differ

Subscribers

People subscribed via source and target branches