Merge lp:~newz/ubuntu-website/light-django-theme into lp:~awstrial-dev/ubuntu-website/light-django-theme
- light-django-theme
- Merge into light-django-theme
Proposed by
Matthew Nuzum
Status: | Merged |
---|---|
Approved by: | Michael Hall |
Approved revision: | 55 |
Merged at revision: | 54 |
Proposed branch: | lp:~newz/ubuntu-website/light-django-theme |
Merge into: | lp:~awstrial-dev/ubuntu-website/light-django-theme |
Diff against target: |
569 lines (+226/-226) 2 files modified
media/css/ie.css (+224/-224) templates/ubuntu_website_base.html (+2/-2) |
To merge this branch: | bzr merge lp:~newz/ubuntu-website/light-django-theme |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Hall (community) | Approve | ||
Review via email: mp+78121@code.launchpad.net |
Commit message
Description of the change
Includes a few fixes:
1. Fixes path to the ubuntu logo in the header
2. Cleans up the whitespace in ie.css (warning, big diff)
3. Tries to correct some invalid CSS that may help IE's header look nicer
4. Fixes an SSL warning for html5 shiv
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'media/css/ie.css' |
2 | --- media/css/ie.css 2010-09-28 21:33:05 +0000 |
3 | +++ media/css/ie.css 2011-10-04 16:27:23 +0000 |
4 | @@ -1,15 +1,15 @@ |
5 | -/*- LICENSE |
6 | +/*- LICENSE |
7 | -------------------------------------------------------------------------------------------------------- */ |
8 | /* |
9 | Author: Matteo Lissandrini - kuzeko http://www.kuzeko.com |
10 | |
11 | // Licensed under the Creative Commons Attribution-Share Alike 3.0 License - http://creativecommons.org/licenses/by-sa/3.0/ |
12 | -// - Free for use in both personal and commercial projects |
13 | +// - Free for use in both personal and commercial projects |
14 | // - Attribution requires leaving author name, author link, and the license info intact. |
15 | */ |
16 | |
17 | |
18 | -/*- reset |
19 | +/*- reset |
20 | -------------------------------------------------------------------------------------------------------- */ |
21 | /* |
22 | Reset derived and adapted from |
23 | @@ -22,303 +22,303 @@ |
24 | abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, sub, |
25 | sup, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, |
26 | tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, |
27 | -hgroup, menu, nav, section, time, mark, audio, video { background:transparent; border:0; font-family:inherit; font-weight:inherit; font-style:inherit; font-size:100%; margin:0; outline:0; padding:0; vertical-align:baseline; } |
28 | -:focus /* remember to define focus styles! */ { outline: 0; } |
29 | -body { line-height:1; } |
30 | -article, aside, details, dialog, figure, footer, header, hgroup, nav, section { display:block; } |
31 | -ol, ul { list-style-position: inside; } |
32 | -nav ul { list-style:none; } |
33 | -blockquote, q { quotes:none; } |
34 | -blockquote:before, blockquote:after, q:before, q:after { content:''; } |
35 | -a { cursor:pointer; margin:0; padding:0; border:0; font-size:100%; color: #DD4814; vertical-align:baseline; background:transparent; text-decoration:none; } |
36 | -ins { background-color:#ff9; color:#000; text-decoration:none; } |
37 | -mark { background-color:#ff9; color:#000; font-style:italic; font-weight:bold; } |
38 | -del { text-decoration: line-through; } |
39 | -abbr[title], dfn[title] { border-bottom:1px dotted #000; cursor:help; } |
40 | -table { border-collapse:collapse; border-spacing:0; } |
41 | -hr { display:block; height:1px; border:0; border-top:1px solid #cccccc; margin:1em 0; padding:0; } |
42 | -input, select { vertical-align:middle; } |
43 | -textarea { overflow:auto;} |
44 | +hgroup, menu, nav, section, time, mark, audio, video { background:transparent; border:0; font-family:inherit; font-weight:inherit; font-style:inherit; font-size:100%; margin:0; outline:0; padding:0; vertical-align:baseline; } |
45 | +:focus /* remember to define focus styles! */ { outline: 0; } |
46 | +body { line-height:1; } |
47 | +article, aside, details, dialog, figure, footer, header, hgroup, nav, section { display:block; } |
48 | +ol, ul { list-style-position: inside; } |
49 | +nav ul { list-style:none; } |
50 | +blockquote, q { quotes:none; } |
51 | +blockquote:before, blockquote:after, q:before, q:after { content:''; } |
52 | +a { cursor:pointer; margin:0; padding:0; border:0; font-size:100%; color: #DD4814; vertical-align:baseline; background:transparent; text-decoration:none; } |
53 | +ins { background-color:#ff9; color:#000; text-decoration:none; } |
54 | +mark { background-color:#ff9; color:#000; font-style:italic; font-weight:bold; } |
55 | +del { text-decoration: line-through; } |
56 | +abbr[title], dfn[title] { border-bottom:1px dotted #000; cursor:help; } |
57 | +table { border-collapse:collapse; border-spacing:0; } |
58 | +hr { display:block; height:1px; border:0; border-top:1px solid #cccccc; margin:1em 0; padding:0; } |
59 | +input, select { vertical-align:middle; } |
60 | +textarea { overflow:auto;} |
61 | /* ----------------------------------------------------------------------------------------------------- */ |
62 | |
63 | |
64 | -/*- Typography |
65 | +/*- Typography |
66 | -------------------------------------------------------------------------------------------------------- */ |
67 | |
68 | -body { font-family: 'Ubuntubeta','Ubuntu','Bitstream Vera Sans','DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;} |
69 | +body { font-family: 'Ubuntubeta','Ubuntu','Bitstream Vera Sans','DejaVu Sans', Tahoma, sans-serif; font-size:100%; line-height:1.5em;} |
70 | h1, h2, h3 { |
71 | - color: #333333; |
72 | - font-weight: normal; |
73 | - margin: 0px; |
74 | + color: #333333; |
75 | + font-weight: normal; |
76 | + margin: 0px; |
77 | } |
78 | |
79 | h1 { |
80 | - font-size: 36px; |
81 | - line-height: 40px; |
82 | + font-size: 36px; |
83 | + line-height: 40px; |
84 | |
85 | - margin-top: 0px; |
86 | - margin-bottom: 0px; |
87 | + margin-top: 0px; |
88 | + margin-bottom: 0px; |
89 | |
90 | } |
91 | |
92 | h2 { |
93 | - font-size: 24px; |
94 | - line-height: 28px; |
95 | - font-weight: normal; |
96 | - margin-top: 16px; |
97 | - margin-bottom: 8px; |
98 | + font-size: 24px; |
99 | + line-height: 28px; |
100 | + font-weight: normal; |
101 | + margin-top: 16px; |
102 | + margin-bottom: 8px; |
103 | } |
104 | |
105 | h3 { |
106 | - font-size: 16px; |
107 | - line-height: 20px; |
108 | - font-weight: normal; |
109 | - margin-top: 16px; |
110 | - margin-bottom: 8px; |
111 | + font-size: 16px; |
112 | + line-height: 20px; |
113 | + font-weight: normal; |
114 | + margin-top: 16px; |
115 | + margin-bottom: 8px; |
116 | } |
117 | |
118 | p { |
119 | - font-size: 12px; |
120 | - line-height: 16px; |
121 | + font-size: 12px; |
122 | + line-height: 16px; |
123 | } |
124 | |
125 | -dt { font-size:0.75em; font-weight:bold; /* 16x0.75 =12 */ } |
126 | -li { font-size: 12px; line-height: 16px; } |
127 | -strong { font-weight:bold;} |
128 | -em { font-style:italic; } |
129 | -#top-logo { font-size:0.875em; /* 16x0.75 =12 */} |
130 | -#main-nav { font-size:0.875em; /* 16x0.875=14 */} |
131 | -#sub-nav { font-size:0.75em; /* 16x0.75 =12 */} |
132 | -.showcase-text { font-size:0.875em; /* 16x0.875=14 */ } |
133 | -/*footer { font-size:0.625em; /* 16x0.625=10 */ /* } */ |
134 | - |
135 | -/*- Layout |
136 | --------------------------------------------------------------------------------------------------------- */ |
137 | - |
138 | -.container { clear:both; margin:0 auto; padding:0; position:relative; width:980px; } |
139 | - |
140 | -#main-nav { float:left; width:620px; } |
141 | -.main-nav-item { margin:5px 10px; padding:10px; } |
142 | - |
143 | -#top-logo { float:right; margin:5px 10px 5px 0px; padding:10px 10px 0px 0px;; width:280px; } |
144 | -#the-logo { float:right; } |
145 | - |
146 | - |
147 | - |
148 | - |
149 | -#page-related { background-image:none; margin:0 auto; padding:0 10px 10px; position:relative; width:960px; } |
150 | - |
151 | -#sub-nav-container { height:40px; margin:0 10px; width:940px; } |
152 | -#sub-nav { float:left; padding:0px 10px;} |
153 | - |
154 | -.sub-nav-item { margin:5px 10px; padding-right:10px;} |
155 | -#pop-up-container { float:left; padding:10px; } |
156 | -#pop-up-text { float:left; } |
157 | -#login-container { float:left; width:620px;} |
158 | - |
159 | - |
160 | -#searchbox-container { float:right; margin: 0px 10px 5px 0px; padding:0 0 0 10px; width:300px;} |
161 | -.showcase-item { float:left; margin:5px 10px; padding:10px; width:280px;} |
162 | -.showcase-heading { margin:5px 0px 10px; width:280px;} |
163 | -.showcase-subheading { margin:5px 0px 10px; width:280px;} |
164 | -.showcase-text { margin:5px 0px 10px; width:280px;} |
165 | -.showcase-figure { float:left; margin:5px 10px; padding:10px; position:relative; width:600px;} |
166 | -.showcase-img { display:block; margin:0px; padding:0px; position:relative; width:600px;} |
167 | -.showcase-caption { position:absolute; bottom:0px; left:0px; margin:0px 10px 10px; padding:10px; width:580px;} |
168 | - |
169 | - |
170 | -#showcase-nav { clear:both; margin:5px 10px; padding:0px 10px; width:920px; } |
171 | -.showcase-nav-item { padding-right:10px;} |
172 | -.main-content { clear:both; float:left; margin:5px 10px; padding:10px; width:920px; } |
173 | -.minor-content { float:left; margin:5px 10px; padding:10px; width:440px; } |
174 | -.side-content { float:left; margin:5px 10px; padding:10px; width:280px; } |
175 | -.sub-content { float:left; margin:5px 10px; padding:10px; width:120px; } |
176 | -p { padding: 5px 0px 10px; } |
177 | - |
178 | -.divide { border:0px solid; clear:both; font-size:0px; height:1px; margin:-1px 0px 0px; visibility:hidden; } |
179 | -.divide-showcase { border:0px solid; clear:both; font-size:0px; height:1px; margin:-1px 0px 25px; visibility:hidden;} |
180 | - |
181 | -#blog-posts { float:left; margin:5px 10px; padding:10px; width:600px; } |
182 | -.blog-post { clear:both; margin-bottom:10px; padding-bottom:10px;} |
183 | -.post-figure { float:right; margin:10px 0px 10px 10px; padding:0px; position:relative; width:260px;} |
184 | -.post-img { display:block; margin:0px; padding:0px; position:relative; width:260px;} |
185 | -.post-img-caption { position:absolute; bottom:0px; left:0px; padding:10px; width:240px;} |
186 | -.comments-count { clear:both; display:block; font-style:italic; color:#999; text-align:right; } |
187 | - |
188 | - |
189 | -#blog-aside { float:left; margin:5px 10px; padding:0px; width:300px; } |
190 | -.widgets-aside { float:left; margin:5px 0px 15px; padding:10px; width:280px; } |
191 | - |
192 | -.pagination { clear:both; text-align:center; } |
193 | - |
194 | - |
195 | -.footer-content { float:left; margin:5px 10px; padding:10px; width:120px; } |
196 | -.foot-note { clear:both; margin:15px 10px 0px; padding:10px; width:920px; } |
197 | - |
198 | -.plugin { margin: 0 -10px; padding:0px; position:relative; width:980px; } |
199 | -/*- Decoration |
200 | --------------------------------------------------------------------------------------------------------- */ |
201 | - |
202 | -body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; } |
203 | -#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #DD4814; height:70px; } |
204 | -#page-header .container { background:url("../images/header.png") repeat-x scroll 0 0 #DD4814; } |
205 | -#top-logo { color:#fff; line-height:1.5em; text-align:right; } |
206 | -#the-logo { padding-left:4px; } |
207 | -#loco { clear:both; display:block; float:right;} |
208 | - |
209 | - |
210 | - |
211 | - |
212 | -#main-nav { border-left: 1px solid #EF7149; z-index:10;} |
213 | +dt { font-size:0.75em; font-weight:bold; /* 16x0.75 =12 */ } |
214 | +li { font-size: 12px; line-height: 16px; } |
215 | +strong { font-weight:bold;} |
216 | +em { font-style:italic; } |
217 | +#top-logo { font-size:0.875em; /* 16x0.75 =12 */} |
218 | +#main-nav { font-size:0.875em; /* 16x0.875=14 */} |
219 | +#sub-nav { font-size:0.75em; /* 16x0.75 =12 */} |
220 | +.showcase-text { font-size:0.875em; /* 16x0.875=14 */ } |
221 | +/*footer { font-size:0.625em; /* 16x0.625=10 */ /* } */ |
222 | + |
223 | +/*- Layout |
224 | +-------------------------------------------------------------------------------------------------------- */ |
225 | + |
226 | +.container { clear:both; margin:0 auto; padding:0; position:relative; width:980px; } |
227 | + |
228 | +#main-nav { float:left; width:620px; } |
229 | +.main-nav-item { margin:5px 10px; padding:10px; } |
230 | + |
231 | +#top-logo { float:right; margin:5px 10px 5px 0px; padding:10px 10px 0px 0px;; width:280px; } |
232 | +#the-logo { float:right; } |
233 | + |
234 | + |
235 | + |
236 | + |
237 | +#page-related { background-image:none; margin:0 auto; padding:0 10px 10px; position:relative; width:960px; } |
238 | + |
239 | +#sub-nav-container { height:40px; margin:0 10px; width:940px; } |
240 | +#sub-nav { float:left; padding:0px 10px;} |
241 | + |
242 | +.sub-nav-item { margin:5px 10px; padding-right:10px;} |
243 | +#pop-up-container { float:left; padding:10px; } |
244 | +#pop-up-text { float:left; } |
245 | +#login-container { float:left; width:620px;} |
246 | + |
247 | + |
248 | +#searchbox-container { float:right; margin: 0px 10px 5px 0px; padding:0 0 0 10px; width:300px;} |
249 | +.showcase-item { float:left; margin:5px 10px; padding:10px; width:280px;} |
250 | +.showcase-heading { margin:5px 0px 10px; width:280px;} |
251 | +.showcase-subheading { margin:5px 0px 10px; width:280px;} |
252 | +.showcase-text { margin:5px 0px 10px; width:280px;} |
253 | +.showcase-figure { float:left; margin:5px 10px; padding:10px; position:relative; width:600px;} |
254 | +.showcase-img { display:block; margin:0px; padding:0px; position:relative; width:600px;} |
255 | +.showcase-caption { position:absolute; bottom:0px; left:0px; margin:0px 10px 10px; padding:10px; width:580px;} |
256 | + |
257 | + |
258 | +#showcase-nav { clear:both; margin:5px 10px; padding:0px 10px; width:920px; } |
259 | +.showcase-nav-item { padding-right:10px;} |
260 | +.main-content { clear:both; float:left; margin:5px 10px; padding:10px; width:920px; } |
261 | +.minor-content { float:left; margin:5px 10px; padding:10px; width:440px; } |
262 | +.side-content { float:left; margin:5px 10px; padding:10px; width:280px; } |
263 | +.sub-content { float:left; margin:5px 10px; padding:10px; width:120px; } |
264 | +p { padding: 5px 0px 10px; } |
265 | + |
266 | +.divide { border:0px solid; clear:both; font-size:0px; height:1px; margin:-1px 0px 0px; visibility:hidden; } |
267 | +.divide-showcase { border:0px solid; clear:both; font-size:0px; height:1px; margin:-1px 0px 25px; visibility:hidden;} |
268 | + |
269 | +#blog-posts { float:left; margin:5px 10px; padding:10px; width:600px; } |
270 | +.blog-post { clear:both; margin-bottom:10px; padding-bottom:10px;} |
271 | +.post-figure { float:right; margin:10px 0px 10px 10px; padding:0px; position:relative; width:260px;} |
272 | +.post-img { display:block; margin:0px; padding:0px; position:relative; width:260px;} |
273 | +.post-img-caption { position:absolute; bottom:0px; left:0px; padding:10px; width:240px;} |
274 | +.comments-count { clear:both; display:block; font-style:italic; color:#999; text-align:right; } |
275 | + |
276 | + |
277 | +#blog-aside { float:left; margin:5px 10px; padding:0px; width:300px; } |
278 | +.widgets-aside { float:left; margin:5px 0px 15px; padding:10px; width:280px; } |
279 | + |
280 | +.pagination { clear:both; text-align:center; } |
281 | + |
282 | + |
283 | +.footer-content { float:left; margin:5px 10px; padding:10px; width:120px; } |
284 | +.foot-note { clear:both; margin:15px 10px 0px; padding:10px; width:920px; } |
285 | + |
286 | +.plugin { margin: 0 -10px; padding:0px; position:relative; width:980px; } |
287 | +/*- Decoration |
288 | +-------------------------------------------------------------------------------------------------------- */ |
289 | + |
290 | +body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; } |
291 | +#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #DD4814; height:70px; } |
292 | +#page-header .container { background: #DD4814 url("../images/header.png") repeat-x scroll 0 0 ; } |
293 | +#top-logo { color:#fff; line-height:1.5em; text-align:right; } |
294 | +#the-logo { padding-left:4px; } |
295 | +#loco { clear:both; display:block; float:right;} |
296 | + |
297 | + |
298 | + |
299 | + |
300 | +#main-nav { border-left: 1px solid #EF7149; z-index:10;} |
301 | .main-nav-item, |
302 | -.main-nav-item:visited { border-right: 1px solid #EF7149; border-bottom: 0; border-top: 0; color: #fff; display: block; float: left; height: 70px; line-height: 70px; margin:0px; padding: 0 15px; text-shadow: 1px 1px 1px #333; } |
303 | +.main-nav-item:visited { border-right: 1px solid #EF7149; border-bottom: 0; border-top: 0; color: #fff; display: block; float: left; height: 70px; line-height: 70px; margin:0px; padding: 0 15px; text-shadow: 1px 1px 1px #333; } |
304 | .main-nav-item.current, |
305 | .main-nav-item:hover, |
306 | .main-nav-item:active, |
307 | -.main-nav-item:focus { background: url(../images/mainnav.png) 0 0 repeat; } |
308 | - |
309 | - |
310 | -#page-related { background-color:#FFFFFF;} |
311 | -#sub-nav-container { background-color:#F7F7F7; border-bottom-left-radius: 8px; border-bottom-right-radius: 8px;} |
312 | +.main-nav-item:focus { background: url(../images/mainnav.png) 0 0 repeat; } |
313 | + |
314 | + |
315 | +#page-related { background-color:#FFFFFF;} |
316 | +#sub-nav-container { background-color:#F7F7F7; border-bottom-left-radius: 8px; border-bottom-right-radius: 8px;} |
317 | .sub-nav-item, |
318 | -.sub-nav-item:visited { color:#333; display: block; float: left; line-height:40px; margin:0px; padding: 0 15px; } |
319 | +.sub-nav-item:visited { color:#333; display: block; float: left; line-height:40px; margin:0px; padding: 0 15px; } |
320 | .sub-nav-item.current, |
321 | .sub-nav-item:hover, |
322 | .sub-nav-item:active, |
323 | -.sub-nav-item:focus { background-color:#efefef; color:#DD4814; } |
324 | +.sub-nav-item:focus { background-color:#efefef; color:#DD4814; } |
325 | |
326 | -.login-label { height:16px; margin:7px 0px 7px 9px; padding:3px; } |
327 | +.login-label { height:16px; margin:7px 0px 7px 9px; padding:3px; } |
328 | #username, |
329 | -#password { background-color:#f0f0f0; border: 1px solid #CCCCCC; height:16px; margin:7px 0px 7px 9px; padding:3px; width:110px; } |
330 | -#login { background-color:#f0f0f0; border: 1px solid #CCCCCC; height:24px; margin:7px 9px 7px 0px ; padding:2px;} |
331 | -#login:hover { background-color:#f7f7f7; border: 1px solid #DD4814;} |
332 | +#password { background-color:#f0f0f0; border: 1px solid #CCCCCC; height:16px; margin:7px 0px 7px 9px; padding:3px; width:110px; } |
333 | +#login { background-color:#f0f0f0; border: 1px solid #CCCCCC; height:24px; margin:7px 9px 7px 0px ; padding:2px;} |
334 | +#login:hover { background-color:#f7f7f7; border: 1px solid #DD4814;} |
335 | #join, |
336 | -#join:visited { color:#333; } |
337 | +#join:visited { color:#333; } |
338 | #join:hover, |
339 | #join:active, |
340 | -#join:focus { color:#DD4814; text-shadow: 1px 1px 2px #999; } |
341 | +#join:focus { color:#DD4814; text-shadow: 1px 1px 2px #999; } |
342 | |
343 | -#pop-up-text { font-weight:bold; line-height:20px; padding:0px 5px; } |
344 | -#searchbox { background-color:#f0f0f0; border: 1px solid #CCCCCC; height:16px; margin:7px 3px 7px 9px; padding:3px; width:180px;} |
345 | -#searchbox:focus { background-color:#fff; border: 1px solid #DD4814; } |
346 | -#go-search { background-color:#f0f0f0; border: 1px solid #CCCCCC; height:24px; margin:7px 0 7px 0px ; padding:2px;} |
347 | -#go-search:hover { background-color:#f7f7f7; border: 1px solid #DD4814;} |
348 | +#pop-up-text { font-weight:bold; line-height:20px; padding:0px 5px; } |
349 | +#searchbox { background-color:#f0f0f0; border: 1px solid #CCCCCC; height:16px; margin:7px 3px 7px 9px; padding:3px; width:180px;} |
350 | +#searchbox:focus { background-color:#fff; border: 1px solid #DD4814; } |
351 | +#go-search { background-color:#f0f0f0; border: 1px solid #CCCCCC; height:24px; margin:7px 0 7px 0px ; padding:2px;} |
352 | +#go-search:hover { background-color:#f7f7f7; border: 1px solid #DD4814;} |
353 | #more-search, |
354 | -#more-search:visited { background-color:#f0f0f0; border: 1px solid #CCCCCC; color:#333; height:16px; margin:7px 7px 7px 0px; padding:2px 3px; } |
355 | +#more-search:visited { background-color:#f0f0f0; border: 1px solid #CCCCCC; color:#333; height:16px; margin:7px 7px 7px 0px; padding:2px 3px; } |
356 | #more-search:hover, |
357 | #more-search:active, |
358 | -#more-search:focus { background-color:#f7f7f7; border: 1px solid #DD4814; color:#DD4814; text-shadow: 1px 1px 2px #999; } |
359 | - |
360 | - |
361 | -.showcase-caption { background-color:#000; background-color:rgba(0,0,0,0.4); color: #fff; |
362 | - filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#66000000',EndColorStr='#66000000'); /* IE6,IE7 */ |
363 | - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#66000000',EndColorStr='#66000000')"; /* IE8 */ } |
364 | - |
365 | -#showcase-nav { background-color:#f7f7f7; border-radius: 8px; box-shadow: 0px 1px 1px #ccc; height:40px; } |
366 | +#more-search:focus { background-color:#f7f7f7; border: 1px solid #DD4814; color:#DD4814; text-shadow: 1px 1px 2px #999; } |
367 | + |
368 | + |
369 | +.showcase-caption { background-color:#000; background-color:rgba(0,0,0,0.4); color: #fff; |
370 | + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#66000000',EndColorStr='#66000000'); /* IE6,IE7 */ |
371 | + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#66000000',EndColorStr='#66000000')"; /* IE8 */ } |
372 | + |
373 | +#showcase-nav { background-color:#f7f7f7; border-radius: 8px; box-shadow: 0px 1px 1px #ccc; height:40px; } |
374 | .showcase-nav-item, |
375 | -.showcase-nav-item:visited { color:#333; display: block; float: left; line-height:40px; margin:0 1px; padding: 0 15px; } |
376 | +.showcase-nav-item:visited { color:#333; display: block; float: left; line-height:40px; margin:0 1px; padding: 0 15px; } |
377 | .showcase-nav-item:hover, |
378 | .showcase-nav-item:active, |
379 | -.showcase-nav-item:focus { border:1px solid #ddd; border-top:0px solid; border-bottom:0px solid; background-color:#efefef; color:#DD4814; margin:0; } |
380 | - |
381 | - |
382 | - |
383 | - |
384 | -#main-section .container { background-color:#fff; background-image:none; padding:0px 10px 10px; position:relative; width:960px;} |
385 | +.showcase-nav-item:focus { border:1px solid #ddd; border-top:0px solid; border-bottom:0px solid; background-color:#efefef; color:#DD4814; margin:0; } |
386 | + |
387 | + |
388 | + |
389 | + |
390 | +#main-section .container { background-color:#fff; background-image:none; padding:0px 10px 10px; position:relative; width:960px;} |
391 | |
392 | .alone, |
393 | .leading, |
394 | -.aggregator { background-color:#f7f7f7; border-radius: 8px; box-shadow: 0px 1px 1px #ccc; float:left; } |
395 | - |
396 | -.aggregator { margin:5px 10px;} |
397 | -.aggregator .first { margin-left:0px;} |
398 | -.aggregator .last { margin-right:0px;} |
399 | - |
400 | - |
401 | -.post-header { border-bottom:1px dotted #333333; margin-bottom:10px; padding-bottom:5px; } |
402 | -.post-meta { color:#999; font-size:0.85em; font-style:italic; } |
403 | +.aggregator { background-color:#f7f7f7; border-radius: 8px; box-shadow: 0px 1px 1px #ccc; float:left; } |
404 | + |
405 | +.aggregator { margin:5px 10px;} |
406 | +.aggregator .first { margin-left:0px;} |
407 | +.aggregator .last { margin-right:0px;} |
408 | + |
409 | + |
410 | +.post-header { border-bottom:1px dotted #333333; margin-bottom:10px; padding-bottom:5px; } |
411 | +.post-meta { color:#999; font-size:0.85em; font-style:italic; } |
412 | .post-title-link, |
413 | -.post-title-link:visited { color:#333; } |
414 | +.post-title-link:visited { color:#333; } |
415 | .post-title-link:hover, |
416 | .post-title-link:active, |
417 | -.post-title-link:focus { color:#DD4814; text-shadow: 1px 1px 2px #999; } |
418 | - |
419 | -.post-img-caption { background-color:#000; background-color:rgba(0,0,0,0.4); color: #fff; |
420 | - filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#66000000',EndColorStr='#66000000'); /* IE6,IE7 */ |
421 | - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#66000000',EndColorStr='#66000000')"; /* IE8 */ } |
422 | -.pagination { border-top:1px solid #333; color: #fff; margin-top:15px; padding-top:15px; } |
423 | -.pagination-item { border-bottom:1px solid #333; color:#333; margin-right:5px; padding:2px 6px; } |
424 | -.pagination-item:hover { border-bottom:1px solid #DD4814; background-color:#f7f7f7; color:#DD4814;} |
425 | -.pagination-item.current { background-color:#f7f7f7; border-bottom:1px solid #333; color:#333; font-weight:bold; } |
426 | - |
427 | -.widgets-aside { background-color:#f7f7f7; border-radius: 8px; box-shadow: 0px 1px 1px #ccc; } |
428 | -.widget-links { list-style:none; list-style-position:outside; } |
429 | -.a-item { display:block; margin-top:3px; } |
430 | +.post-title-link:focus { color:#DD4814; text-shadow: 1px 1px 2px #999; } |
431 | + |
432 | +.post-img-caption { background-color:#000; background-color:rgba(0,0,0,0.4); color: #fff; |
433 | + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#66000000',EndColorStr='#66000000'); /* IE6,IE7 */ |
434 | + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#66000000',EndColorStr='#66000000')"; /* IE8 */ } |
435 | +.pagination { border-top:1px solid #333; color: #fff; margin-top:15px; padding-top:15px; } |
436 | +.pagination-item { border-bottom:1px solid #333; color:#333; margin-right:5px; padding:2px 6px; } |
437 | +.pagination-item:hover { border-bottom:1px solid #DD4814; background-color:#f7f7f7; color:#DD4814;} |
438 | +.pagination-item.current { background-color:#f7f7f7; border-bottom:1px solid #333; color:#333; font-weight:bold; } |
439 | + |
440 | +.widgets-aside { background-color:#f7f7f7; border-radius: 8px; box-shadow: 0px 1px 1px #ccc; } |
441 | +.widget-links { list-style:none; list-style-position:outside; } |
442 | +.a-item { display:block; margin-top:3px; } |
443 | .side-link, |
444 | -.side-link:visited { color: #333333; display:block; padding-right:3px; } |
445 | +.side-link:visited { color: #333333; display:block; padding-right:3px; } |
446 | .side-link:hover, |
447 | .side-link:active, |
448 | -.side-link:focus { background-color: #fff; border-right:3px solid #DD4814; color:#DD4814; text-decoration:none; } |
449 | - |
450 | -#login-widget { text-align:center;} |
451 | - |
452 | -#page-footer { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; } |
453 | -#page-footer .container { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; padding:0px 10px; width:960px; } |
454 | +.side-link:focus { background-color: #fff; border-right:3px solid #DD4814; color:#DD4814; text-decoration:none; } |
455 | + |
456 | +#login-widget { text-align:center;} |
457 | + |
458 | +#page-footer { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; } |
459 | +#page-footer .container { background:url("../images/footer.png") repeat-x scroll 0 0 #EEECEA; padding:0px 10px; width:960px; } |
460 | #page-footer .container div.copyright { |
461 | - font-size: 10px; |
462 | - line-height: 14px; |
463 | - color: #aea79f; |
464 | + font-size: 10px; |
465 | + line-height: 14px; |
466 | + color: #aea79f; |
467 | } |
468 | -.footer-content dd { margin-bottom:15px;} |
469 | -.footer-links { list-style:none; text-indent:0px; list-style-position:outside; } |
470 | -.footer-item { border-bottom:1px dotted #333; display:block; margin-top:3px; } |
471 | -.foot-note { color:#999; font-style:italic;} |
472 | +.footer-content dd { margin-bottom:15px;} |
473 | +.footer-links { list-style:none; text-indent:0px; list-style-position:outside; } |
474 | +.footer-item { border-bottom:1px dotted #333; display:block; margin-top:3px; } |
475 | +.foot-note { color:#999; font-style:italic;} |
476 | |
477 | .footer-link, |
478 | -.footer-link:visited { color: #333333;} |
479 | +.footer-link:visited { color: #333333;} |
480 | .footer-link:hover, |
481 | .footer-link:active, |
482 | -.footer-link:focus { color:#DD4814; text-decoration:underline; } |
483 | +.footer-link:focus { color:#DD4814; text-decoration:underline; } |
484 | |
485 | .footer-link-main, |
486 | -.footer-link-main:visited { } |
487 | +.footer-link-main:visited { } |
488 | .footer-link-main:hover, |
489 | .footer-link-main:active, |
490 | -.footer-link-main:focus { color:#DD4814; text-decoration:underline; } |
491 | - |
492 | - |
493 | - |
494 | -/*- Forum Decoration [Demo] |
495 | +.footer-link-main:focus { color:#DD4814; text-decoration:underline; } |
496 | + |
497 | + |
498 | + |
499 | +/*- Forum Decoration [Demo] |
500 | -------------------------------------------------------------------------------------------------------- */ |
501 | |
502 | -.forum-title { background-color:#efefef; margin:10px 0px; padding:20px;} |
503 | +.forum-title { background-color:#efefef; margin:10px 0px; padding:20px;} |
504 | |
505 | -.forum-item { border-top:1px dotted #999; } |
506 | +.forum-item { border-top:1px dotted #999; } |
507 | .cat-title, |
508 | -.sub-sections { font-size:0.75em; /* 16x0.75 =12 */ } |
509 | +.sub-sections { font-size:0.75em; /* 16x0.75 =12 */ } |
510 | |
511 | .latest, |
512 | -.post-count { font-size:0.75em; /* 16x0.75 =12 */ line-height:1.2em; } |
513 | +.post-count { font-size:0.75em; /* 16x0.75 =12 */ line-height:1.2em; } |
514 | |
515 | |
516 | .cat-title, |
517 | .post-count, |
518 | -.latest { padding:10px; vertical-align:middle; } |
519 | +.latest { padding:10px; vertical-align:middle; } |
520 | |
521 | |
522 | .forum-title-link, |
523 | -.forum-title-link:visited { color:#333; } |
524 | +.forum-title-link:visited { color:#333; } |
525 | .forum-title-link:hover, |
526 | .forum-title-link:active, |
527 | -.forum-title-link:focus { color:#DD4814; text-shadow: 1px 1px 2px #999; } |
528 | - |
529 | -.status { background-color:#efefef; padding:10px 5px; vertical-align:middle; width:30px; } |
530 | -.latest { width:180px; } |
531 | -.post-count { width:120px; } |
532 | -.sub-sections { background-color:#efefef; padding:5px 10px 10px; } |
533 | -.post-count { background-color:#efefef; } |
534 | - |
535 | -.count { display:block; font-style:italic; } |
536 | +.forum-title-link:focus { color:#DD4814; text-shadow: 1px 1px 2px #999; } |
537 | + |
538 | +.status { background-color:#efefef; padding:10px 5px; vertical-align:middle; width:30px; } |
539 | +.latest { width:180px; } |
540 | +.post-count { width:120px; } |
541 | +.sub-sections { background-color:#efefef; padding:5px 10px 10px; } |
542 | +.post-count { background-color:#efefef; } |
543 | + |
544 | +.count { display:block; font-style:italic; } |
545 | |
546 | |
547 | /* KuZeKo web@kuzeko.com |
548 | |
549 | === modified file 'templates/ubuntu_website_base.html' |
550 | --- templates/ubuntu_website_base.html 2010-10-09 14:15:36 +0000 |
551 | +++ templates/ubuntu_website_base.html 2011-10-04 16:27:23 +0000 |
552 | @@ -24,7 +24,7 @@ |
553 | <![endif]--> |
554 | |
555 | <!--[if IE ]> |
556 | - <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script> |
557 | + <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script> |
558 | <![endif]--> |
559 | {% endblock %} |
560 | {% block extrahead %}{% endblock %} |
561 | @@ -46,7 +46,7 @@ |
562 | </nav> |
563 | <h1 id="top-logo"> |
564 | <a href="{% block logo_href %}/{% endblock %}"> |
565 | - {% block logo_img %}<img class="png" id="the-logo" src="{{ubuntu_website_media}}/images/ubuntu.png" alt="Ubuntu" width="118" height="27" />{% endblock %} |
566 | + {% block logo_img %}<img class="png" id="the-logo" src="{{ubuntu_website_media}}/ubuntu.png" alt="Ubuntu" width="118" height="27" />{% endblock %} |
567 | <span id="loco">{% block logo_text %}Country Loco Team{% endblock %}</span> |
568 | </a> |
569 | </h1> |
Looks good, we'll see if it fixes things