← Back to team overview

ubiquity-slideshow team mailing list archive

[Merge] lp:~xnox/ubiquity-slideshow-ubuntu/new-u1 into lp:ubiquity-slideshow-ubuntu

 

Dmitrijs Ledkovs has proposed merging lp:~xnox/ubiquity-slideshow-ubuntu/new-u1 into lp:ubiquity-slideshow-ubuntu.

Requested reviews:
  Stéphane Graber (stgraber)
  Ubiquity Slideshow (ubiquity-slideshow)

For more details, see:
https://code.launchpad.net/~xnox/ubiquity-slideshow-ubuntu/new-u1/+merge/153904
-- 
https://code.launchpad.net/~xnox/ubiquity-slideshow-ubuntu/new-u1/+merge/153904
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~xnox/ubiquity-slideshow-ubuntu/new-u1 into lp:ubiquity-slideshow-ubuntu.
=== modified file 'debian/changelog'
--- debian/changelog	2013-03-14 19:45:39 +0000
+++ debian/changelog	2013-03-18 18:35:26 +0000
@@ -16,6 +16,10 @@
   * Ubuntu slideshow
     - New copy for Customization, Music and Office slides.
 
+  [ Dmitrijs Ledkovs, Lisette Slegers ]
+  * Ubuntu slideshow
+    - Add updated ubuntu one slide.
+
  -- Dylan McCall <dylanmccall@xxxxxxxxxx>  Thu, 14 Mar 2013 12:44:19 -0700
 
 ubiquity-slideshow-ubuntu (67) raring; urgency=low

=== added file 'slideshows/ubuntu/slides/icons/U_One_logo.png'
Binary files slideshows/ubuntu/slides/icons/U_One_logo.png	1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/U_One_logo.png	2013-03-18 18:35:26 +0000 differ
=== added file 'slideshows/ubuntu/slides/icons/u1-icon-apps.png'
Binary files slideshows/ubuntu/slides/icons/u1-icon-apps.png	1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/u1-icon-apps.png	2013-03-18 18:35:26 +0000 differ
=== added file 'slideshows/ubuntu/slides/icons/u1-icon-music.png'
Binary files slideshows/ubuntu/slides/icons/u1-icon-music.png	1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/u1-icon-music.png	2013-03-18 18:35:26 +0000 differ
=== added file 'slideshows/ubuntu/slides/icons/u1-icon-photos.png'
Binary files slideshows/ubuntu/slides/icons/u1-icon-photos.png	1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/u1-icon-photos.png	2013-03-18 18:35:26 +0000 differ
=== modified file 'slideshows/ubuntu/slides/index.html'
--- slideshows/ubuntu/slides/index.html	2012-07-20 16:58:57 +0000
+++ slideshows/ubuntu/slides/index.html	2013-03-18 18:35:26 +0000
@@ -32,9 +32,9 @@
 	<div id="slideshow">
 		<div><a href="welcome.html"></a></div>
 		<div><a href="usc.html"></a></div>
+		<div><a href="music.html"></a></div>
 		<div><a href="photos.html"></a></div>
-		<div><a href="mobilise.html"></a></div>
-		<div><a href="music.html"></a></div>
+		<div><a href="ubuntuone.html"></a></div>
 		<div><a href="social.html"></a></div>
 		<div><a href="browse.html"></a></div>
 		<div><a href="office.html"></a></div>

=== modified file 'slideshows/ubuntu/slides/link/base.css'
--- slideshows/ubuntu/slides/link/base.css	2012-10-09 17:46:11 +0000
+++ slideshows/ubuntu/slides/link/base.css	2013-03-18 18:35:26 +0000
@@ -56,6 +56,10 @@
 	text-decoration:underline;
 }
 
+strong {
+	font-weight: bolder;
+}
+
 #wrapper {
 	position:absolute;
 	
@@ -130,8 +134,8 @@
 	color:#DED9CB;
 }
 .slidetitle:first-line {
-	font-size:36px; /* TODO: 24px? */
-	line-height:32px;
+	font-size:24px; /* TODO: 24px? */
+	line-height:22px;
 }
 
 .main {

=== modified file 'slideshows/ubuntu/slides/screenshots/ubuntuone.jpg'
Binary files slideshows/ubuntu/slides/screenshots/ubuntuone.jpg	2012-09-22 02:19:14 +0000 and slideshows/ubuntu/slides/screenshots/ubuntuone.jpg	2013-03-18 18:35:26 +0000 differ
=== added file 'slideshows/ubuntu/slides/ubuntuone.html'
--- slideshows/ubuntu/slides/ubuntuone.html	1970-01-01 00:00:00 +0000
+++ slideshows/ubuntu/slides/ubuntuone.html	2013-03-18 18:35:26 +0000
@@ -0,0 +1,36 @@
+<div class="header"><h1 class="slidetitle" style="overflow: auto;">One account to log in to everything on Ubuntu <div style="float: right;"><img src="icons/U_One_logo.png"></div></h1></div>
+
+<div class="main">
+
+<div class="text">
+
+<div>
+<p><strong>Make the most of Ubuntu with Ubuntu One.</strong><br><br>
+ 
+Ubuntu One is the single account to log in to everything on Ubuntu.</p>
+</div>
+
+<div class="featured">
+
+<ul>
+    <li>
+	<img class="icon" src="icons/u1-icon-apps.png">
+	<p class="caption">Get <strong>new apps</strong> from the Software Center</p>
+	</li>
+	<li>
+	<img class="icon" src="icons/u1-icon-music.png">
+	<p class="caption">Listen to <strong>your music collection</strong> and buy tracks</p>
+	</li>
+	<li>
+	<img class="icon" src="icons/u1-icon-photos.png">
+	<p class="caption">Access <strong>files and photos</strong> from all your devices</p>
+	</li>
+</ul>
+</div>
+
+</div>
+
+<img class="screenshot" src="screenshots/ubuntuone.jpg">
+</div></div>
+
+</div>


Follow ups