← Back to team overview

ubuntu-packaging-guide-team team mailing list archive

[Merge] lp:~fougner/ubuntu-packaging-guide/fix-bug-859656 into lp:ubuntu-packaging-guide

 

Alexander Fougner has proposed merging lp:~fougner/ubuntu-packaging-guide/fix-bug-859656 into lp:ubuntu-packaging-guide.

Requested reviews:
  Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)

For more details, see:
https://code.launchpad.net/~fougner/ubuntu-packaging-guide/fix-bug-859656/+merge/90420
-- 
https://code.launchpad.net/~fougner/ubuntu-packaging-guide/fix-bug-859656/+merge/90420
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~fougner/ubuntu-packaging-guide/fix-bug-859656 into lp:ubuntu-packaging-guide.
=== modified file 'themes/ubuntu/layout.html'
--- themes/ubuntu/layout.html	2011-10-20 04:30:22 +0000
+++ themes/ubuntu/layout.html	2012-01-27 12:27:28 +0000
@@ -20,24 +20,31 @@
         
 
 {%- macro relbar() %}
-  <aside id="page-related">
-    <div class="container" id="sub-nav-container" > 
-       <nav id="sub-nav"> 
+<div class="header-content">
+    <div class="clearfix">
+      <!--<img class="arrow-nav" src="http://developer.ubuntu.com/wp-content/themes/wordpress-theme-ubuntudeveloper/img/arrow-nav.png"; width="9" height="5" alt="" />-->
+  <div class="header-navigation-secondary">
+    <div>
+          <nav role="navigation">
+            <ul class="clearfix">
         {%- for rellink in rellinks %}
-	        <a class="sub-nav-item" {% if loop.first %}style="margin-right: 10px"{% endif %} 
+	        <li class="page_item"><a {% if loop.first %}style="margin-right: 10px"{% endif %} 
 	        href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
-	        {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
+	        {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a></li>
         {%- endfor %}
         {%- block rootrellink %}
-        <a class="sub-nav-item" href="{{ pathto(master_doc) }}">{{ shorttitle|e }} {{ reldelim1 }}</a>
+        <li class="page_item"><a class="sub-nav-item" href="{{ pathto(master_doc) }}">{{ shorttitle|e }} {{ reldelim1 }}</a></li>
         {%- endblock %}
         {%- for parent in parents %}
-          <a class="sub-nav-item" href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }} {{ reldelim1 }}</a>
+          <li class="page_item"><a class="sub-nav-item" href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }} {{ reldelim1 }}</a></li>
         {%- endfor %}
         {%- block relbaritems %} {% endblock %}
-      </nav>
-    </div>
-</aside> 
+      </ul>
+    </nav>
+  </div>
+</div>
+</div>
+</div>
 {%- endmacro %}
 
 {%- macro sidebar() %}
@@ -91,8 +98,12 @@
     {%- block htmltitle %}
     <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
     {%- endblock %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
+    <!--<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />-->
+    <link rel="stylesheet" href="{{ pathto('_static/reset.css', 1) }}" type="text/css" />
+    <link rel="stylesheet" href="{{ pathto('_static/960.css', 1) }}" type="text/css" />
+    <link rel="stylesheet" href="{{ pathto('_static/base.css', 1) }}" type="text/css" />
+    <link rel="stylesheet" href="{{ pathto('_static/home.css', 1) }}" type="text/css" />
+    <!--<link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />-->
     {%- for cssfile in css_files %}
     <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
     {%- endfor %}
@@ -144,7 +155,7 @@
 {%- endblock %}
 {%- block extrahead %} {% endblock %}
   </head>
-  <body id="home">
+  <body class="home">
 
 <!--
 <aside id="top-nav"> 
@@ -163,6 +174,34 @@
 </aside>
 -->
 
+<div class="header-login">
+    <ul>
+      <li><a href="https://myapps.developer.ubuntu.com/openid/login/?next=/dev";>Sign in or register</a></li>
+    </ul>
+</div>
+
+<div class="header-navigation">
+    <div>
+      <nav role="navigation">
+        <ul>
+          <li class="page_item current_page_item"><a title="Index" href="index.html">Index</a> 
+          <li>
+            <form id="form-search" method="get" action="/">
+              <fieldset>
+                <input id="input-search" type="text" name="s" value="Search" />
+              </fieldset>
+            </form>
+          </li>
+        </ul>
+      </nav>
+      <a class="logo-ubuntu" href="/"><img src="http://developer.ubuntu.com/wp-content/themes/wordpress-theme-ubuntudeveloper/img/logo-ubuntu.png"; width="119" height="27" alt="Ubuntu logo" /></a>
+      <h2><a href="/">App Developer</a></h2>
+    </div>
+  </div>
+
+{%- block relbar1 %}{{ relbar() }}{% endblock %}
+
+<!--
 <header id="page-header"> 
   <div class="container" > 
     <nav id="main-nav"> 
@@ -170,15 +209,17 @@
     </nav> 
   </div> 
 </header>
+-->
 
 {%- block header %}{% endblock %}
 
-{%- block relbar1 %}{{ relbar() }}{% endblock %}
-
 {%- block content %}
   {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
 
-     <section id="main-section">
+<div id="content" class="container-12">
+  <div class="grid-12">
+
+     <!--<section id="main-section">-->
   {%- block document %}
       <div class="container" > 
       {%- if render_sidebar %}
@@ -195,13 +236,49 @@
       {%- endif %}
       </div>
   {%- endblock %}
-    </section>
+    <!--</section>-->
+  </div>
+</div>
 {%- endblock %}
 
 {%- block footer %}
-   <footer id="page-footer"> 
-   <div class="container">
-   	<div class="copyright"> 
+<div class="shadow"></div>
+<footer>
+  <div>
+    <nav role="navigation" class="clearfix">
+      <ul>
+        <li><a href="/get-started">Get started</a></li>
+        <li class="page_item page-item-16"><a href="http://developer.ubuntu.com/get-started/quickly-workflow/"; title="Quickly workflow">Quickly workflow</a></li>
+<li class="page_item page-item-18"><a href="http://developer.ubuntu.com/get-started/qt-creator/"; title="Qt Creator">Qt Creator</a></li>
+<li class="page_item page-item-20"><a href="http://developer.ubuntu.com/get-started/eclipse/"; title="Eclipse">Eclipse</a></li>
+<li class="page_item page-item-22"><a href="http://developer.ubuntu.com/get-started/monodevelop/"; title="MonoDevelop">MonoDevelop</a></li>
+      </ul>
+      <ul>
+        <li><a href="/resources">Resources</a></li>
+        <li><a href="/resources/tools/quickly">Quickly</a></li>
+        <li><a href="/resources/platform/api">API</a></li>
+        <li><a href="/resources/platform/documentation/platform-diagram">Platform overview</a></li>
+      </ul>
+      <ul>
+        <li><a href="/publish">Publish</a></li>
+        <li class="page_item page-item-24"><a href="http://developer.ubuntu.com/publish/commercial-software-faqs/"; title="Commercial software FAQs">Commercial software FAQs</a></li>
+<li class="page_item page-item-34"><a href="http://developer.ubuntu.com/publish/application-states/"; title="Application states">Application states</a></li>
+<li class="page_item page-item-577"><a href="http://developer.ubuntu.com/publish/my-apps-packages/"; title="My Apps packages">My Apps packages</a></li>
+<li class="page_item page-item-404"><a href="http://developer.ubuntu.com/publish/ubuntu-software-centre/"; title="Ubuntu Software Centre">Ubuntu Software Centre</a></li>
+<li class="page_item page-item-427"><a href="http://developer.ubuntu.com/publish/licence-key-infrastructure/"; title="Licence key infrastructure">Licence key infrastructure</a></li>
+      </ul>
+      <ul>
+        <li><a href="/community">Community</a></li>
+        <li class="page_item page-item-28"><a href="http://developer.ubuntu.com/community/app-developer-blog/"; title="App Developer Blog">App Developer Blog</a></li>
+<li class="page_item page-item-30"><a href="http://developer.ubuntu.com/community/submit-a-tutorial/"; title="Submit a tutorial">Submit a tutorial</a></li>
+<li class="page_item page-item-32"><a href="http://developer.ubuntu.com/community/app-review-board-charter/"; title="App Review Board charter">App Review Board charter</a></li>
+      </ul>
+      <ul class="last">
+        <li><a href="https://myapps.developer.ubuntu.com/dev";>My Apps</a></li>
+        <li><a href="https://myapps.developer.ubuntu.com/openid/login/?next=/dev";>Sign in or register</a></li>
+        <li><a href="https://myapps.developer.ubuntu.com/dev/account";>My account</a></li>
+      </ul>
+    </nav>
     {%- if show_copyright %}
       {%- if hasdoc('copyright') %}
         {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
@@ -217,9 +294,10 @@
     {%- if show_sphinx %}
       {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx.pocoo.org/";>Sphinx</a> {{ sphinx_version }}.{% endtrans %}
     {%- endif %}
-	</div> 
-    </div>
-    </footer>
+
+    <!--<p>&copy; 2012 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd. <a class="link-bug" href="https://bugs.launchpad.net/ubuntudeveloperportal/+filebug";>Report a bug on this site</a></p>-->
+  </div>
+</footer>
 {%- endblock %}
   </body>
 </html>

=== added file 'themes/ubuntu/static/960.css'
--- themes/ubuntu/static/960.css	1970-01-01 00:00:00 +0000
+++ themes/ubuntu/static/960.css	2012-01-27 12:27:28 +0000
@@ -0,0 +1,1 @@
+body{min-width:960px}.container-12{margin-left:auto;margin-right:auto;width:960px}.grid-1,.grid-2,.grid-3,.grid-4,.grid-5,.grid-6,.grid-7,.grid-8,.grid-9,.grid-10,.grid-11,.grid-12{display:inline;float:left;margin-left:10px;margin-right:10px}.push-1,.pull-1,.push-2,.pull-2,.push-3,.pull-3,.push-4,.pull-4,.push-5,.pull-5,.push-6,.pull-6,.push-7,.pull-7,.push-8,.pull-8,.push-9,.pull-9,.push-10,.pull-10,.push-11,.pull-11{position:relative}.alpha{margin-left:0}.omega{margin-right:0}.container-12 .grid-1{width:60px}.container-12 .grid-2{width:140px}.container-12 .grid-3{width:220px}.container-12 .grid-4{width:300px}.container-12 .grid-5{width:380px}.container-12 .grid-6{width:460px}.container-12 .grid-7{width:540px}.container-12 .grid-8{width:620px}.container-12 .grid-9{width:700px}.container-12 .grid-10{width:780px}.container-12 .grid-11{width:860px}.container-12 .grid-12{width:940px}.container-12 .prefix-1{padding-left:80px}.container-12 .prefix-2{padding-left:160px}.container-12 .prefix-3{padding-left:240px}.container-12 .prefix-4{padding-left:320px}.container-12 .prefix-5{padding-left:400px}.container-12 .prefix-6{padding-left:480px}.container-12 .prefix-7{padding-left:560px}.container-12 .prefix-8{padding-left:640px}.container-12 .prefix-9{padding-left:720px}.container-12 .prefix-10{padding-left:800px}.container-12 .prefix-11{padding-left:880px}.container-12 .suffix-1{padding-right:80px}.container-12 .suffix-2{padding-right:160px}.container-12 .suffix-3{padding-right:240px}.container-12 .suffix-4{padding-right:320px}.container-12 .suffix-5{padding-right:400px}.container-12 .suffix-6{padding-right:480px}.container-12 .suffix-7{padding-right:560px}.container-12 .suffix-8{padding-right:640px}.container-12 .suffix-9{padding-right:720px}.container-12 .suffix-10{padding-right:800px}.container-12 .suffix-11{padding-right:880px}.container-12 .push-1{left:80px}.container-12 .push-2{left:160px}.container-12 .push-3{left:240px}.container-12 .push-4{left:320px}.container-12 .push-5{left:400px}.container-12 .push-6{left:480px}.container-12 .push-7{left:560px}.container-12 .push-8{left:640px}.container-12 .push-9{left:720px}.container-12 .push-10{left:800px}.container-12 .push-11{left:880px}.container-12 .pull-1{left:-80px}.container-12 .pull-2{left:-160px}.container-12 .pull-3{left:-240px}.container-12 .pull-4{left:-320px}.container-12 .pull-5{left:-400px}.container-12 .pull-6{left:-480px}.container-12 .pull-7{left:-560px}.container-12 .pull-8{left:-640px}.container-12 .pull-9{left:-720px}.container-12 .pull-10{left:-800px}.container-12 .pull-11{left:-880px}.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0}.clearfix:before,.clearfix:after,.container-12:before,.container-12:after{content:'.';display:block;overflow:hidden;visibility:hidden;font-size:0;line-height:0;width:0;height:0}.clearfix:after,.container-12:after{clear:both}.clearfix,.container-12{zoom:1}
\ No newline at end of file

=== added file 'themes/ubuntu/static/base.css'
--- themes/ubuntu/static/base.css	1970-01-01 00:00:00 +0000
+++ themes/ubuntu/static/base.css	2012-01-27 12:27:28 +0000
@@ -0,0 +1,638 @@
+/**
+* Ubuntu Developer base stylesheet
+*
+* A base stylesheet containing site-wide styles
+*
+* @project Ubuntu Developer
+* @version 1.0
+* @author Canonical Web Team: Steve Edwards
+* @copyright 2011 Canonical Ltd.
+*/
+
+/**
+* @section Global
+*/
+
+body {
+	font-family: 'Ubuntu', 'Ubuntu Beta', UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+	font-size: 13px;
+	line-height: 1.4;
+	color: #333;
+}
+a {
+	color: #dd4814;
+	text-decoration: none;
+	outline: 0;
+}
+p, dl {
+	margin-bottom: 10px;
+}
+strong {
+	font-weight: bold;
+}
+em {
+	font-style: italic;
+}
+code{
+	padding: 10px;
+	font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace;
+	background-color: #fdf6f2;
+	display: block;
+	margin-bottom: 10px;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+h1 {
+	font-size: 36px;
+	line-height: 1.1;
+	margin-bottom: 20px;
+}
+article h1,
+h2 {
+	font-size: 24px;
+	line-height: 1.2;
+	margin-bottom: 14px;
+}
+h3 {
+	font-size: 16px;
+	line-height: 1.3;
+	margin-bottom: 8px;
+}
+h4 {
+	font-weight: bold;
+}
+
+time {
+	color:#999;
+}
+
+/**
+* @section Structure
+*/
+
+.header-login,
+.header-navigation div,
+.header-content div {
+	margin: 0 auto;
+	width: 940px;
+}
+
+.header-content h1{
+	background-color:#ffffff;
+	display:inline-block;
+}
+
+.header-content h2{
+	background-color:#ffffff;
+	display:table;
+}
+
+.header-login ul {
+	margin: 4px 0;
+	float: right;
+}
+.header-login li {
+	margin-right: 10px;
+	float: left;
+}
+.header-login a {
+	color: #333;
+}
+.header-navigation {
+	border-top: 2px solid #dd4814;
+	border-bottom: 2px solid #dd4814;
+	background-color: #fff;
+	height: 54px;
+	clear: right;
+	overflow: hidden;
+}
+.header-navigation nav ul {
+	border-right: 1px solid #dd4814;
+	float: right;
+}
+.header-navigation nav li {
+	border-left: 1px solid #dd4814;
+	float: left;
+	height: 54px;
+}
+.header-navigation nav a {
+	padding: 18px 14px 0;
+	font-size: 14px;
+	display: block;
+	height: 36px;
+}
+.header-navigation nav a:hover {
+	background-color: #fcece7;
+}
+.header-navigation nav .current_page_item a,
+.header-navigation nav .current_page_parent a,
+.header-navigation nav .current_page_ancestor a {
+	background-color: #dd4814;
+	color: #fff;
+}
+.header-navigation input {
+	margin: 12px 10px 0 10px;
+	padding: 5px;
+	border-top: 1px solid #a1a1a1;
+	border-right: 1px solid #e0e0e0;
+	border-bottom: 1px solid #fff;
+	border-left: 1px solid #e0e0e0;
+	width: 90px;
+	font-style: italic;
+	color: #ccc;
+		-moz-border-radius: 3px;
+		-webkit-border-radius: 3px;
+	border-radius: 3px;
+		-moz-box-shadow: inset 0 1px 1px #e0e0e0;
+	   -webkit-box-shadow: inset 0 1px 1px #e0e0e0;
+   box-shadow: inset 0 1px 1px #e0e0e0;
+}
+.header-navigation h2 {
+	margin: 18px 0 0 6px;
+	text-transform: lowercase;
+	font-size: 22px;
+	color: #dd4814;
+	float: left;
+}
+.header-navigation .logo-ubuntu {
+	margin-top: 12px;
+	float: left;
+}
+.header-content .header-navigation-secondary {
+	margin-bottom: 40px;
+	padding: 0;
+	position: relative;
+	z-index: 2;
+}
+.header-navigation-secondary div {
+	padding: 0;
+	border: 2px solid #dd4814;
+		-moz-border-radius: 0px 0px 4px 4px;
+		-webkit-border-radius: 0px 0px 4px 4px;
+	border-radius: 0px 0px 4px 4px;
+	background: #fff;
+	border-top: 0px;
+	width: 936px;
+}
+.header-navigation-secondary nav li {
+	float: left;
+}
+.header-navigation-secondary nav li a {
+	color: #333;
+	display: block;
+	height: 25px;
+	padding: 8px 8px 0;
+}
+.header-navigation-secondary nav li:hover,
+.header-navigation-secondary nav .current_page_item a {
+	background: url("./images/sec-nav-hover.gif");
+}
+.header-content {
+	padding-bottom: 30px;
+	border-bottom: 1px solid #e0e0e0;
+		-moz-box-shadow: 0 1px 3px #e0e0e0;
+		-webkit-box-shadow: 0 1px 3px #e0e0e0;
+	box-shadow: 0 1px 3px #e0e0e0;
+	margin-bottom: 3px;
+	position: relative;
+	overflow: hidden;
+}
+footer {
+	padding: 10px 10px 40px 10px;
+	position: relative;
+		-moz-border-radius: 0 0 4px 4px;
+		-webkit-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+	font-size: 12px;
+	background: url("./images/background-footer.png") repeat scroll 0 0 #f7f6f5;
+}
+footer div {
+	margin: 0 auto;
+    padding: 0 10px;
+    width: 940px;
+}
+footer a {
+	color: #000;
+}
+footer nav ul {
+	margin: 10px 17px 30px 0;
+	width: 172px;
+	display: inline-block;
+	vertical-align: top;
+	height: auto;
+	zoom: 1;
+	*display: inline;
+}
+footer nav ul.last {
+	margin-right: 0;
+}
+footer nav li {
+	margin-bottom: 8px;
+}
+footer nav li:first-child {
+	font-weight: bold;
+}
+footer p {
+	margin-bottom: 0;
+}
+#content {
+	padding-top: 35px;
+}
+.arrow-nav {
+	display: none;
+	position: absolute;
+	top: -1px;
+	z-index: 3;
+}
+.shadow {
+	margin: 30px 0 3px 0;
+	border-bottom: 1px solid #e0e0e0;
+		-moz-box-shadow: 0 2px 3px #e0e0e0;
+		-webkit-box-shadow: 0 2px 3px #e0e0e0;
+	box-shadow: 0 2px 3px #e0e0e0;
+	height: 3px;
+}
+
+/**
+* @section Site-wide
+*/
+
+#content h2{
+	font-size:24px;
+}
+
+.box-orange {
+	padding: 10px;
+	border: 3px solid #dd4814;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+.box-orange .link-action-small {
+	float: right;
+	margin: 0 0 0 20px;
+}
+.link-bug {
+	margin-left: 10px;
+	color: #999;
+}
+.link-action {
+	float: left;
+	margin-bottom: 20px;
+	padding: 8px 12px;
+	display: block;
+	background-color: #dd4814;
+	color: #fff;
+		-moz-border-radius: 20px;
+		-webkit-border-radius: 20px;
+	border-radius: 20px;
+	font-size: 16px;
+	line-height: 1.3;
+	border-top: 3px solid #e6633a;
+	border-bottom: 3px solid #c03d14;
+}
+.link-action2 {
+	float: left;
+	display: block;
+	color: #fff;
+	font-size: 16px;
+	line-height: 1.3;
+}
+.link-action2 span{
+	display:block;
+	float:left;
+}
+.link-action2 .cta-left{
+	background:url(./images/button-cta-left.png) no-repeat;
+	width:22px;
+	height:48px;
+}
+.link-action2 .cta-center{
+	background:url(./images/button-cta-slice.png) repeat-x;
+	line-height:45px;
+	height:48px;
+}
+.link-action2 .cta-right{
+	background:url(./images/button-cta-right.png) no-repeat;
+	width:22px;
+	height:48px;
+}
+
+.link-action-small {
+	float: left;
+	display: block;
+	color: #fff;
+	font-size: 16px;
+}
+.link-action-small span{
+	display:block;
+	float:left;
+	height:42px;
+}
+.link-action-small .cta-left{
+	background:url(./images/button-cta-left-small.png) no-repeat;
+	width:19px;
+}
+.link-action-small .cta-center{
+	background:url(./images/button-cta-slice-small.png) repeat-x;
+	line-height:42px;
+}
+.link-action-small .cta-right{
+	background:url(./images/button-cta-right-small.png) no-repeat;
+	width:19px;
+}
+
+.link-action:active {
+	position: relative;
+	top: 1px;
+}
+.link-action2:active {
+	position: relative;
+	top: 1px;
+}
+.link-action-small:active {
+	position: relative;
+	top: 1px;
+}
+.list-bullets li {
+	margin-bottom: 10px;
+	list-style: disc;
+	list-style-position: inside;
+}
+.box {
+	margin-bottom: 30px;
+	padding: 15px;
+	border: 1px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+.box-padded {
+	margin-bottom: 30px;
+	padding: 5px;
+	border: 2px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	background: url("./images/pattern-featured.gif") repeat scroll 0 0 #ebe9e7;
+	overflow: hidden;
+}
+.box-padded h3 {
+	 margin: 5px 0 10px 5px;
+}
+.box-padded div {
+	padding: 10px;
+	border: 1px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	background-color: #fff;
+	overflow: hidden;
+}
+.box-padded li {
+	padding: 0 10px;
+	float: left;
+	width: 211px;
+	border-right: 1px dotted #aea79f;
+}
+.box-padded li.first {
+	padding: 0;
+	margin-bottom: 0;
+}
+.box-padded li.last {
+	border: 0;
+	width: 217px;
+}
+.box-padded img {
+	margin: 0 10px 50px 0;
+	float: left;
+		-moz-border-radius: 8px;
+		-webkit-border-radius: 8px;
+	border-radius: 8px;
+}
+.box-clear {
+	margin-bottom: 40px;
+}
+.box-clear .grid-4.first {
+	margin-right: 15px;
+	padding-right: 15px;
+}
+.box-clear .grid-4 {
+	margin-left: 0;
+	margin-right: 10px;
+	padding-right: 10px;
+	width: 298px;
+}
+.box-clear time {
+	display: block;
+	border-bottom: 1px dotted #aea79f;
+	padding-bottom: 10px;
+	margin-bottom: 10px;
+}
+.box-clear div.first {
+	border-right: 1px dotted #aea79f;
+}
+.box-clear a {
+	display: block;
+}
+.box-clear .rss {
+	background: url("./images/rss.jpg") no-repeat scroll 0 center;
+	padding-left: 20px;
+}
+.box-clear .location {
+	display: block;
+	margin-bottom: 1px;
+}
+.box-clear .last {
+	margin: 0;
+	padding-right: 0;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	width: 293px;
+}
+
+/* Widgets */
+
+.ui-state-focus {
+	outline: none;
+}
+.ui-accordion {
+	border-bottom: 1px dotted #aea79f;
+}
+.ui-accordion a {
+	display: block;
+}
+.ui-accordion h3 {
+	margin-bottom: 0;
+	border-top: 1px dotted #aea79f;
+	position: relative;
+	font-size: 13px;
+	font-weight: bold;
+}
+.ui-accordion h3 a {
+	padding: 10px 0;
+	color: #333;
+}
+.ui-accordion h4 {
+	margin-bottom: 5px;
+}
+.ui-accordion div fieldset {
+	padding-bottom: 5px;
+}
+.ui-accordion div li,
+.ui-accordion div input {
+	margin-bottom: 10px;
+}
+.ui-accordion .ui-icon {
+	position: absolute;
+	top: 15px;
+	right: 0;
+	display: block;
+	width: 8px;
+	height: 8px;
+	background: url("./images/icon-accordion-inactive.png") 0 0 no-repeat transparent;
+}
+.ui-accordion .ui-state-active .ui-icon {
+	background-image: url("./images/icon-accordion-active.png");
+}
+.ui-accordion .current_page_item a {
+	color: #333;
+}
+.container-tweet {
+		-moz-border-radius: 4px 4px 4px 4px;
+		-webkit-border-radius: 4px 4px 4px 4px;
+	border-radius: 4px 4px 4px 4px;
+	padding: 10px 10px 10px;
+	background-color: #f7f7f7;
+}
+.container-tweet .tweet-follow {
+	margin-top: 10px;
+	margin-bottom: -10px;
+	padding-left: 55px;
+	padding-bottom: 6px;
+	background: url("./images/tweet-follow.png") 0 5px no-repeat;
+	display: block;
+}
+.container-tweet .tweet-follow span {
+	font-size: 16px;
+	font-weight: bold;
+	line-height: 1.2;
+	display: block;
+}
+.tweet a {
+	display: inline;
+}
+.tweet .tweet_text {
+	padding: 10px;
+	background-color: #fff;
+		-moz-border-radius: 4px 4px 4px 4px;
+		-webkit-border-radius: 4px 4px 4px 4px;
+	border-radius: 4px 4px 4px 4px;
+	border: 1px solid #dd4814;
+	font-size: 16px;
+	display: block;
+	clear: both;
+}
+.tweet.tweet-small .tweet_text {
+	font-size: inherit;
+}
+.tweet .tweet_text a {
+	color: #333;
+}
+.tweet .tweet_time,
+.tweet .tweet_user_and_time {
+	padding: 15px 0 10px 0;
+	position: relative;
+	top: -2px;
+	background: url("./images/tweet-arrow.png") no-repeat;
+	display: block;
+}
+.tweet .tweet_odd .tweet_time,
+.tweet .tweet_odd .tweet_user_and_time {
+	background-position: right 0;
+	float: right;
+}
+.tweet .tweet_even .tweet_time,
+.tweet .tweet_even .tweet_user_and_time {
+	background-position: left 0;
+	float: left;
+}
+
+/* Search */
+
+#content .list-search li {
+	list-style-type:none;
+	border:0px;
+	margin-bottom: 15px;
+	padding-top: 15px;
+}
+
+/* Blog */
+
+.blog-article #nav-single {
+	margin-top: 30px;
+	margin-bottom: 30px;
+}
+.blog-article #nav-single .nav-next {
+	float: right;
+}
+.blog-article article header .entry-meta {
+	margin-bottom: 20px;
+}
+.blog-article article .entry-meta {
+	color: #999;
+}
+.blog-article #respond form input[type="submit"] {
+	float: left;
+	cursor: pointer;
+	margin-bottom: 20px;
+	padding: 8px 12px;
+	display: block;
+	background-color: #dd4814;
+	color: #fff;
+		-moz-border-radius: 20px;
+		-webkit-border-radius: 20px;
+	border-radius: 20px;
+	font-size: 16px;
+	line-height: 1.3;
+	border-top: 3px solid #e6633a;
+	border-left: 3px solid #e6633a;
+	border-right: 3px solid #e6633a;
+	border-bottom: 3px solid #c03d14;
+}
+.blog-article #respond form input[type="submit"]:active {
+	position: relative;
+	top: 1px;
+}
+
+.alignnone{
+    float:left;
+    margin:10px 20px 10px 0;
+}
+.alignleft{
+    float:left;
+    margin:10px 20px 10px 0;
+}
+.alignright{
+    float:right;
+   margin:10px 0 10px 20px;
+}
+
+.aligncenter{
+	float:left;
+    margin:10px 20px 10px 0;
+}
+.entry-content h2, .entry-content h3{
+    margin-top:20px;
+}
+.entry-content ul li{
+    list-style-type: circle;
+    margin-left:16px;
+}
+
+.entry-content hr{
+	border:none;
+	border-top: 1px dotted #AEA79F;
+}

=== added file 'themes/ubuntu/static/home.css'
--- themes/ubuntu/static/home.css	1970-01-01 00:00:00 +0000
+++ themes/ubuntu/static/home.css	2012-01-27 12:27:28 +0000
@@ -0,0 +1,234 @@
+/**
+* Ubuntu Developer page stylesheet
+*
+* A stylesheet for the 'home' page
+*
+* @project Ubuntu Developer
+* @version 1.0
+* @author Canonical Web Team: Steve Edwards and Ant Dillon
+* @copyright 2011 Canonical Ltd.
+*/
+
+.home header {
+	background: #fff;
+}
+.home .header-content {
+	background: url("./images/background-header-home.png") 0 0 repeat #fff;
+}
+.home .header-content h1 {
+	font-size: 36px;
+	background: #fff;
+}
+.home .header-content h2 {
+	font-size: 20px;
+	line-height: 1.4;
+	width: 440px;
+	background: #fff;
+}
+.home .header-content a .cta-center{
+	margin-top: 20px;
+	font-size: 20px;
+	line-height: 2.4;
+}
+.home .header-content a .cta-right, .home .header-content a .cta-left {
+	margin-top: 20px;
+}
+.home .header-image {
+	background: url("./images/dotted-logo.png") no-repeat scroll 122px -24px transparent;
+	float: right;
+    height: 332px;
+    margin-bottom: -35px;
+    margin-right: -163px;
+    margin-top: -53px;
+    width: 571px;
+	position: relative;
+	z-index: 1;
+}
+.home .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;
+}
+
+.box-steps {
+	margin-bottom: 30px;
+	border: 3px solid #dd4814;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+		-moz-box-shadow: 0 3px 1px #e0e0e0;
+		-webkit-box-shadow: 0 3px 1px #e0e0e0;
+	box-shadow: 0 3px 1px #e0e0e0;
+}
+.box-steps li {
+	padding: 15px;
+	float: left;
+	width: 203px;
+	border-right: 1px solid #dd4814;
+	text-align: center;
+	min-height: 237px;
+}
+.box-steps li.last {
+	border: 0;
+	width: 202px;
+}
+.box-steps span {
+	padding: 4px;
+	margin: 10px auto 0;
+	display: block;
+	border: 3px solid #dd4814;
+		-moz-border-radius: 40px;
+		-webkit-border-radius: 40px;
+	border-radius: 40px;
+	text-align: center;
+	font-size: 36px;
+	width: 50px;
+	color: #dd4814;
+		-moz-box-shadow: 0 2px 1px #e0e0e0;
+		-webkit-box-shadow: 0 2px 1px #e0e0e0;
+	box-shadow: 0 2px 1px #e0e0e0;
+}
+.box-steps h3 {
+	margin: 10px 0 15px;
+}
+.box-steps p {
+	padding-top: 15px;
+	text-align: left;
+	border-top: 1px dotted #aea79f;
+}
+.box-steps a {
+	color: #333;
+}
+.box-steps li:hover {
+	background-color: #fcece7;
+	cursor: pointer;
+}
+.box-steps li:hover span {
+	background-color: #dd4814;
+	color: #fff;
+}
+.box-steps li:hover a {
+	color: #dd4814;
+}
+.box ul li {
+	margin: 0 30px 20px 0;
+	width: 282px;
+	float: left;
+}
+.box ul li.last {
+	margin-right: 0;
+}
+.box ul li img {
+	margin: 0 0 10px 10px;
+	float: right;
+}
+.box h4 {
+	padding-bottom: 10px;
+}
+.box h2 {
+	margin-bottom: 30px;
+}
+.box .link-action-small {
+	float: right;
+	margin-bottom: 0px;
+}
+
+/*blockquote {
+	margin-bottom: 30px;
+	padding: 32px 10px;
+	border-top: 1px dotted #aea69e;
+	border-bottom: 1px dotted #aea69e;
+	background: url("./images/quotes.png") no-repeat scroll 5px center;
+}
+blockquote p {
+	padding: 12px 65px;
+	font-size: 24px;
+	height: 54px;
+}
+blockquote cite {
+	margin-left: 65px;
+	font-size: 16px;
+}*/
+
+.slider{
+	width:10000px;
+	margin-left:-10px;
+}
+
+.box-padded .slider-controls{
+	background-color: transparent;
+    border-radius:0px;
+    padding: 0px;
+    float:right;
+    border:0px;
+	width:200px;
+}
+
+.slider-controls .next{
+	background:url("./images/arrow-sliders.png") no-repeat scroll -29px 0;
+	height:31px;
+	width:34px;
+}
+
+.slider-controls .prev{
+	background:url("./images/arrow-sliders.png") no-repeat scroll 0 0;
+	height:31px;
+	width:29px;
+}
+
+.slider-controls div{
+	float:right;
+	padding:0px;
+	cursor: pointer;
+    border: none;
+    	-moz-border-radius: 0px;
+		-webkit-border-radius: 0px;
+    border-radius: 0px;
+}
+
+.slider-controls .prev.disabled{
+	background-position: 0 -29px;
+	cursor: default;
+}
+
+.slider-controls .next.disabled{
+	background-position: -29px -29px;
+	cursor: default;
+}
+
+.slider-jump{
+	width:66px;
+	margin:0px auto;
+	padding-left: 33px;
+	padding-top:10px;
+}
+.slider-jump li{
+	width:9px;
+	height:9px;
+	background:transparent;
+	border:1px solid #aea79f;
+		-moz-border-radius:5px 5px 5px 5px;
+		-webkit-border-radius:5px 5px 5px 5px;
+	border-radius:5px 5px 5px 5px;
+	float:left;
+	margin-right:5px;
+	cursor: pointer;
+	padding: 0 0;
+}
+
+.slider-jump .active{
+	background:#aea79f;
+	cursor: default;
+}
+
+.box-padded li .price{
+	font-weight: bold;
+}
+
+.box-padded li.no-border{
+	border: 0 none;
+}
+

=== added file 'themes/ubuntu/static/images/background-footer.png'
Binary files themes/ubuntu/static/images/background-footer.png	1970-01-01 00:00:00 +0000 and themes/ubuntu/static/images/background-footer.png	2012-01-27 12:27:28 +0000 differ
=== added file 'themes/ubuntu/static/images/background-header-home.png'
Binary files themes/ubuntu/static/images/background-header-home.png	1970-01-01 00:00:00 +0000 and themes/ubuntu/static/images/background-header-home.png	2012-01-27 12:27:28 +0000 differ
=== added file 'themes/ubuntu/static/images/sec-nav-hover.gif'
Binary files themes/ubuntu/static/images/sec-nav-hover.gif	1970-01-01 00:00:00 +0000 and themes/ubuntu/static/images/sec-nav-hover.gif	2012-01-27 12:27:28 +0000 differ
=== added file 'themes/ubuntu/static/reset.css'
--- themes/ubuntu/static/reset.css	1970-01-01 00:00:00 +0000
+++ themes/ubuntu/static/reset.css	2012-01-27 12:27:28 +0000
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.com/yui/license.html
+version: 3.3.0
+build: 3167
+*/
+html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}
\ No newline at end of file


Follow ups