Merge lp:~gbancroft-canonical/juju-website/homepage-realignment into lp:~jorge/juju-website/juju-website

[Graham Bancroft]

Homepage realignment

=== modified file 'css/home-new.css'
--- css/home-new.css	2013-06-27 15:07:48 +0000
+++ css/home-new.css	2013-07-09 16:00:45 +0000
@@ -36,12 +36,8 @@
 	text-align: right;
 }
 .home-new .header-image img {
-		-moz-box-shadow: 0 9px 4px 4px #e0e0e0;
-		-webkit-box-shadow: 0 9px 4px 4px #e0e0e0;
-	box-shadow: 0 9px 4px 4px #e0e0e0;
-	margin-bottom: -74px;
-    margin-left: -52px;
-    margin-top: 77px;
+	float: right;
+	margin-top: 60px;
 }
 
 /* Play with juju */

=== modified file 'part-header-home-new.php'
--- part-header-home-new.php	2013-06-27 15:07:48 +0000
+++ part-header-home-new.php	2013-07-09 16:00:45 +0000
@@ -1,11 +1,11 @@
 <div class="container-12">
 	<div class="intro grid-5 alpha">
-		<h1>DevOps distilled</h1>
-		<p>With over 100 services ready to deploy, Juju enables you to build entire environments in the cloud with only a few commands on <a href="http://www.ubuntu.com/cloud/public-cloud">public clouds</a> like Amazon Web Services and HP Cloud, to private clouds built on <a href="http://www.ubuntu.com/cloud/private-cloud/openstack">OpenStack</a>, or raw bare metal via <a href="http://www.ubuntu.com/cloud/orchestration/deployment">MAAS</a>.</p>
-		<p>Access our Juju demo to experience how easy it is to manage services in the cloud.</p>
+		<h1>Charm championship takeover</h1>
+		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Duis aute irure dolor in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+		<p>At vero eos et accusamus et iusto odio dignissimos ducimus qui voluptatum deleniti </p>
 	</div>
 	<div class="header-image grid-7 omega">
-		<iframe width="540" height="304" src="http://www.youtube.com/embed/1yoIdgdqzLk" frameborder="0" allowfullscreen></iframe>
+		<img src="http://assets.ubuntu.com/sites/ubuntu/499/u/img/homepage/charm/juju-main.png" alt="" />
 	</div>
-	<p class="grid-12 alpha"><a class="link-cta-ubuntu cta-large" href="/get-started">Experience Juju</a></p>
+	<p class="grid-12 alpha"><a class="link-cta-ubuntu cta-large" href="#">Call to action</a></p>
 </div>
\ No newline at end of file

=== modified file 'template-home-new.php'
--- template-home-new.php	2013-06-27 15:07:48 +0000
+++ template-home-new.php	2013-07-09 16:00:45 +0000
@@ -7,12 +7,17 @@
 
 <?php get_header(); ?>
 
-<div class="row no-padding-bottom">
-	<div class="juju-play inner-wrapper">
-		<img src="<?php echo get_template_directory_uri(); ?>/img/juju-play.png" alt="juju-play" width="473" height="313" />
-		<h2>Play with Juju</h2>
-		<p>Check out the Juju sandbox to see how you can start building your deployments quickly and easily.</p>
-		<p><a href="/get-started">Experience juju &rsaquo;</a></p>
+<div class="row">
+	<div class="inner-wrapper">
+	<div class="intro grid-5 alpha">
+		<h1>DevOps distilled</h1>
+		<p>With over 100 services ready to deploy, Juju enables you to build entire environments in the cloud with only a few commands on <a href="http://www.ubuntu.com/cloud/public-cloud">public clouds</a> like Amazon Web Services and HP Cloud, to private clouds built on <a href="http://www.ubuntu.com/cloud/private-cloud/openstack">OpenStack</a>, or raw bare metal via <a href="http://www.ubuntu.com/cloud/orchestration/deployment">MAAS</a>.</p>
+		<p>Access our Juju demo to experience how easy it is to manage services in the cloud.</p>
+	</div>
+	<div class="header-image grid-7 omega">
+		<iframe width="540" height="304" src="http://www.youtube.com/embed/1yoIdgdqzLk" frameborder="0" allowfullscreen></iframe>
+	</div>
+	<p class="grid-12 alpha"><a class="link-cta-ubuntu cta-large" href="/get-started">Experience Juju</a></p>
 	</div><!-- /.inner-wrapper -->
 </div><!-- /.row -->