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

Proposed by Alexander Fougner
Status: Merged
Merged at revision: 73
Proposed branch: lp:~fougner/ubuntu-packaging-guide/fix-bug-859656
Merge into: lp:ubuntu-packaging-guide
Diff against target: 1127 lines (+992/-33)
5 files modified
themes/ubuntu/layout.html (+111/-33)
themes/ubuntu/static/960.css (+1/-0)
themes/ubuntu/static/base.css (+638/-0)
themes/ubuntu/static/home.css (+234/-0)
themes/ubuntu/static/reset.css (+8/-0)
To merge this branch: bzr merge lp:~fougner/ubuntu-packaging-guide/fix-bug-859656
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+90420@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Fougner (fougner) wrote :
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks a lot for your work on this. I'm currently investigating all the licenses, I will give you an update soon.

72. By Alexander Fougner

fixed table of contents

Revision history for this message
Daniel Holbach (dholbach) wrote :

Ok, I just went ahead and
 - updated BORROWED-CODE
 - updated debian/copyright
 - removed a few links we won't need

Thanks again for your work on this!

review: Approve
Revision history for this message
Daniel Holbach (dholbach) wrote :

I filed bug 940195.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'themes/ubuntu/layout.html'
2--- themes/ubuntu/layout.html 2011-10-20 04:30:22 +0000
3+++ themes/ubuntu/layout.html 2012-01-28 12:45:28 +0000
4@@ -20,30 +20,37 @@
5
6
7 {%- macro relbar() %}
8- <aside id="page-related">
9- <div class="container" id="sub-nav-container" >
10- <nav id="sub-nav">
11+<div class="header-content">
12+ <div class="clearfix">
13+ <!--<img class="arrow-nav" src="http://developer.ubuntu.com/wp-content/themes/wordpress-theme-ubuntudeveloper/img/arrow-nav.png" width="9" height="5" alt="" />-->
14+ <div class="header-navigation-secondary">
15+ <div>
16+ <nav role="navigation">
17+ <ul class="clearfix">
18 {%- for rellink in rellinks %}
19- <a class="sub-nav-item" {% if loop.first %}style="margin-right: 10px"{% endif %}
20+ <li class="page_item"><a {% if loop.first %}style="margin-right: 10px"{% endif %}
21 href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
22- {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
23+ {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a></li>
24 {%- endfor %}
25 {%- block rootrellink %}
26- <a class="sub-nav-item" href="{{ pathto(master_doc) }}">{{ shorttitle|e }} {{ reldelim1 }}</a>
27+ <li class="page_item"><a class="sub-nav-item" href="{{ pathto(master_doc) }}">{{ shorttitle|e }} {{ reldelim1 }}</a></li>
28 {%- endblock %}
29 {%- for parent in parents %}
30- <a class="sub-nav-item" href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }} {{ reldelim1 }}</a>
31+ <li class="page_item"><a class="sub-nav-item" href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }} {{ reldelim1 }}</a></li>
32 {%- endfor %}
33 {%- block relbaritems %} {% endblock %}
34- </nav>
35- </div>
36-</aside>
37+ </ul>
38+ </nav>
39+ </div>
40+</div>
41+</div>
42+</div>
43 {%- endmacro %}
44
45 {%- macro sidebar() %}
46 {%- if render_sidebar %}
47- <div class="sphinxsidebar">
48- <div class="sphinxsidebarwrapper">
49+ <div class="grid-3 omega">
50+ <div class="container-tweet">
51 {%- block sidebarlogo %}
52 {%- if logo %}
53 <p class="logo"><a href="{{ pathto(master_doc) }}">
54@@ -91,8 +98,12 @@
55 {%- block htmltitle %}
56 <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
57 {%- endblock %}
58- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
59- <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
60+ <!--<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />-->
61+ <link rel="stylesheet" href="{{ pathto('_static/reset.css', 1) }}" type="text/css" />
62+ <link rel="stylesheet" href="{{ pathto('_static/960.css', 1) }}" type="text/css" />
63+ <link rel="stylesheet" href="{{ pathto('_static/base.css', 1) }}" type="text/css" />
64+ <link rel="stylesheet" href="{{ pathto('_static/home.css', 1) }}" type="text/css" />
65+ <!--<link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />-->
66 {%- for cssfile in css_files %}
67 <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
68 {%- endfor %}
69@@ -144,7 +155,7 @@
70 {%- endblock %}
71 {%- block extrahead %} {% endblock %}
72 </head>
73- <body id="home">
74+ <body class="home">
75
76 <!--
77 <aside id="top-nav">
78@@ -163,6 +174,34 @@
79 </aside>
80 -->
81
82+<div class="header-login">
83+ <ul>
84+ <li><a href="https://myapps.developer.ubuntu.com/openid/login/?next=/dev">Sign in or register</a></li>
85+ </ul>
86+</div>
87+
88+<div class="header-navigation">
89+ <div>
90+ <nav role="navigation">
91+ <ul>
92+ <li class="page_item current_page_item"><a title="Index" href="index.html">Index</a>
93+ <li>
94+ <form id="form-search" method="get" action="/">
95+ <fieldset>
96+ <input id="input-search" type="text" name="s" value="Search" />
97+ </fieldset>
98+ </form>
99+ </li>
100+ </ul>
101+ </nav>
102+ <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>
103+ <h2><a href="/">App Developer</a></h2>
104+ </div>
105+ </div>
106+
107+{%- block relbar1 %}{{ relbar() }}{% endblock %}
108+
109+<!--
110 <header id="page-header">
111 <div class="container" >
112 <nav id="main-nav">
113@@ -170,38 +209,76 @@
114 </nav>
115 </div>
116 </header>
117+-->
118
119 {%- block header %}{% endblock %}
120
121-{%- block relbar1 %}{{ relbar() }}{% endblock %}
122-
123 {%- block content %}
124- {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
125-
126- <section id="main-section">
127+
128+<div id="content" class="container-12">
129+ <div class="grid-12">
130+
131+{%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
132+
133+ <!--<section id="main-section">-->
134 {%- block document %}
135- <div class="container" >
136 {%- if render_sidebar %}
137- <section id="content">
138 {%- endif %}
139- <div class="body">
140- {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
141+
142+ <div class="grid-9 alpha">
143+
144 {% block body %} {% endblock %}
145 <div class="divide"></div>
146
147 </div>
148+
149+ {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
150 {%- if render_sidebar %}
151- </section>
152 {%- endif %}
153- </div>
154 {%- endblock %}
155- </section>
156+ <!--</section>-->
157+ </div>
158+</div>
159 {%- endblock %}
160
161 {%- block footer %}
162- <footer id="page-footer">
163- <div class="container">
164- <div class="copyright">
165+<div class="shadow"></div>
166+<footer>
167+ <div>
168+ <nav role="navigation" class="clearfix">
169+ <ul>
170+ <li><a href="/get-started">Get started</a></li>
171+ <li class="page_item page-item-16"><a href="http://developer.ubuntu.com/get-started/quickly-workflow/" title="Quickly workflow">Quickly workflow</a></li>
172+<li class="page_item page-item-18"><a href="http://developer.ubuntu.com/get-started/qt-creator/" title="Qt Creator">Qt Creator</a></li>
173+<li class="page_item page-item-20"><a href="http://developer.ubuntu.com/get-started/eclipse/" title="Eclipse">Eclipse</a></li>
174+<li class="page_item page-item-22"><a href="http://developer.ubuntu.com/get-started/monodevelop/" title="MonoDevelop">MonoDevelop</a></li>
175+ </ul>
176+ <ul>
177+ <li><a href="/resources">Resources</a></li>
178+ <li><a href="/resources/tools/quickly">Quickly</a></li>
179+ <li><a href="/resources/platform/api">API</a></li>
180+ <li><a href="/resources/platform/documentation/platform-diagram">Platform overview</a></li>
181+ </ul>
182+ <ul>
183+ <li><a href="/publish">Publish</a></li>
184+ <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>
185+<li class="page_item page-item-34"><a href="http://developer.ubuntu.com/publish/application-states/" title="Application states">Application states</a></li>
186+<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>
187+<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>
188+<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>
189+ </ul>
190+ <ul>
191+ <li><a href="/community">Community</a></li>
192+ <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>
193+<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>
194+<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>
195+ </ul>
196+ <ul class="last">
197+ <li><a href="https://myapps.developer.ubuntu.com/dev">My Apps</a></li>
198+ <li><a href="https://myapps.developer.ubuntu.com/openid/login/?next=/dev">Sign in or register</a></li>
199+ <li><a href="https://myapps.developer.ubuntu.com/dev/account">My account</a></li>
200+ </ul>
201+ </nav>
202 {%- if show_copyright %}
203 {%- if hasdoc('copyright') %}
204 {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
205@@ -217,9 +294,10 @@
206 {%- if show_sphinx %}
207 {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
208 {%- endif %}
209- </div>
210- </div>
211- </footer>
212+
213+ <!--<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>-->
214+ </div>
215+</footer>
216 {%- endblock %}
217 </body>
218 </html>
219
220=== added file 'themes/ubuntu/static/960.css'
221--- themes/ubuntu/static/960.css 1970-01-01 00:00:00 +0000
222+++ themes/ubuntu/static/960.css 2012-01-28 12:45:28 +0000
223@@ -0,0 +1,1 @@
224+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}
225\ No newline at end of file
226
227=== added file 'themes/ubuntu/static/base.css'
228--- themes/ubuntu/static/base.css 1970-01-01 00:00:00 +0000
229+++ themes/ubuntu/static/base.css 2012-01-28 12:45:28 +0000
230@@ -0,0 +1,638 @@
231+/**
232+* Ubuntu Developer base stylesheet
233+*
234+* A base stylesheet containing site-wide styles
235+*
236+* @project Ubuntu Developer
237+* @version 1.0
238+* @author Canonical Web Team: Steve Edwards
239+* @copyright 2011 Canonical Ltd.
240+*/
241+
242+/**
243+* @section Global
244+*/
245+
246+body {
247+ font-family: 'Ubuntu', 'Ubuntu Beta', UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
248+ font-size: 13px;
249+ line-height: 1.4;
250+ color: #333;
251+}
252+a {
253+ color: #dd4814;
254+ text-decoration: none;
255+ outline: 0;
256+}
257+p, dl {
258+ margin-bottom: 10px;
259+}
260+strong {
261+ font-weight: bold;
262+}
263+em {
264+ font-style: italic;
265+}
266+code{
267+ padding: 10px;
268+ font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace;
269+ background-color: #fdf6f2;
270+ display: block;
271+ margin-bottom: 10px;
272+ -moz-border-radius: 4px;
273+ -webkit-border-radius: 4px;
274+ border-radius: 4px;
275+}
276+h1 {
277+ font-size: 36px;
278+ line-height: 1.1;
279+ margin-bottom: 20px;
280+}
281+article h1,
282+h2 {
283+ font-size: 24px;
284+ line-height: 1.2;
285+ margin-bottom: 14px;
286+}
287+h3 {
288+ font-size: 16px;
289+ line-height: 1.3;
290+ margin-bottom: 8px;
291+}
292+h4 {
293+ font-weight: bold;
294+}
295+
296+time {
297+ color:#999;
298+}
299+
300+/**
301+* @section Structure
302+*/
303+
304+.header-login,
305+.header-navigation div,
306+.header-content div {
307+ margin: 0 auto;
308+ width: 940px;
309+}
310+
311+.header-content h1{
312+ background-color:#ffffff;
313+ display:inline-block;
314+}
315+
316+.header-content h2{
317+ background-color:#ffffff;
318+ display:table;
319+}
320+
321+.header-login ul {
322+ margin: 4px 0;
323+ float: right;
324+}
325+.header-login li {
326+ margin-right: 10px;
327+ float: left;
328+}
329+.header-login a {
330+ color: #333;
331+}
332+.header-navigation {
333+ border-top: 2px solid #dd4814;
334+ border-bottom: 2px solid #dd4814;
335+ background-color: #fff;
336+ height: 54px;
337+ clear: right;
338+ overflow: hidden;
339+}
340+.header-navigation nav ul {
341+ border-right: 1px solid #dd4814;
342+ float: right;
343+}
344+.header-navigation nav li {
345+ border-left: 1px solid #dd4814;
346+ float: left;
347+ height: 54px;
348+}
349+.header-navigation nav a {
350+ padding: 18px 14px 0;
351+ font-size: 14px;
352+ display: block;
353+ height: 36px;
354+}
355+.header-navigation nav a:hover {
356+ background-color: #fcece7;
357+}
358+.header-navigation nav .current_page_item a,
359+.header-navigation nav .current_page_parent a,
360+.header-navigation nav .current_page_ancestor a {
361+ background-color: #dd4814;
362+ color: #fff;
363+}
364+.header-navigation input {
365+ margin: 12px 10px 0 10px;
366+ padding: 5px;
367+ border-top: 1px solid #a1a1a1;
368+ border-right: 1px solid #e0e0e0;
369+ border-bottom: 1px solid #fff;
370+ border-left: 1px solid #e0e0e0;
371+ width: 90px;
372+ font-style: italic;
373+ color: #ccc;
374+ -moz-border-radius: 3px;
375+ -webkit-border-radius: 3px;
376+ border-radius: 3px;
377+ -moz-box-shadow: inset 0 1px 1px #e0e0e0;
378+ -webkit-box-shadow: inset 0 1px 1px #e0e0e0;
379+ box-shadow: inset 0 1px 1px #e0e0e0;
380+}
381+.header-navigation h2 {
382+ margin: 18px 0 0 6px;
383+ text-transform: lowercase;
384+ font-size: 22px;
385+ color: #dd4814;
386+ float: left;
387+}
388+.header-navigation .logo-ubuntu {
389+ margin-top: 12px;
390+ float: left;
391+}
392+.header-content .header-navigation-secondary {
393+ margin-bottom: 40px;
394+ padding: 0;
395+ position: relative;
396+ z-index: 2;
397+}
398+.header-navigation-secondary div {
399+ padding: 0;
400+ border: 2px solid #dd4814;
401+ -moz-border-radius: 0px 0px 4px 4px;
402+ -webkit-border-radius: 0px 0px 4px 4px;
403+ border-radius: 0px 0px 4px 4px;
404+ background: #fff;
405+ border-top: 0px;
406+ width: 936px;
407+}
408+.header-navigation-secondary nav li {
409+ float: left;
410+}
411+.header-navigation-secondary nav li a {
412+ color: #333;
413+ display: block;
414+ height: 25px;
415+ padding: 8px 8px 0;
416+}
417+.header-navigation-secondary nav li:hover,
418+.header-navigation-secondary nav .current_page_item a {
419+ background: url("./images/sec-nav-hover.gif");
420+}
421+.header-content {
422+ padding-bottom: 30px;
423+ border-bottom: 1px solid #e0e0e0;
424+ -moz-box-shadow: 0 1px 3px #e0e0e0;
425+ -webkit-box-shadow: 0 1px 3px #e0e0e0;
426+ box-shadow: 0 1px 3px #e0e0e0;
427+ margin-bottom: 3px;
428+ position: relative;
429+ overflow: hidden;
430+}
431+footer {
432+ padding: 10px 10px 40px 10px;
433+ position: relative;
434+ -moz-border-radius: 0 0 4px 4px;
435+ -webkit-border-radius: 0 0 4px 4px;
436+ border-radius: 0 0 4px 4px;
437+ font-size: 12px;
438+ background: url("./images/background-footer.png") repeat scroll 0 0 #f7f6f5;
439+}
440+footer div {
441+ margin: 0 auto;
442+ padding: 0 10px;
443+ width: 940px;
444+}
445+footer a {
446+ color: #000;
447+}
448+footer nav ul {
449+ margin: 10px 17px 30px 0;
450+ width: 172px;
451+ display: inline-block;
452+ vertical-align: top;
453+ height: auto;
454+ zoom: 1;
455+ *display: inline;
456+}
457+footer nav ul.last {
458+ margin-right: 0;
459+}
460+footer nav li {
461+ margin-bottom: 8px;
462+}
463+footer nav li:first-child {
464+ font-weight: bold;
465+}
466+footer p {
467+ margin-bottom: 0;
468+}
469+#content {
470+ padding-top: 35px;
471+}
472+.arrow-nav {
473+ display: none;
474+ position: absolute;
475+ top: -1px;
476+ z-index: 3;
477+}
478+.shadow {
479+ margin: 30px 0 3px 0;
480+ border-bottom: 1px solid #e0e0e0;
481+ -moz-box-shadow: 0 2px 3px #e0e0e0;
482+ -webkit-box-shadow: 0 2px 3px #e0e0e0;
483+ box-shadow: 0 2px 3px #e0e0e0;
484+ height: 3px;
485+}
486+
487+/**
488+* @section Site-wide
489+*/
490+
491+#content h2{
492+ font-size:24px;
493+}
494+
495+.box-orange {
496+ padding: 10px;
497+ border: 3px solid #dd4814;
498+ -moz-border-radius: 4px;
499+ -webkit-border-radius: 4px;
500+ border-radius: 4px;
501+}
502+.box-orange .link-action-small {
503+ float: right;
504+ margin: 0 0 0 20px;
505+}
506+.link-bug {
507+ margin-left: 10px;
508+ color: #999;
509+}
510+.link-action {
511+ float: left;
512+ margin-bottom: 20px;
513+ padding: 8px 12px;
514+ display: block;
515+ background-color: #dd4814;
516+ color: #fff;
517+ -moz-border-radius: 20px;
518+ -webkit-border-radius: 20px;
519+ border-radius: 20px;
520+ font-size: 16px;
521+ line-height: 1.3;
522+ border-top: 3px solid #e6633a;
523+ border-bottom: 3px solid #c03d14;
524+}
525+.link-action2 {
526+ float: left;
527+ display: block;
528+ color: #fff;
529+ font-size: 16px;
530+ line-height: 1.3;
531+}
532+.link-action2 span{
533+ display:block;
534+ float:left;
535+}
536+.link-action2 .cta-left{
537+ background:url(./images/button-cta-left.png) no-repeat;
538+ width:22px;
539+ height:48px;
540+}
541+.link-action2 .cta-center{
542+ background:url(./images/button-cta-slice.png) repeat-x;
543+ line-height:45px;
544+ height:48px;
545+}
546+.link-action2 .cta-right{
547+ background:url(./images/button-cta-right.png) no-repeat;
548+ width:22px;
549+ height:48px;
550+}
551+
552+.link-action-small {
553+ float: left;
554+ display: block;
555+ color: #fff;
556+ font-size: 16px;
557+}
558+.link-action-small span{
559+ display:block;
560+ float:left;
561+ height:42px;
562+}
563+.link-action-small .cta-left{
564+ background:url(./images/button-cta-left-small.png) no-repeat;
565+ width:19px;
566+}
567+.link-action-small .cta-center{
568+ background:url(./images/button-cta-slice-small.png) repeat-x;
569+ line-height:42px;
570+}
571+.link-action-small .cta-right{
572+ background:url(./images/button-cta-right-small.png) no-repeat;
573+ width:19px;
574+}
575+
576+.link-action:active {
577+ position: relative;
578+ top: 1px;
579+}
580+.link-action2:active {
581+ position: relative;
582+ top: 1px;
583+}
584+.link-action-small:active {
585+ position: relative;
586+ top: 1px;
587+}
588+.list-bullets li {
589+ margin-bottom: 10px;
590+ list-style: disc;
591+ list-style-position: inside;
592+}
593+.box {
594+ margin-bottom: 30px;
595+ padding: 15px;
596+ border: 1px solid #aea79f;
597+ -moz-border-radius: 4px;
598+ -webkit-border-radius: 4px;
599+ border-radius: 4px;
600+}
601+.box-padded {
602+ margin-bottom: 30px;
603+ padding: 5px;
604+ border: 2px solid #aea79f;
605+ -moz-border-radius: 4px;
606+ -webkit-border-radius: 4px;
607+ border-radius: 4px;
608+ background: url("./images/pattern-featured.gif") repeat scroll 0 0 #ebe9e7;
609+ overflow: hidden;
610+}
611+.box-padded h3 {
612+ margin: 5px 0 10px 5px;
613+}
614+.box-padded div {
615+ padding: 10px;
616+ border: 1px solid #aea79f;
617+ -moz-border-radius: 4px;
618+ -webkit-border-radius: 4px;
619+ border-radius: 4px;
620+ background-color: #fff;
621+ overflow: hidden;
622+}
623+.box-padded li {
624+ padding: 0 10px;
625+ float: left;
626+ width: 211px;
627+ border-right: 1px dotted #aea79f;
628+}
629+.box-padded li.first {
630+ padding: 0;
631+ margin-bottom: 0;
632+}
633+.box-padded li.last {
634+ border: 0;
635+ width: 217px;
636+}
637+.box-padded img {
638+ margin: 0 10px 50px 0;
639+ float: left;
640+ -moz-border-radius: 8px;
641+ -webkit-border-radius: 8px;
642+ border-radius: 8px;
643+}
644+.box-clear {
645+ margin-bottom: 40px;
646+}
647+.box-clear .grid-4.first {
648+ margin-right: 15px;
649+ padding-right: 15px;
650+}
651+.box-clear .grid-4 {
652+ margin-left: 0;
653+ margin-right: 10px;
654+ padding-right: 10px;
655+ width: 298px;
656+}
657+.box-clear time {
658+ display: block;
659+ border-bottom: 1px dotted #aea79f;
660+ padding-bottom: 10px;
661+ margin-bottom: 10px;
662+}
663+.box-clear div.first {
664+ border-right: 1px dotted #aea79f;
665+}
666+.box-clear a {
667+ display: block;
668+}
669+.box-clear .rss {
670+ background: url("./images/rss.jpg") no-repeat scroll 0 center;
671+ padding-left: 20px;
672+}
673+.box-clear .location {
674+ display: block;
675+ margin-bottom: 1px;
676+}
677+.box-clear .last {
678+ margin: 0;
679+ padding-right: 0;
680+ -moz-border-radius: 4px;
681+ -webkit-border-radius: 4px;
682+ border-radius: 4px;
683+ width: 293px;
684+}
685+
686+/* Widgets */
687+
688+.ui-state-focus {
689+ outline: none;
690+}
691+.ui-accordion {
692+ border-bottom: 1px dotted #aea79f;
693+}
694+.ui-accordion a {
695+ display: block;
696+}
697+.ui-accordion h3 {
698+ margin-bottom: 0;
699+ border-top: 1px dotted #aea79f;
700+ position: relative;
701+ font-size: 13px;
702+ font-weight: bold;
703+}
704+.ui-accordion h3 a {
705+ padding: 10px 0;
706+ color: #333;
707+}
708+.ui-accordion h4 {
709+ margin-bottom: 5px;
710+}
711+.ui-accordion div fieldset {
712+ padding-bottom: 5px;
713+}
714+.ui-accordion div li,
715+.ui-accordion div input {
716+ margin-bottom: 10px;
717+}
718+.ui-accordion .ui-icon {
719+ position: absolute;
720+ top: 15px;
721+ right: 0;
722+ display: block;
723+ width: 8px;
724+ height: 8px;
725+ background: url("./images/icon-accordion-inactive.png") 0 0 no-repeat transparent;
726+}
727+.ui-accordion .ui-state-active .ui-icon {
728+ background-image: url("./images/icon-accordion-active.png");
729+}
730+.ui-accordion .current_page_item a {
731+ color: #333;
732+}
733+.container-tweet {
734+ -moz-border-radius: 4px 4px 4px 4px;
735+ -webkit-border-radius: 4px 4px 4px 4px;
736+ border-radius: 4px 4px 4px 4px;
737+ padding: 10px 10px 10px;
738+ background-color: #f7f7f7;
739+}
740+.container-tweet .tweet-follow {
741+ margin-top: 10px;
742+ margin-bottom: -10px;
743+ padding-left: 55px;
744+ padding-bottom: 6px;
745+ background: url("./images/tweet-follow.png") 0 5px no-repeat;
746+ display: block;
747+}
748+.container-tweet .tweet-follow span {
749+ font-size: 16px;
750+ font-weight: bold;
751+ line-height: 1.2;
752+ display: block;
753+}
754+.tweet a {
755+ display: inline;
756+}
757+.tweet .tweet_text {
758+ padding: 10px;
759+ background-color: #fff;
760+ -moz-border-radius: 4px 4px 4px 4px;
761+ -webkit-border-radius: 4px 4px 4px 4px;
762+ border-radius: 4px 4px 4px 4px;
763+ border: 1px solid #dd4814;
764+ font-size: 16px;
765+ display: block;
766+ clear: both;
767+}
768+.tweet.tweet-small .tweet_text {
769+ font-size: inherit;
770+}
771+.tweet .tweet_text a {
772+ color: #333;
773+}
774+.tweet .tweet_time,
775+.tweet .tweet_user_and_time {
776+ padding: 15px 0 10px 0;
777+ position: relative;
778+ top: -2px;
779+ background: url("./images/tweet-arrow.png") no-repeat;
780+ display: block;
781+}
782+.tweet .tweet_odd .tweet_time,
783+.tweet .tweet_odd .tweet_user_and_time {
784+ background-position: right 0;
785+ float: right;
786+}
787+.tweet .tweet_even .tweet_time,
788+.tweet .tweet_even .tweet_user_and_time {
789+ background-position: left 0;
790+ float: left;
791+}
792+
793+/* Search */
794+
795+#content .list-search li {
796+ list-style-type:none;
797+ border:0px;
798+ margin-bottom: 15px;
799+ padding-top: 15px;
800+}
801+
802+/* Blog */
803+
804+.blog-article #nav-single {
805+ margin-top: 30px;
806+ margin-bottom: 30px;
807+}
808+.blog-article #nav-single .nav-next {
809+ float: right;
810+}
811+.blog-article article header .entry-meta {
812+ margin-bottom: 20px;
813+}
814+.blog-article article .entry-meta {
815+ color: #999;
816+}
817+.blog-article #respond form input[type="submit"] {
818+ float: left;
819+ cursor: pointer;
820+ margin-bottom: 20px;
821+ padding: 8px 12px;
822+ display: block;
823+ background-color: #dd4814;
824+ color: #fff;
825+ -moz-border-radius: 20px;
826+ -webkit-border-radius: 20px;
827+ border-radius: 20px;
828+ font-size: 16px;
829+ line-height: 1.3;
830+ border-top: 3px solid #e6633a;
831+ border-left: 3px solid #e6633a;
832+ border-right: 3px solid #e6633a;
833+ border-bottom: 3px solid #c03d14;
834+}
835+.blog-article #respond form input[type="submit"]:active {
836+ position: relative;
837+ top: 1px;
838+}
839+
840+.alignnone{
841+ float:left;
842+ margin:10px 20px 10px 0;
843+}
844+.alignleft{
845+ float:left;
846+ margin:10px 20px 10px 0;
847+}
848+.alignright{
849+ float:right;
850+ margin:10px 0 10px 20px;
851+}
852+
853+.aligncenter{
854+ float:left;
855+ margin:10px 20px 10px 0;
856+}
857+.entry-content h2, .entry-content h3{
858+ margin-top:20px;
859+}
860+.entry-content ul li{
861+ list-style-type: circle;
862+ margin-left:16px;
863+}
864+
865+.entry-content hr{
866+ border:none;
867+ border-top: 1px dotted #AEA79F;
868+}
869
870=== added file 'themes/ubuntu/static/home.css'
871--- themes/ubuntu/static/home.css 1970-01-01 00:00:00 +0000
872+++ themes/ubuntu/static/home.css 2012-01-28 12:45:28 +0000
873@@ -0,0 +1,234 @@
874+/**
875+* Ubuntu Developer page stylesheet
876+*
877+* A stylesheet for the 'home' page
878+*
879+* @project Ubuntu Developer
880+* @version 1.0
881+* @author Canonical Web Team: Steve Edwards and Ant Dillon
882+* @copyright 2011 Canonical Ltd.
883+*/
884+
885+.home header {
886+ background: #fff;
887+}
888+.home .header-content {
889+ background: url("./images/background-header-home.png") 0 0 repeat #fff;
890+}
891+.home .header-content h1 {
892+ font-size: 36px;
893+ background: #fff;
894+}
895+.home .header-content h2 {
896+ font-size: 20px;
897+ line-height: 1.4;
898+ width: 440px;
899+ background: #fff;
900+}
901+.home .header-content a .cta-center{
902+ margin-top: 20px;
903+ font-size: 20px;
904+ line-height: 2.4;
905+}
906+.home .header-content a .cta-right, .home .header-content a .cta-left {
907+ margin-top: 20px;
908+}
909+.home .header-image {
910+ background: url("./images/dotted-logo.png") no-repeat scroll 122px -24px transparent;
911+ float: right;
912+ height: 332px;
913+ margin-bottom: -35px;
914+ margin-right: -163px;
915+ margin-top: -53px;
916+ width: 571px;
917+ position: relative;
918+ z-index: 1;
919+}
920+.home .header-image img {
921+ -moz-box-shadow: 0 9px 4px 4px #e0e0e0;
922+ -webkit-box-shadow: 0 9px 4px 4px #e0e0e0;
923+ box-shadow: 0 9px 4px 4px #e0e0e0;
924+ margin-bottom: -74px;
925+ margin-left: -52px;
926+ margin-top: 77px;
927+}
928+
929+.box-steps {
930+ margin-bottom: 30px;
931+ border: 3px solid #dd4814;
932+ -moz-border-radius: 4px;
933+ -webkit-border-radius: 4px;
934+ border-radius: 4px;
935+ -moz-box-shadow: 0 3px 1px #e0e0e0;
936+ -webkit-box-shadow: 0 3px 1px #e0e0e0;
937+ box-shadow: 0 3px 1px #e0e0e0;
938+}
939+.box-steps li {
940+ padding: 15px;
941+ float: left;
942+ width: 203px;
943+ border-right: 1px solid #dd4814;
944+ text-align: center;
945+ min-height: 237px;
946+}
947+.box-steps li.last {
948+ border: 0;
949+ width: 202px;
950+}
951+.box-steps span {
952+ padding: 4px;
953+ margin: 10px auto 0;
954+ display: block;
955+ border: 3px solid #dd4814;
956+ -moz-border-radius: 40px;
957+ -webkit-border-radius: 40px;
958+ border-radius: 40px;
959+ text-align: center;
960+ font-size: 36px;
961+ width: 50px;
962+ color: #dd4814;
963+ -moz-box-shadow: 0 2px 1px #e0e0e0;
964+ -webkit-box-shadow: 0 2px 1px #e0e0e0;
965+ box-shadow: 0 2px 1px #e0e0e0;
966+}
967+.box-steps h3 {
968+ margin: 10px 0 15px;
969+}
970+.box-steps p {
971+ padding-top: 15px;
972+ text-align: left;
973+ border-top: 1px dotted #aea79f;
974+}
975+.box-steps a {
976+ color: #333;
977+}
978+.box-steps li:hover {
979+ background-color: #fcece7;
980+ cursor: pointer;
981+}
982+.box-steps li:hover span {
983+ background-color: #dd4814;
984+ color: #fff;
985+}
986+.box-steps li:hover a {
987+ color: #dd4814;
988+}
989+.box ul li {
990+ margin: 0 30px 20px 0;
991+ width: 282px;
992+ float: left;
993+}
994+.box ul li.last {
995+ margin-right: 0;
996+}
997+.box ul li img {
998+ margin: 0 0 10px 10px;
999+ float: right;
1000+}
1001+.box h4 {
1002+ padding-bottom: 10px;
1003+}
1004+.box h2 {
1005+ margin-bottom: 30px;
1006+}
1007+.box .link-action-small {
1008+ float: right;
1009+ margin-bottom: 0px;
1010+}
1011+
1012+/*blockquote {
1013+ margin-bottom: 30px;
1014+ padding: 32px 10px;
1015+ border-top: 1px dotted #aea69e;
1016+ border-bottom: 1px dotted #aea69e;
1017+ background: url("./images/quotes.png") no-repeat scroll 5px center;
1018+}
1019+blockquote p {
1020+ padding: 12px 65px;
1021+ font-size: 24px;
1022+ height: 54px;
1023+}
1024+blockquote cite {
1025+ margin-left: 65px;
1026+ font-size: 16px;
1027+}*/
1028+
1029+.slider{
1030+ width:10000px;
1031+ margin-left:-10px;
1032+}
1033+
1034+.box-padded .slider-controls{
1035+ background-color: transparent;
1036+ border-radius:0px;
1037+ padding: 0px;
1038+ float:right;
1039+ border:0px;
1040+ width:200px;
1041+}
1042+
1043+.slider-controls .next{
1044+ background:url("./images/arrow-sliders.png") no-repeat scroll -29px 0;
1045+ height:31px;
1046+ width:34px;
1047+}
1048+
1049+.slider-controls .prev{
1050+ background:url("./images/arrow-sliders.png") no-repeat scroll 0 0;
1051+ height:31px;
1052+ width:29px;
1053+}
1054+
1055+.slider-controls div{
1056+ float:right;
1057+ padding:0px;
1058+ cursor: pointer;
1059+ border: none;
1060+ -moz-border-radius: 0px;
1061+ -webkit-border-radius: 0px;
1062+ border-radius: 0px;
1063+}
1064+
1065+.slider-controls .prev.disabled{
1066+ background-position: 0 -29px;
1067+ cursor: default;
1068+}
1069+
1070+.slider-controls .next.disabled{
1071+ background-position: -29px -29px;
1072+ cursor: default;
1073+}
1074+
1075+.slider-jump{
1076+ width:66px;
1077+ margin:0px auto;
1078+ padding-left: 33px;
1079+ padding-top:10px;
1080+}
1081+.slider-jump li{
1082+ width:9px;
1083+ height:9px;
1084+ background:transparent;
1085+ border:1px solid #aea79f;
1086+ -moz-border-radius:5px 5px 5px 5px;
1087+ -webkit-border-radius:5px 5px 5px 5px;
1088+ border-radius:5px 5px 5px 5px;
1089+ float:left;
1090+ margin-right:5px;
1091+ cursor: pointer;
1092+ padding: 0 0;
1093+}
1094+
1095+.slider-jump .active{
1096+ background:#aea79f;
1097+ cursor: default;
1098+}
1099+
1100+.box-padded li .price{
1101+ font-weight: bold;
1102+}
1103+
1104+.box-padded li.no-border{
1105+ border: 0 none;
1106+}
1107+
1108
1109=== added file 'themes/ubuntu/static/images/background-footer.png'
1110Binary 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-28 12:45:28 +0000 differ
1111=== added file 'themes/ubuntu/static/images/background-header-home.png'
1112Binary 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-28 12:45:28 +0000 differ
1113=== added file 'themes/ubuntu/static/images/sec-nav-hover.gif'
1114Binary 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-28 12:45:28 +0000 differ
1115=== added file 'themes/ubuntu/static/reset.css'
1116--- themes/ubuntu/static/reset.css 1970-01-01 00:00:00 +0000
1117+++ themes/ubuntu/static/reset.css 2012-01-28 12:45:28 +0000
1118@@ -0,0 +1,8 @@
1119+/*
1120+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
1121+Code licensed under the BSD License:
1122+http://developer.yahoo.com/yui/license.html
1123+version: 3.3.0
1124+build: 3167
1125+*/
1126+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;}
1127\ No newline at end of file

Subscribers

People subscribed via source and target branches