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