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
=== modified file 'themes/ubuntu/layout.html'
--- themes/ubuntu/layout.html 2011-10-20 04:30:22 +0000
+++ themes/ubuntu/layout.html 2012-01-28 12:45:28 +0000
@@ -20,30 +20,37 @@
20 20
2121
22{%- macro relbar() %}22{%- macro relbar() %}
23 <aside id="page-related">23<div class="header-content">
24 <div class="container" id="sub-nav-container" > 24 <div class="clearfix">
25 <nav id="sub-nav"> 25 <!--<img class="arrow-nav" src="http://developer.ubuntu.com/wp-content/themes/wordpress-theme-ubuntudeveloper/img/arrow-nav.png" width="9" height="5" alt="" />-->
26 <div class="header-navigation-secondary">
27 <div>
28 <nav role="navigation">
29 <ul class="clearfix">
26 {%- for rellink in rellinks %}30 {%- for rellink in rellinks %}
27 <a class="sub-nav-item" {% if loop.first %}style="margin-right: 10px"{% endif %} 31 <li class="page_item"><a {% if loop.first %}style="margin-right: 10px"{% endif %}
28 href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"32 href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
29 {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>33 {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a></li>
30 {%- endfor %}34 {%- endfor %}
31 {%- block rootrellink %}35 {%- block rootrellink %}
32 <a class="sub-nav-item" href="{{ pathto(master_doc) }}">{{ shorttitle|e }} {{ reldelim1 }}</a>36 <li class="page_item"><a class="sub-nav-item" href="{{ pathto(master_doc) }}">{{ shorttitle|e }} {{ reldelim1 }}</a></li>
33 {%- endblock %}37 {%- endblock %}
34 {%- for parent in parents %}38 {%- for parent in parents %}
35 <a class="sub-nav-item" href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }} {{ reldelim1 }}</a>39 <li class="page_item"><a class="sub-nav-item" href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }} {{ reldelim1 }}</a></li>
36 {%- endfor %}40 {%- endfor %}
37 {%- block relbaritems %} {% endblock %}41 {%- block relbaritems %} {% endblock %}
38 </nav>42 </ul>
39 </div>43 </nav>
40</aside> 44 </div>
45</div>
46</div>
47</div>
41{%- endmacro %}48{%- endmacro %}
4249
43{%- macro sidebar() %}50{%- macro sidebar() %}
44 {%- if render_sidebar %}51 {%- if render_sidebar %}
45 <div class="sphinxsidebar">52 <div class="grid-3 omega">
46 <div class="sphinxsidebarwrapper">53 <div class="container-tweet">
47 {%- block sidebarlogo %}54 {%- block sidebarlogo %}
48 {%- if logo %}55 {%- if logo %}
49 <p class="logo"><a href="{{ pathto(master_doc) }}">56 <p class="logo"><a href="{{ pathto(master_doc) }}">
@@ -91,8 +98,12 @@
91 {%- block htmltitle %}98 {%- block htmltitle %}
92 <title>{{ title|striptags|e }}{{ titlesuffix }}</title>99 <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
93 {%- endblock %}100 {%- endblock %}
94 <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />101 <!--<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />-->
95 <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />102 <link rel="stylesheet" href="{{ pathto('_static/reset.css', 1) }}" type="text/css" />
103 <link rel="stylesheet" href="{{ pathto('_static/960.css', 1) }}" type="text/css" />
104 <link rel="stylesheet" href="{{ pathto('_static/base.css', 1) }}" type="text/css" />
105 <link rel="stylesheet" href="{{ pathto('_static/home.css', 1) }}" type="text/css" />
106 <!--<link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />-->
96 {%- for cssfile in css_files %}107 {%- for cssfile in css_files %}
97 <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />108 <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
98 {%- endfor %}109 {%- endfor %}
@@ -144,7 +155,7 @@
144{%- endblock %}155{%- endblock %}
145{%- block extrahead %} {% endblock %}156{%- block extrahead %} {% endblock %}
146 </head>157 </head>
147 <body id="home">158 <body class="home">
148159
149<!--160<!--
150<aside id="top-nav"> 161<aside id="top-nav">
@@ -163,6 +174,34 @@
163</aside>174</aside>
164-->175-->
165176
177<div class="header-login">
178 <ul>
179 <li><a href="https://myapps.developer.ubuntu.com/openid/login/?next=/dev">Sign in or register</a></li>
180 </ul>
181</div>
182
183<div class="header-navigation">
184 <div>
185 <nav role="navigation">
186 <ul>
187 <li class="page_item current_page_item"><a title="Index" href="index.html">Index</a>
188 <li>
189 <form id="form-search" method="get" action="/">
190 <fieldset>
191 <input id="input-search" type="text" name="s" value="Search" />
192 </fieldset>
193 </form>
194 </li>
195 </ul>
196 </nav>
197 <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>
198 <h2><a href="/">App Developer</a></h2>
199 </div>
200 </div>
201
202{%- block relbar1 %}{{ relbar() }}{% endblock %}
203
204<!--
166<header id="page-header"> 205<header id="page-header">
167 <div class="container" > 206 <div class="container" >
168 <nav id="main-nav"> 207 <nav id="main-nav">
@@ -170,38 +209,76 @@
170 </nav> 209 </nav>
171 </div> 210 </div>
172</header>211</header>
212-->
173213
174{%- block header %}{% endblock %}214{%- block header %}{% endblock %}
175215
176{%- block relbar1 %}{{ relbar() }}{% endblock %}
177
178{%- block content %}216{%- block content %}
179 {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}217
180218<div id="content" class="container-12">
181 <section id="main-section">219 <div class="grid-12">
220
221{%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
222
223 <!--<section id="main-section">-->
182 {%- block document %}224 {%- block document %}
183 <div class="container" >
184 {%- if render_sidebar %}225 {%- if render_sidebar %}
185 <section id="content">
186 {%- endif %}226 {%- endif %}
187 <div class="body">227
188 {%- block sidebar2 %}{{ sidebar() }}{% endblock %} 228 <div class="grid-9 alpha">
229
189 {% block body %} {% endblock %}230 {% block body %} {% endblock %}
190 <div class="divide"></div>231 <div class="divide"></div>
191232
192 </div>233 </div>
234
235 {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
193 {%- if render_sidebar %}236 {%- if render_sidebar %}
194 </section>
195 {%- endif %}237 {%- endif %}
196 </div>
197 {%- endblock %}238 {%- endblock %}
198 </section>239 <!--</section>-->
240 </div>
241</div>
199{%- endblock %}242{%- endblock %}
200243
201{%- block footer %}244{%- block footer %}
202 <footer id="page-footer"> 245<div class="shadow"></div>
203 <div class="container">246<footer>
204 <div class="copyright"> 247 <div>
248 <nav role="navigation" class="clearfix">
249 <ul>
250 <li><a href="/get-started">Get started</a></li>
251 <li class="page_item page-item-16"><a href="http://developer.ubuntu.com/get-started/quickly-workflow/" title="Quickly workflow">Quickly workflow</a></li>
252<li class="page_item page-item-18"><a href="http://developer.ubuntu.com/get-started/qt-creator/" title="Qt Creator">Qt Creator</a></li>
253<li class="page_item page-item-20"><a href="http://developer.ubuntu.com/get-started/eclipse/" title="Eclipse">Eclipse</a></li>
254<li class="page_item page-item-22"><a href="http://developer.ubuntu.com/get-started/monodevelop/" title="MonoDevelop">MonoDevelop</a></li>
255 </ul>
256 <ul>
257 <li><a href="/resources">Resources</a></li>
258 <li><a href="/resources/tools/quickly">Quickly</a></li>
259 <li><a href="/resources/platform/api">API</a></li>
260 <li><a href="/resources/platform/documentation/platform-diagram">Platform overview</a></li>
261 </ul>
262 <ul>
263 <li><a href="/publish">Publish</a></li>
264 <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>
265<li class="page_item page-item-34"><a href="http://developer.ubuntu.com/publish/application-states/" title="Application states">Application states</a></li>
266<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>
267<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>
268<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>
269 </ul>
270 <ul>
271 <li><a href="/community">Community</a></li>
272 <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>
273<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>
274<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>
275 </ul>
276 <ul class="last">
277 <li><a href="https://myapps.developer.ubuntu.com/dev">My Apps</a></li>
278 <li><a href="https://myapps.developer.ubuntu.com/openid/login/?next=/dev">Sign in or register</a></li>
279 <li><a href="https://myapps.developer.ubuntu.com/dev/account">My account</a></li>
280 </ul>
281 </nav>
205 {%- if show_copyright %}282 {%- if show_copyright %}
206 {%- if hasdoc('copyright') %}283 {%- if hasdoc('copyright') %}
207 {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}284 {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
@@ -217,9 +294,10 @@
217 {%- if show_sphinx %}294 {%- if show_sphinx %}
218 {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}295 {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
219 {%- endif %}296 {%- endif %}
220 </div> 297
221 </div>298 <!--<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>-->
222 </footer>299 </div>
300</footer>
223{%- endblock %}301{%- endblock %}
224 </body>302 </body>
225</html>303</html>
226304
=== 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-28 12:45:28 +0000
@@ -0,0 +1,1 @@
1body{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}
0\ No newline at end of file2\ No newline at end of file
13
=== 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-28 12:45:28 +0000
@@ -0,0 +1,638 @@
1/**
2* Ubuntu Developer base stylesheet
3*
4* A base stylesheet containing site-wide styles
5*
6* @project Ubuntu Developer
7* @version 1.0
8* @author Canonical Web Team: Steve Edwards
9* @copyright 2011 Canonical Ltd.
10*/
11
12/**
13* @section Global
14*/
15
16body {
17 font-family: 'Ubuntu', 'Ubuntu Beta', UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
18 font-size: 13px;
19 line-height: 1.4;
20 color: #333;
21}
22a {
23 color: #dd4814;
24 text-decoration: none;
25 outline: 0;
26}
27p, dl {
28 margin-bottom: 10px;
29}
30strong {
31 font-weight: bold;
32}
33em {
34 font-style: italic;
35}
36code{
37 padding: 10px;
38 font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace;
39 background-color: #fdf6f2;
40 display: block;
41 margin-bottom: 10px;
42 -moz-border-radius: 4px;
43 -webkit-border-radius: 4px;
44 border-radius: 4px;
45}
46h1 {
47 font-size: 36px;
48 line-height: 1.1;
49 margin-bottom: 20px;
50}
51article h1,
52h2 {
53 font-size: 24px;
54 line-height: 1.2;
55 margin-bottom: 14px;
56}
57h3 {
58 font-size: 16px;
59 line-height: 1.3;
60 margin-bottom: 8px;
61}
62h4 {
63 font-weight: bold;
64}
65
66time {
67 color:#999;
68}
69
70/**
71* @section Structure
72*/
73
74.header-login,
75.header-navigation div,
76.header-content div {
77 margin: 0 auto;
78 width: 940px;
79}
80
81.header-content h1{
82 background-color:#ffffff;
83 display:inline-block;
84}
85
86.header-content h2{
87 background-color:#ffffff;
88 display:table;
89}
90
91.header-login ul {
92 margin: 4px 0;
93 float: right;
94}
95.header-login li {
96 margin-right: 10px;
97 float: left;
98}
99.header-login a {
100 color: #333;
101}
102.header-navigation {
103 border-top: 2px solid #dd4814;
104 border-bottom: 2px solid #dd4814;
105 background-color: #fff;
106 height: 54px;
107 clear: right;
108 overflow: hidden;
109}
110.header-navigation nav ul {
111 border-right: 1px solid #dd4814;
112 float: right;
113}
114.header-navigation nav li {
115 border-left: 1px solid #dd4814;
116 float: left;
117 height: 54px;
118}
119.header-navigation nav a {
120 padding: 18px 14px 0;
121 font-size: 14px;
122 display: block;
123 height: 36px;
124}
125.header-navigation nav a:hover {
126 background-color: #fcece7;
127}
128.header-navigation nav .current_page_item a,
129.header-navigation nav .current_page_parent a,
130.header-navigation nav .current_page_ancestor a {
131 background-color: #dd4814;
132 color: #fff;
133}
134.header-navigation input {
135 margin: 12px 10px 0 10px;
136 padding: 5px;
137 border-top: 1px solid #a1a1a1;
138 border-right: 1px solid #e0e0e0;
139 border-bottom: 1px solid #fff;
140 border-left: 1px solid #e0e0e0;
141 width: 90px;
142 font-style: italic;
143 color: #ccc;
144 -moz-border-radius: 3px;
145 -webkit-border-radius: 3px;
146 border-radius: 3px;
147 -moz-box-shadow: inset 0 1px 1px #e0e0e0;
148 -webkit-box-shadow: inset 0 1px 1px #e0e0e0;
149 box-shadow: inset 0 1px 1px #e0e0e0;
150}
151.header-navigation h2 {
152 margin: 18px 0 0 6px;
153 text-transform: lowercase;
154 font-size: 22px;
155 color: #dd4814;
156 float: left;
157}
158.header-navigation .logo-ubuntu {
159 margin-top: 12px;
160 float: left;
161}
162.header-content .header-navigation-secondary {
163 margin-bottom: 40px;
164 padding: 0;
165 position: relative;
166 z-index: 2;
167}
168.header-navigation-secondary div {
169 padding: 0;
170 border: 2px solid #dd4814;
171 -moz-border-radius: 0px 0px 4px 4px;
172 -webkit-border-radius: 0px 0px 4px 4px;
173 border-radius: 0px 0px 4px 4px;
174 background: #fff;
175 border-top: 0px;
176 width: 936px;
177}
178.header-navigation-secondary nav li {
179 float: left;
180}
181.header-navigation-secondary nav li a {
182 color: #333;
183 display: block;
184 height: 25px;
185 padding: 8px 8px 0;
186}
187.header-navigation-secondary nav li:hover,
188.header-navigation-secondary nav .current_page_item a {
189 background: url("./images/sec-nav-hover.gif");
190}
191.header-content {
192 padding-bottom: 30px;
193 border-bottom: 1px solid #e0e0e0;
194 -moz-box-shadow: 0 1px 3px #e0e0e0;
195 -webkit-box-shadow: 0 1px 3px #e0e0e0;
196 box-shadow: 0 1px 3px #e0e0e0;
197 margin-bottom: 3px;
198 position: relative;
199 overflow: hidden;
200}
201footer {
202 padding: 10px 10px 40px 10px;
203 position: relative;
204 -moz-border-radius: 0 0 4px 4px;
205 -webkit-border-radius: 0 0 4px 4px;
206 border-radius: 0 0 4px 4px;
207 font-size: 12px;
208 background: url("./images/background-footer.png") repeat scroll 0 0 #f7f6f5;
209}
210footer div {
211 margin: 0 auto;
212 padding: 0 10px;
213 width: 940px;
214}
215footer a {
216 color: #000;
217}
218footer nav ul {
219 margin: 10px 17px 30px 0;
220 width: 172px;
221 display: inline-block;
222 vertical-align: top;
223 height: auto;
224 zoom: 1;
225 *display: inline;
226}
227footer nav ul.last {
228 margin-right: 0;
229}
230footer nav li {
231 margin-bottom: 8px;
232}
233footer nav li:first-child {
234 font-weight: bold;
235}
236footer p {
237 margin-bottom: 0;
238}
239#content {
240 padding-top: 35px;
241}
242.arrow-nav {
243 display: none;
244 position: absolute;
245 top: -1px;
246 z-index: 3;
247}
248.shadow {
249 margin: 30px 0 3px 0;
250 border-bottom: 1px solid #e0e0e0;
251 -moz-box-shadow: 0 2px 3px #e0e0e0;
252 -webkit-box-shadow: 0 2px 3px #e0e0e0;
253 box-shadow: 0 2px 3px #e0e0e0;
254 height: 3px;
255}
256
257/**
258* @section Site-wide
259*/
260
261#content h2{
262 font-size:24px;
263}
264
265.box-orange {
266 padding: 10px;
267 border: 3px solid #dd4814;
268 -moz-border-radius: 4px;
269 -webkit-border-radius: 4px;
270 border-radius: 4px;
271}
272.box-orange .link-action-small {
273 float: right;
274 margin: 0 0 0 20px;
275}
276.link-bug {
277 margin-left: 10px;
278 color: #999;
279}
280.link-action {
281 float: left;
282 margin-bottom: 20px;
283 padding: 8px 12px;
284 display: block;
285 background-color: #dd4814;
286 color: #fff;
287 -moz-border-radius: 20px;
288 -webkit-border-radius: 20px;
289 border-radius: 20px;
290 font-size: 16px;
291 line-height: 1.3;
292 border-top: 3px solid #e6633a;
293 border-bottom: 3px solid #c03d14;
294}
295.link-action2 {
296 float: left;
297 display: block;
298 color: #fff;
299 font-size: 16px;
300 line-height: 1.3;
301}
302.link-action2 span{
303 display:block;
304 float:left;
305}
306.link-action2 .cta-left{
307 background:url(./images/button-cta-left.png) no-repeat;
308 width:22px;
309 height:48px;
310}
311.link-action2 .cta-center{
312 background:url(./images/button-cta-slice.png) repeat-x;
313 line-height:45px;
314 height:48px;
315}
316.link-action2 .cta-right{
317 background:url(./images/button-cta-right.png) no-repeat;
318 width:22px;
319 height:48px;
320}
321
322.link-action-small {
323 float: left;
324 display: block;
325 color: #fff;
326 font-size: 16px;
327}
328.link-action-small span{
329 display:block;
330 float:left;
331 height:42px;
332}
333.link-action-small .cta-left{
334 background:url(./images/button-cta-left-small.png) no-repeat;
335 width:19px;
336}
337.link-action-small .cta-center{
338 background:url(./images/button-cta-slice-small.png) repeat-x;
339 line-height:42px;
340}
341.link-action-small .cta-right{
342 background:url(./images/button-cta-right-small.png) no-repeat;
343 width:19px;
344}
345
346.link-action:active {
347 position: relative;
348 top: 1px;
349}
350.link-action2:active {
351 position: relative;
352 top: 1px;
353}
354.link-action-small:active {
355 position: relative;
356 top: 1px;
357}
358.list-bullets li {
359 margin-bottom: 10px;
360 list-style: disc;
361 list-style-position: inside;
362}
363.box {
364 margin-bottom: 30px;
365 padding: 15px;
366 border: 1px solid #aea79f;
367 -moz-border-radius: 4px;
368 -webkit-border-radius: 4px;
369 border-radius: 4px;
370}
371.box-padded {
372 margin-bottom: 30px;
373 padding: 5px;
374 border: 2px solid #aea79f;
375 -moz-border-radius: 4px;
376 -webkit-border-radius: 4px;
377 border-radius: 4px;
378 background: url("./images/pattern-featured.gif") repeat scroll 0 0 #ebe9e7;
379 overflow: hidden;
380}
381.box-padded h3 {
382 margin: 5px 0 10px 5px;
383}
384.box-padded div {
385 padding: 10px;
386 border: 1px solid #aea79f;
387 -moz-border-radius: 4px;
388 -webkit-border-radius: 4px;
389 border-radius: 4px;
390 background-color: #fff;
391 overflow: hidden;
392}
393.box-padded li {
394 padding: 0 10px;
395 float: left;
396 width: 211px;
397 border-right: 1px dotted #aea79f;
398}
399.box-padded li.first {
400 padding: 0;
401 margin-bottom: 0;
402}
403.box-padded li.last {
404 border: 0;
405 width: 217px;
406}
407.box-padded img {
408 margin: 0 10px 50px 0;
409 float: left;
410 -moz-border-radius: 8px;
411 -webkit-border-radius: 8px;
412 border-radius: 8px;
413}
414.box-clear {
415 margin-bottom: 40px;
416}
417.box-clear .grid-4.first {
418 margin-right: 15px;
419 padding-right: 15px;
420}
421.box-clear .grid-4 {
422 margin-left: 0;
423 margin-right: 10px;
424 padding-right: 10px;
425 width: 298px;
426}
427.box-clear time {
428 display: block;
429 border-bottom: 1px dotted #aea79f;
430 padding-bottom: 10px;
431 margin-bottom: 10px;
432}
433.box-clear div.first {
434 border-right: 1px dotted #aea79f;
435}
436.box-clear a {
437 display: block;
438}
439.box-clear .rss {
440 background: url("./images/rss.jpg") no-repeat scroll 0 center;
441 padding-left: 20px;
442}
443.box-clear .location {
444 display: block;
445 margin-bottom: 1px;
446}
447.box-clear .last {
448 margin: 0;
449 padding-right: 0;
450 -moz-border-radius: 4px;
451 -webkit-border-radius: 4px;
452 border-radius: 4px;
453 width: 293px;
454}
455
456/* Widgets */
457
458.ui-state-focus {
459 outline: none;
460}
461.ui-accordion {
462 border-bottom: 1px dotted #aea79f;
463}
464.ui-accordion a {
465 display: block;
466}
467.ui-accordion h3 {
468 margin-bottom: 0;
469 border-top: 1px dotted #aea79f;
470 position: relative;
471 font-size: 13px;
472 font-weight: bold;
473}
474.ui-accordion h3 a {
475 padding: 10px 0;
476 color: #333;
477}
478.ui-accordion h4 {
479 margin-bottom: 5px;
480}
481.ui-accordion div fieldset {
482 padding-bottom: 5px;
483}
484.ui-accordion div li,
485.ui-accordion div input {
486 margin-bottom: 10px;
487}
488.ui-accordion .ui-icon {
489 position: absolute;
490 top: 15px;
491 right: 0;
492 display: block;
493 width: 8px;
494 height: 8px;
495 background: url("./images/icon-accordion-inactive.png") 0 0 no-repeat transparent;
496}
497.ui-accordion .ui-state-active .ui-icon {
498 background-image: url("./images/icon-accordion-active.png");
499}
500.ui-accordion .current_page_item a {
501 color: #333;
502}
503.container-tweet {
504 -moz-border-radius: 4px 4px 4px 4px;
505 -webkit-border-radius: 4px 4px 4px 4px;
506 border-radius: 4px 4px 4px 4px;
507 padding: 10px 10px 10px;
508 background-color: #f7f7f7;
509}
510.container-tweet .tweet-follow {
511 margin-top: 10px;
512 margin-bottom: -10px;
513 padding-left: 55px;
514 padding-bottom: 6px;
515 background: url("./images/tweet-follow.png") 0 5px no-repeat;
516 display: block;
517}
518.container-tweet .tweet-follow span {
519 font-size: 16px;
520 font-weight: bold;
521 line-height: 1.2;
522 display: block;
523}
524.tweet a {
525 display: inline;
526}
527.tweet .tweet_text {
528 padding: 10px;
529 background-color: #fff;
530 -moz-border-radius: 4px 4px 4px 4px;
531 -webkit-border-radius: 4px 4px 4px 4px;
532 border-radius: 4px 4px 4px 4px;
533 border: 1px solid #dd4814;
534 font-size: 16px;
535 display: block;
536 clear: both;
537}
538.tweet.tweet-small .tweet_text {
539 font-size: inherit;
540}
541.tweet .tweet_text a {
542 color: #333;
543}
544.tweet .tweet_time,
545.tweet .tweet_user_and_time {
546 padding: 15px 0 10px 0;
547 position: relative;
548 top: -2px;
549 background: url("./images/tweet-arrow.png") no-repeat;
550 display: block;
551}
552.tweet .tweet_odd .tweet_time,
553.tweet .tweet_odd .tweet_user_and_time {
554 background-position: right 0;
555 float: right;
556}
557.tweet .tweet_even .tweet_time,
558.tweet .tweet_even .tweet_user_and_time {
559 background-position: left 0;
560 float: left;
561}
562
563/* Search */
564
565#content .list-search li {
566 list-style-type:none;
567 border:0px;
568 margin-bottom: 15px;
569 padding-top: 15px;
570}
571
572/* Blog */
573
574.blog-article #nav-single {
575 margin-top: 30px;
576 margin-bottom: 30px;
577}
578.blog-article #nav-single .nav-next {
579 float: right;
580}
581.blog-article article header .entry-meta {
582 margin-bottom: 20px;
583}
584.blog-article article .entry-meta {
585 color: #999;
586}
587.blog-article #respond form input[type="submit"] {
588 float: left;
589 cursor: pointer;
590 margin-bottom: 20px;
591 padding: 8px 12px;
592 display: block;
593 background-color: #dd4814;
594 color: #fff;
595 -moz-border-radius: 20px;
596 -webkit-border-radius: 20px;
597 border-radius: 20px;
598 font-size: 16px;
599 line-height: 1.3;
600 border-top: 3px solid #e6633a;
601 border-left: 3px solid #e6633a;
602 border-right: 3px solid #e6633a;
603 border-bottom: 3px solid #c03d14;
604}
605.blog-article #respond form input[type="submit"]:active {
606 position: relative;
607 top: 1px;
608}
609
610.alignnone{
611 float:left;
612 margin:10px 20px 10px 0;
613}
614.alignleft{
615 float:left;
616 margin:10px 20px 10px 0;
617}
618.alignright{
619 float:right;
620 margin:10px 0 10px 20px;
621}
622
623.aligncenter{
624 float:left;
625 margin:10px 20px 10px 0;
626}
627.entry-content h2, .entry-content h3{
628 margin-top:20px;
629}
630.entry-content ul li{
631 list-style-type: circle;
632 margin-left:16px;
633}
634
635.entry-content hr{
636 border:none;
637 border-top: 1px dotted #AEA79F;
638}
0639
=== 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-28 12:45:28 +0000
@@ -0,0 +1,234 @@
1/**
2* Ubuntu Developer page stylesheet
3*
4* A stylesheet for the 'home' page
5*
6* @project Ubuntu Developer
7* @version 1.0
8* @author Canonical Web Team: Steve Edwards and Ant Dillon
9* @copyright 2011 Canonical Ltd.
10*/
11
12.home header {
13 background: #fff;
14}
15.home .header-content {
16 background: url("./images/background-header-home.png") 0 0 repeat #fff;
17}
18.home .header-content h1 {
19 font-size: 36px;
20 background: #fff;
21}
22.home .header-content h2 {
23 font-size: 20px;
24 line-height: 1.4;
25 width: 440px;
26 background: #fff;
27}
28.home .header-content a .cta-center{
29 margin-top: 20px;
30 font-size: 20px;
31 line-height: 2.4;
32}
33.home .header-content a .cta-right, .home .header-content a .cta-left {
34 margin-top: 20px;
35}
36.home .header-image {
37 background: url("./images/dotted-logo.png") no-repeat scroll 122px -24px transparent;
38 float: right;
39 height: 332px;
40 margin-bottom: -35px;
41 margin-right: -163px;
42 margin-top: -53px;
43 width: 571px;
44 position: relative;
45 z-index: 1;
46}
47.home .header-image img {
48 -moz-box-shadow: 0 9px 4px 4px #e0e0e0;
49 -webkit-box-shadow: 0 9px 4px 4px #e0e0e0;
50 box-shadow: 0 9px 4px 4px #e0e0e0;
51 margin-bottom: -74px;
52 margin-left: -52px;
53 margin-top: 77px;
54}
55
56.box-steps {
57 margin-bottom: 30px;
58 border: 3px solid #dd4814;
59 -moz-border-radius: 4px;
60 -webkit-border-radius: 4px;
61 border-radius: 4px;
62 -moz-box-shadow: 0 3px 1px #e0e0e0;
63 -webkit-box-shadow: 0 3px 1px #e0e0e0;
64 box-shadow: 0 3px 1px #e0e0e0;
65}
66.box-steps li {
67 padding: 15px;
68 float: left;
69 width: 203px;
70 border-right: 1px solid #dd4814;
71 text-align: center;
72 min-height: 237px;
73}
74.box-steps li.last {
75 border: 0;
76 width: 202px;
77}
78.box-steps span {
79 padding: 4px;
80 margin: 10px auto 0;
81 display: block;
82 border: 3px solid #dd4814;
83 -moz-border-radius: 40px;
84 -webkit-border-radius: 40px;
85 border-radius: 40px;
86 text-align: center;
87 font-size: 36px;
88 width: 50px;
89 color: #dd4814;
90 -moz-box-shadow: 0 2px 1px #e0e0e0;
91 -webkit-box-shadow: 0 2px 1px #e0e0e0;
92 box-shadow: 0 2px 1px #e0e0e0;
93}
94.box-steps h3 {
95 margin: 10px 0 15px;
96}
97.box-steps p {
98 padding-top: 15px;
99 text-align: left;
100 border-top: 1px dotted #aea79f;
101}
102.box-steps a {
103 color: #333;
104}
105.box-steps li:hover {
106 background-color: #fcece7;
107 cursor: pointer;
108}
109.box-steps li:hover span {
110 background-color: #dd4814;
111 color: #fff;
112}
113.box-steps li:hover a {
114 color: #dd4814;
115}
116.box ul li {
117 margin: 0 30px 20px 0;
118 width: 282px;
119 float: left;
120}
121.box ul li.last {
122 margin-right: 0;
123}
124.box ul li img {
125 margin: 0 0 10px 10px;
126 float: right;
127}
128.box h4 {
129 padding-bottom: 10px;
130}
131.box h2 {
132 margin-bottom: 30px;
133}
134.box .link-action-small {
135 float: right;
136 margin-bottom: 0px;
137}
138
139/*blockquote {
140 margin-bottom: 30px;
141 padding: 32px 10px;
142 border-top: 1px dotted #aea69e;
143 border-bottom: 1px dotted #aea69e;
144 background: url("./images/quotes.png") no-repeat scroll 5px center;
145}
146blockquote p {
147 padding: 12px 65px;
148 font-size: 24px;
149 height: 54px;
150}
151blockquote cite {
152 margin-left: 65px;
153 font-size: 16px;
154}*/
155
156.slider{
157 width:10000px;
158 margin-left:-10px;
159}
160
161.box-padded .slider-controls{
162 background-color: transparent;
163 border-radius:0px;
164 padding: 0px;
165 float:right;
166 border:0px;
167 width:200px;
168}
169
170.slider-controls .next{
171 background:url("./images/arrow-sliders.png") no-repeat scroll -29px 0;
172 height:31px;
173 width:34px;
174}
175
176.slider-controls .prev{
177 background:url("./images/arrow-sliders.png") no-repeat scroll 0 0;
178 height:31px;
179 width:29px;
180}
181
182.slider-controls div{
183 float:right;
184 padding:0px;
185 cursor: pointer;
186 border: none;
187 -moz-border-radius: 0px;
188 -webkit-border-radius: 0px;
189 border-radius: 0px;
190}
191
192.slider-controls .prev.disabled{
193 background-position: 0 -29px;
194 cursor: default;
195}
196
197.slider-controls .next.disabled{
198 background-position: -29px -29px;
199 cursor: default;
200}
201
202.slider-jump{
203 width:66px;
204 margin:0px auto;
205 padding-left: 33px;
206 padding-top:10px;
207}
208.slider-jump li{
209 width:9px;
210 height:9px;
211 background:transparent;
212 border:1px solid #aea79f;
213 -moz-border-radius:5px 5px 5px 5px;
214 -webkit-border-radius:5px 5px 5px 5px;
215 border-radius:5px 5px 5px 5px;
216 float:left;
217 margin-right:5px;
218 cursor: pointer;
219 padding: 0 0;
220}
221
222.slider-jump .active{
223 background:#aea79f;
224 cursor: default;
225}
226
227.box-padded li .price{
228 font-weight: bold;
229}
230
231.box-padded li.no-border{
232 border: 0 none;
233}
234
0235
=== added file 'themes/ubuntu/static/images/background-footer.png'
1Binary 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 differ236Binary 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
=== added file 'themes/ubuntu/static/images/background-header-home.png'
2Binary 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 differ237Binary 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
=== added file 'themes/ubuntu/static/images/sec-nav-hover.gif'
3Binary 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 differ238Binary 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
=== 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-28 12:45:28 +0000
@@ -0,0 +1,8 @@
1/*
2Copyright (c) 2010, Yahoo! Inc. All rights reserved.
3Code licensed under the BSD License:
4http://developer.yahoo.com/yui/license.html
5version: 3.3.0
6build: 3167
7*/
8html{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;}
0\ No newline at end of file9\ No newline at end of file

Subscribers

People subscribed via source and target branches