Merge ~twom/launchpad:sassy-css-transcribe-base into launchpad:master
- Git
- lp:~twom/launchpad
- sassy-css-transcribe-base
- Merge into master
Proposed by
Tom Wardill
Status: | Merged |
---|---|
Approved by: | Tom Wardill |
Approved revision: | 723b004ab3a5b8946072aaea7cb597086ecdc289 |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | ~twom/launchpad:sassy-css-transcribe-base |
Merge into: | launchpad:master |
Prerequisite: | ~twom/launchpad:sassy-css-no-op-css-compilation |
Diff against target: |
3924 lines (+1942/-1331) 8 files modified
dev/null (+0/-351) lib/canonical/launchpad/icing/combo.scss (+0/-5) lib/canonical/launchpad/icing/css/base.scss (+381/-328) lib/canonical/launchpad/icing/css/colours.scss (+633/-0) lib/canonical/launchpad/icing/css/forms.scss (+417/-290) lib/canonical/launchpad/icing/css/layout.scss (+199/-149) lib/canonical/launchpad/icing/css/modifiers.scss (+166/-140) lib/canonical/launchpad/icing/css/typography.scss (+146/-68) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Thiago F. Pappacena (community) | Approve | ||
Review via email: mp+384834@code.launchpad.net |
Commit message
Transcribe base css into SCSS
Description of the change
Used https:/
Altered the combo.scss to just import the single base file to make SCSS module migration easier.
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 | diff --git a/lib/canonical/launchpad/icing/combo.scss b/lib/canonical/launchpad/icing/combo.scss | |||
2 | index 62afbfb..8ad09e9 100644 | |||
3 | --- a/lib/canonical/launchpad/icing/combo.scss | |||
4 | +++ b/lib/canonical/launchpad/icing/combo.scss | |||
5 | @@ -18,11 +18,6 @@ | |||
6 | 18 | // Include our main stylesheets at the end so they | 18 | // Include our main stylesheets at the end so they |
7 | 19 | // take precedence over the others. | 19 | // take precedence over the others. |
8 | 20 | 'css/base', | 20 | 'css/base', |
9 | 21 | 'css/typography', | ||
10 | 22 | 'css/colours', | ||
11 | 23 | 'css/forms', | ||
12 | 24 | 'css/layout', | ||
13 | 25 | 'css/modifiers', | ||
14 | 26 | // This shouldn't require the _index, but doesn't appear to be allowable | 21 | // This shouldn't require the _index, but doesn't appear to be allowable |
15 | 27 | // in this version of node-sass (v4.14.4) | 22 | // in this version of node-sass (v4.14.4) |
16 | 28 | 'css/components/_index'; | 23 | 'css/components/_index'; |
17 | diff --git a/lib/canonical/launchpad/icing/css/base.css b/lib/canonical/launchpad/icing/css/base.scss | |||
18 | 29 | similarity index 58% | 24 | similarity index 58% |
19 | 30 | rename from lib/canonical/launchpad/icing/css/base.css | 25 | rename from lib/canonical/launchpad/icing/css/base.css |
20 | 31 | rename to lib/canonical/launchpad/icing/css/base.scss | 26 | rename to lib/canonical/launchpad/icing/css/base.scss |
21 | index ded8b61..68bcce1 100644 | |||
22 | --- a/lib/canonical/launchpad/icing/css/base.css | |||
23 | +++ b/lib/canonical/launchpad/icing/css/base.scss | |||
24 | @@ -1,497 +1,550 @@ | |||
25 | 1 | // This file the result of auto-converting base.css to scss. | ||
26 | 2 | |||
27 | 1 | body { | 3 | body { |
28 | 2 | /* line-height is the same as the sprite height. */ | 4 | /* line-height is the same as the sprite height. */ |
29 | 3 | font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; | 5 | font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; |
30 | 4 | font-size: 12px; | 6 | font-size: 12px; |
31 | 5 | line-height: 18px; | 7 | line-height: 18px; |
32 | 6 | color: #333; | 8 | color: #333; |
33 | 7 | } | ||
34 | 8 | 9 | ||
39 | 9 | body.private, | 10 | &.private, &.public { |
40 | 10 | body.public { | 11 | /* It must be obvious to the user that the context is private */ |
41 | 11 | /* It must be obvious to the user that the context is private */ | 12 | background-image: none; |
38 | 12 | background-image: none; | ||
42 | 13 | } | 13 | } |
43 | 14 | 14 | ||
47 | 15 | body.private .private-disallow { | 15 | &.private .private-disallow { |
48 | 16 | /* We want to disable/hide some actions on private artifacts */ | 16 | /* We want to disable/hide some actions on private artifacts */ |
49 | 17 | display: none; | 17 | display: none; |
50 | 18 | } | 18 | } |
51 | 19 | } | ||
52 | 19 | 20 | ||
54 | 20 | .private-only { | 21 | .private-only { |
55 | 21 | /* We want to only show some items on private artifacts */ | 22 | /* We want to only show some items on private artifacts */ |
56 | 22 | display: none; | 23 | display: none; |
58 | 23 | } | 24 | } |
59 | 24 | 25 | ||
61 | 25 | body.private .private-only { | 26 | body.private .private-only { |
62 | 26 | /* We want to only show some items on private artifacts */ | 27 | /* We want to only show some items on private artifacts */ |
63 | 27 | display: block; | 28 | display: block; |
65 | 28 | } | 29 | } |
66 | 29 | 30 | ||
68 | 30 | hr { | 31 | hr { |
69 | 31 | display: none; | 32 | display: none; |
71 | 32 | } | 33 | } |
72 | 33 | 34 | ||
74 | 34 | dt { | 35 | dt { |
75 | 35 | margin-bottom: .3em; | 36 | margin-bottom: .3em; |
76 | 36 | margin-top: 0.5em; | 37 | margin-top: 0.5em; |
77 | 37 | font-weight: bold; | 38 | font-weight: bold; |
78 | 38 | } | ||
79 | 39 | 39 | ||
82 | 40 | dt dfn { | 40 | dfn { |
83 | 41 | font-weight: bold; | 41 | font-weight: bold; |
84 | 42 | } | 42 | } |
85 | 43 | } | ||
86 | 43 | 44 | ||
88 | 44 | dd { | 45 | dd { |
89 | 45 | margin-bottom: .8em; | 46 | margin-bottom: .8em; |
91 | 46 | } | 47 | } |
92 | 47 | 48 | ||
94 | 48 | dl.faq dd { | 49 | dl.faq dd { |
95 | 49 | margin: 1em 0 2em 4em; | 50 | margin: 1em 0 2em 4em; |
97 | 50 | } | 51 | } |
98 | 51 | 52 | ||
100 | 52 | .contributors dt strong { | 53 | .contributors dt strong { |
101 | 53 | padding-left: 1em; | 54 | padding-left: 1em; |
103 | 54 | } | 55 | } |
104 | 55 | 56 | ||
106 | 56 | ol { | 57 | ol { |
107 | 57 | margin-left: 1.8em; | 58 | margin-left: 1.8em; |
108 | 58 | } | ||
109 | 59 | 59 | ||
112 | 60 | ol li { | 60 | li { |
113 | 61 | list-style: decimal outside; | 61 | list-style: decimal outside; |
114 | 62 | } | 62 | } |
115 | 63 | } | ||
116 | 63 | 64 | ||
118 | 64 | li { | 65 | li { |
119 | 65 | padding-bottom: .3em; | 66 | padding-bottom: .3em; |
121 | 66 | } | 67 | } |
122 | 67 | 68 | ||
125 | 68 | ul.news, | 69 | ul.news, li.news { |
124 | 69 | li.news { | ||
126 | 70 | list-style-type: none; | 70 | list-style-type: none; |
127 | 71 | margin-bottom: 1em; | 71 | margin-bottom: 1em; |
129 | 72 | } | 72 | } |
130 | 73 | 73 | ||
133 | 74 | ul.architecture, | 74 | ul.architecture, li.architecture { |
132 | 75 | li.architecture { | ||
134 | 76 | list-style-image: url(/@@/architecture); | 75 | list-style-image: url(/@@/architecture); |
136 | 77 | } | 76 | } |
137 | 78 | 77 | ||
140 | 79 | ul.build-success, | 78 | ul.build-success, li.build-success { |
139 | 80 | li.build-success { | ||
141 | 81 | list-style-image: url(/@@/build-success); | 79 | list-style-image: url(/@@/build-success); |
143 | 82 | } | 80 | } |
144 | 83 | 81 | ||
147 | 84 | ul.bug.remote, | 82 | ul.bug.remote, li.bug.remote { |
146 | 85 | li.bug.remote { | ||
148 | 86 | list-style-image: url(/@@/bug-remote); | 83 | list-style-image: url(/@@/bug-remote); |
150 | 87 | } | 84 | } |
151 | 88 | 85 | ||
154 | 89 | ul.language, | 86 | ul.language, li.language { |
153 | 90 | li.language { | ||
155 | 91 | list-style-image: url(/@@/language); | 87 | list-style-image: url(/@@/language); |
156 | 88 | |||
157 | 92 | /* Disable .language sprite. */ | 89 | /* Disable .language sprite. */ |
158 | 93 | background: inherit; | 90 | background: inherit; |
160 | 94 | } | 91 | } |
161 | 95 | 92 | ||
164 | 96 | ul.mail, | 93 | ul.mail, li.mail { |
163 | 97 | li.mail { | ||
165 | 98 | list-style-image: url(/@@/mail); | 94 | list-style-image: url(/@@/mail); |
167 | 99 | } | 95 | } |
168 | 100 | 96 | ||
171 | 101 | ul.meeting, | 97 | ul.meeting, li.meeting { |
170 | 102 | li.meeting { | ||
172 | 103 | list-style-image: url(/@@/meeting); | 98 | list-style-image: url(/@@/meeting); |
174 | 104 | } | 99 | } |
175 | 105 | 100 | ||
178 | 106 | ul.rss, | 101 | ul.rss, li.rss { |
177 | 107 | li.rss { | ||
179 | 108 | list-style-image: url(/@@/rss); | 102 | list-style-image: url(/@@/rss); |
181 | 109 | } | 103 | } |
182 | 110 | 104 | ||
185 | 111 | ul.translation, | 105 | ul.translation, li.translation { |
184 | 112 | li.translation { | ||
186 | 113 | list-style-image: url(/@@/translation); | 106 | list-style-image: url(/@@/translation); |
188 | 114 | } | 107 | } |
189 | 115 | 108 | ||
192 | 116 | ul.webref, | 109 | ul.webref, li.webref { |
191 | 117 | li.webref { | ||
193 | 118 | list-style-image: url(/@@/link); | 110 | list-style-image: url(/@@/link); |
195 | 119 | } | 111 | } |
196 | 120 | 112 | ||
201 | 121 | ul.iconed { | 113 | ul { |
202 | 122 | list-style-type: none; | 114 | &.iconed { |
203 | 123 | padding-left: 0 !important; | 115 | list-style-type: none; |
204 | 124 | margin: 0 !important; | 116 | padding-left: 0 !important; |
205 | 117 | margin: 0 !important; | ||
206 | 125 | } | 118 | } |
207 | 126 | 119 | ||
213 | 127 | ul.buttons { | 120 | &.buttons { |
214 | 128 | /* without !important, gets overridden by the '#maincontent ol' rule */ | 121 | /* without !important, gets overridden by the '#maincontent ol' rule */ |
215 | 129 | margin: 0.5em 0 0.5em 0 !important; | 122 | margin: 0.5em 0 0.5em 0 !important; |
216 | 130 | padding: 0 !important; | 123 | padding: 0 !important; |
212 | 131 | } | ||
217 | 132 | 124 | ||
221 | 133 | ul.buttons li { | 125 | li { |
222 | 134 | display: inline; | 126 | display: inline; |
223 | 135 | margin: 0 0 0 0; | 127 | margin: 0 0 0 0; |
224 | 128 | } | ||
225 | 136 | } | 129 | } |
226 | 130 | } | ||
227 | 137 | 131 | ||
229 | 138 | .bulleted { | 132 | .bulleted { |
230 | 139 | margin-bottom: 0.5em; | 133 | margin-bottom: 0.5em; |
231 | 140 | } | ||
232 | 141 | 134 | ||
236 | 142 | .bulleted li { | 135 | li { |
237 | 143 | margin: 0 0 0 2em; | 136 | margin: 0 0 0 2em; |
238 | 144 | list-style-type: disc; | 137 | list-style-type: disc; |
239 | 145 | } | 138 | } |
240 | 139 | } | ||
241 | 146 | 140 | ||
243 | 147 | .horizontal { | 141 | .horizontal { |
244 | 148 | margin: 1em 0 0 0; | 142 | margin: 1em 0 0 0; |
245 | 149 | } | ||
246 | 150 | 143 | ||
250 | 151 | .horizontal li { | 144 | li { |
251 | 152 | display: inline; | 145 | display: inline; |
252 | 153 | padding: 0 1.5em 0 0; | 146 | padding: 0 1.5em 0 0; |
253 | 154 | } | 147 | } |
254 | 148 | } | ||
255 | 155 | 149 | ||
257 | 156 | .subordinate { | 150 | .subordinate { |
258 | 157 | margin-left: 2em; | 151 | margin-left: 2em; |
260 | 158 | } | 152 | } |
261 | 159 | 153 | ||
263 | 160 | ol.subordinate { | 154 | ol.subordinate { |
264 | 161 | margin-left: 4em; | 155 | margin-left: 4em; |
266 | 162 | } | 156 | } |
267 | 163 | 157 | ||
269 | 164 | .two-column-list dl { | 158 | .two-column-list dl { |
270 | 165 | width: 48%; | 159 | width: 48%; |
271 | 166 | float: left; | 160 | float: left; |
272 | 167 | display: inline; | 161 | display: inline; |
273 | 168 | margin: 0 0.25em 0 0; | 162 | margin: 0 0.25em 0 0; |
274 | 169 | } | ||
275 | 170 | 163 | ||
279 | 171 | .two-column-list dl:first-child dt, | 164 | &:first-child { |
280 | 172 | .two-column-list dl:first-child + dl dt { | 165 | dt, + dl dt { |
281 | 173 | margin-top: 0; | 166 | margin-top: 0; |
282 | 167 | } | ||
283 | 174 | } | 168 | } |
284 | 169 | } | ||
285 | 175 | 170 | ||
287 | 176 | .three-column-list dl { | 171 | .three-column-list dl { |
288 | 177 | width: 31%; | 172 | width: 31%; |
289 | 178 | float: left; | 173 | float: left; |
290 | 179 | display: inline; | 174 | display: inline; |
291 | 180 | margin: 0 0.25em 0 0; | 175 | margin: 0 0.25em 0 0; |
293 | 181 | } | 176 | } |
294 | 182 | 177 | ||
296 | 183 | .two-column-list li { | 178 | .two-column-list li { |
297 | 184 | width: 48%; | 179 | width: 48%; |
298 | 185 | float: left; | 180 | float: left; |
299 | 186 | display: inline; | 181 | display: inline; |
300 | 187 | margin: 0 0.25em 0 0; | 182 | margin: 0 0.25em 0 0; |
302 | 188 | } | 183 | } |
303 | 189 | 184 | ||
305 | 190 | .three-column-list li { | 185 | .three-column-list li { |
306 | 191 | width: 31%; | 186 | width: 31%; |
307 | 192 | float: left; | 187 | float: left; |
308 | 193 | display: inline; | 188 | display: inline; |
309 | 194 | margin: 0 0.25em 0 0; | 189 | margin: 0 0.25em 0 0; |
311 | 195 | } | 190 | } |
312 | 196 | 191 | ||
315 | 197 | .two-column-list:after, | 192 | .two-column-list:after, .three-column-list:after { |
314 | 198 | .three-column-list:after { | ||
316 | 199 | content: "."; | 193 | content: "."; |
317 | 200 | display: block; | 194 | display: block; |
318 | 201 | height: 0; | 195 | height: 0; |
319 | 202 | clear: both; | 196 | clear: both; |
320 | 203 | visibility: hidden; | 197 | visibility: hidden; |
321 | 198 | } | ||
322 | 199 | |||
323 | 200 | .two-column-list { | ||
324 | 201 | dl.unseen, li.unseen { | ||
325 | 202 | /* Keep the abilty to hide list entries. */ | ||
326 | 203 | display: none; | ||
327 | 204 | } | 204 | } |
328 | 205 | } | ||
329 | 205 | 206 | ||
336 | 206 | .two-column-list dl.unseen, | 207 | .three-column-list { |
337 | 207 | .two-column-list li.unseen, | 208 | dl.unseen, li.unseen { |
338 | 208 | .three-column-list dl.unseen, | 209 | /* Keep the abilty to hide list entries. */ |
339 | 209 | .three-column-list li.unseen { | 210 | display: none; |
334 | 210 | /* Keep the abilty to hide list entries. */ | ||
335 | 211 | display: none; | ||
340 | 212 | } | 211 | } |
341 | 212 | } | ||
342 | 213 | 213 | ||
344 | 214 | caption { | 214 | caption { |
345 | 215 | caption-side: bottom; | 215 | caption-side: bottom; |
346 | 216 | text-align: left; | 216 | text-align: left; |
348 | 217 | } | 217 | } |
349 | 218 | 218 | ||
351 | 219 | th { | 219 | th { |
352 | 220 | text-align: right; | 220 | text-align: right; |
354 | 221 | } | 221 | vertical-align: baseline; |
355 | 222 | } | ||
356 | 222 | 223 | ||
359 | 223 | th, | 224 | td { |
358 | 224 | td { | ||
360 | 225 | vertical-align: baseline; | 225 | vertical-align: baseline; |
362 | 226 | } | 226 | } |
363 | 227 | 227 | ||
367 | 228 | .head th, | 228 | .head th, thead th, tr.thead th { |
365 | 229 | thead th, | ||
366 | 230 | tr.thead th { | ||
368 | 231 | text-align: left; | 229 | text-align: left; |
369 | 232 | vertical-align: bottom; | 230 | vertical-align: bottom; |
371 | 233 | } | 231 | } |
372 | 234 | 232 | ||
375 | 235 | th.icon, | 233 | th.icon, td.icon { |
374 | 236 | td.icon { | ||
376 | 237 | vertical-align: top; | 234 | vertical-align: top; |
377 | 238 | white-space: nowrap; | 235 | white-space: nowrap; |
378 | 239 | width: 1px; | 236 | width: 1px; |
380 | 240 | } | 237 | } |
381 | 241 | 238 | ||
384 | 242 | th.icon.left, | 239 | th.icon.left, td.icon.left { |
383 | 243 | td.icon.left { | ||
385 | 244 | padding-right: 0; | 240 | padding-right: 0; |
387 | 245 | } | 241 | } |
388 | 246 | 242 | ||
391 | 247 | th.icon.right, | 243 | th.icon.right, td.icon.right { |
390 | 248 | td.icon.right { | ||
392 | 249 | padding-left: 0; | 244 | padding-left: 0; |
394 | 250 | } | 245 | } |
395 | 251 | 246 | ||
398 | 252 | th.nowrap, | 247 | th.nowrap, td.nowrap { |
397 | 253 | td.nowrap { | ||
399 | 254 | white-space: nowrap; | 248 | white-space: nowrap; |
401 | 255 | } | 249 | } |
402 | 256 | 250 | ||
405 | 257 | tfoot th, | 251 | tfoot th, table.contributions th { |
404 | 258 | table.contributions th { | ||
406 | 259 | text-align: left; | 252 | text-align: left; |
408 | 260 | } | 253 | } |
409 | 261 | 254 | ||
412 | 262 | tr.white { | 255 | tr { |
413 | 263 | background-color: #fff; | 256 | &.white { |
414 | 257 | background-color: #fff; | ||
415 | 264 | } | 258 | } |
416 | 265 | 259 | ||
419 | 266 | tr.shaded { | 260 | &.shaded { |
420 | 267 | background-color: #f6f6f6; | 261 | background-color: #f6f6f6; |
421 | 268 | } | 262 | } |
422 | 263 | } | ||
423 | 269 | 264 | ||
427 | 270 | table .amount, | 265 | table { |
428 | 271 | table .action-icons { | 266 | .amount, .action-icons { |
429 | 272 | text-align: right; | 267 | text-align: right; |
430 | 273 | } | 268 | } |
431 | 274 | 269 | ||
435 | 275 | table.contributions th { | 270 | &.contributions { |
436 | 276 | font-weight: normal; | 271 | th { |
437 | 277 | } | 272 | font-weight: normal; |
438 | 273 | } | ||
439 | 278 | 274 | ||
444 | 279 | table.contributions td { | 275 | td { |
445 | 280 | vertical-align: middle; | 276 | vertical-align: middle; |
446 | 281 | width: 16px; | 277 | width: 16px; |
447 | 282 | text-align: left; | 278 | text-align: left; |
448 | 279 | } | ||
449 | 283 | } | 280 | } |
450 | 284 | 281 | ||
454 | 285 | table.latest th, | 282 | &.latest { |
455 | 286 | table.latest td { | 283 | th, td { |
456 | 287 | padding-bottom: 2em; | 284 | padding-bottom: 2em; |
457 | 285 | } | ||
458 | 288 | } | 286 | } |
459 | 289 | 287 | ||
462 | 290 | table.duplicate.listing * { | 288 | &.duplicate.listing * { |
463 | 291 | color: #999; | 289 | color: #999; |
464 | 292 | } | 290 | } |
465 | 291 | } | ||
466 | 293 | 292 | ||
470 | 294 | .table-actions:nth-child(2) { | 293 | .table-actions { |
471 | 295 | /* text-align works because the <li> is also display:inline. */ | 294 | &:nth-child(2) { |
472 | 296 | text-align: right; | 295 | /* text-align works because the <li> is also display:inline. */ |
473 | 296 | text-align: right; | ||
474 | 297 | } | 297 | } |
475 | 298 | 298 | ||
476 | 299 | .table-actions { | ||
477 | 300 | margin: 1em 0 0 0; | 299 | margin: 1em 0 0 0; |
478 | 301 | } | ||
479 | 302 | 300 | ||
483 | 303 | .table-actions li { | 301 | li { |
484 | 304 | display: inline; | 302 | display: inline; |
485 | 305 | padding: 0 1.5em 0 0; | 303 | padding: 0 1.5em 0 0; |
486 | 306 | } | 304 | } |
487 | 305 | } | ||
488 | 307 | 306 | ||
492 | 308 | table.compressed { | 307 | table { |
493 | 309 | width: auto; | 308 | &.compressed { |
494 | 310 | } | 309 | width: auto; |
495 | 311 | 310 | ||
498 | 312 | table.compressed td { | 311 | td { |
499 | 313 | padding: 0.25em 0.5em; | 312 | padding: 0.25em 0.5em; |
500 | 313 | } | ||
501 | 314 | } | 314 | } |
502 | 315 | 315 | ||
509 | 316 | table.cozy-listing { | 316 | &.cozy-listing { |
510 | 317 | width: 20em; | 317 | width: 20em; |
511 | 318 | background-color: #fff; | 318 | background-color: #fff; |
512 | 319 | border: 1px solid #d2d2d2; | 319 | border: 1px solid #d2d2d2; |
513 | 320 | border-bottom: 1px solid #d2d2d2; | 320 | border-bottom: 1px solid #d2d2d2; |
508 | 321 | } | ||
514 | 322 | 321 | ||
518 | 323 | table.cozy-listing td { | 322 | td { |
519 | 324 | border: 1px #d2d2d2; | 323 | border: 1px #d2d2d2; |
520 | 325 | border-style: dotted none none none; | 324 | border-style: dotted none none none; |
521 | 325 | } | ||
522 | 326 | } | 326 | } |
523 | 327 | 327 | ||
530 | 328 | table.sortable a.sortheader { | 328 | &.sortable { |
531 | 329 | color: #666; | 329 | a.sortheader { |
532 | 330 | font-weight: bold; | 330 | color: #666; |
533 | 331 | text-decoration: none; | 331 | font-weight: bold; |
534 | 332 | display: block; | 332 | text-decoration: none; |
535 | 333 | } | 333 | display: block; |
536 | 334 | } | ||
537 | 334 | 335 | ||
541 | 335 | table.sortable img.sortarrow { | 336 | img.sortarrow { |
542 | 336 | padding-left: 2px; | 337 | padding-left: 2px; |
543 | 337 | } | 338 | } |
544 | 338 | 339 | ||
547 | 339 | table.sortable th { | 340 | th { |
548 | 340 | cursor: pointer; | 341 | cursor: pointer; |
549 | 342 | } | ||
550 | 341 | } | 343 | } |
551 | 344 | } | ||
552 | 342 | 345 | ||
557 | 343 | th.ascending { | 346 | th { |
558 | 344 | background-image: url(/@@/arrowDown); | 347 | &.ascending { |
559 | 345 | background-position: center right; | 348 | background-image: url(/@@/arrowDown); |
560 | 346 | background-repeat: no-repeat; | 349 | background-position: center right; |
561 | 350 | background-repeat: no-repeat; | ||
562 | 347 | } | 351 | } |
563 | 348 | 352 | ||
568 | 349 | th.descending { | 353 | &.descending { |
569 | 350 | background-image: url(/@@/arrowUp); | 354 | background-image: url(/@@/arrowUp); |
570 | 351 | background-position: center right; | 355 | background-position: center right; |
571 | 352 | background-repeat: no-repeat; | 356 | background-repeat: no-repeat; |
572 | 353 | } | 357 | } |
573 | 358 | } | ||
574 | 354 | 359 | ||
577 | 355 | .sortkey, | 360 | .sortkey, .revsortkey { |
576 | 356 | .revsortkey { | ||
578 | 357 | /* Used to indicate a value to be used to sort cells in a row */ | 361 | /* Used to indicate a value to be used to sort cells in a row */ |
579 | 358 | display: none; | 362 | display: none; |
714 | 359 | } | 363 | } |
715 | 360 | 364 | ||
716 | 361 | table.listing { | 365 | table { |
717 | 362 | margin: 0; | 366 | &.listing { |
718 | 363 | width: 100%; | 367 | margin: 0; |
719 | 364 | } | 368 | width: 100%; |
720 | 365 | 369 | border-bottom: 1px solid #d2d2d2; | |
721 | 366 | table.listing, | 370 | |
722 | 367 | table.listing tbody, | 371 | tbody, td.end-of-section { |
723 | 368 | table.listing td.end-of-section { | 372 | border-bottom: 1px solid #d2d2d2; |
724 | 369 | border-bottom: 1px solid #d2d2d2; | 373 | } |
725 | 370 | } | 374 | |
726 | 371 | 375 | th { | |
727 | 372 | table.listing th { | 376 | font-weight: bold; |
728 | 373 | font-weight: bold; | 377 | } |
729 | 374 | } | 378 | |
730 | 375 | 379 | .head, thead { | |
731 | 376 | table.listing .head, | 380 | border: 1px solid #d2d2d2; |
732 | 377 | table.listing .head th, | 381 | background-color: #fff; |
733 | 378 | table.listing thead, | 382 | |
734 | 379 | table.listing thead th, | 383 | th { |
735 | 380 | table.listing tfoot tr, | 384 | border: 1px solid #d2d2d2; |
736 | 381 | table.listing tr.thead th { | 385 | background-color: #fff; |
737 | 382 | border: 1px solid #d2d2d2; | 386 | } |
738 | 383 | background-color: #fff; | 387 | } |
739 | 384 | } | 388 | |
740 | 385 | 389 | tfoot tr { | |
741 | 386 | table.listing tr.category { | 390 | border: 1px solid #d2d2d2; |
742 | 387 | border-bottom: 1px solid #999; | 391 | background-color: #fff; |
743 | 388 | } | 392 | } |
744 | 389 | 393 | ||
745 | 390 | table.listing tr.category th, | 394 | tr { |
746 | 391 | table.listing tr.category td { | 395 | &.thead th { |
747 | 392 | padding-top: 1em; | 396 | border: 1px solid #d2d2d2; |
748 | 393 | } | 397 | background-color: #fff; |
749 | 394 | 398 | } | |
750 | 395 | table.listing thead td, | 399 | |
751 | 396 | table.listing table tbody, | 400 | &.category { |
752 | 397 | table.listing table thead, | 401 | border-bottom: 1px solid #999; |
753 | 398 | table.listing table thead th, | 402 | |
754 | 399 | table.listing tfoot tr, | 403 | th, td { |
755 | 400 | table.listing table tfoot td, | 404 | padding-top: 1em; |
756 | 401 | table.listing table td { | 405 | } |
757 | 402 | border: none; | 406 | } |
758 | 403 | } | 407 | } |
759 | 404 | 408 | ||
760 | 405 | table.listing tfoot td { | 409 | thead td { |
761 | 406 | border: 1px solid #d2d2d2; | 410 | border: none; |
762 | 407 | } | 411 | } |
763 | 408 | 412 | ||
764 | 409 | table.listing th, | 413 | table { |
765 | 410 | table.listing td { | 414 | tbody { |
766 | 411 | padding: 0.25em; | 415 | border: none; |
767 | 412 | } | 416 | } |
768 | 413 | 417 | ||
769 | 414 | table.listing table th, | 418 | thead { |
770 | 415 | table.listing table td { | 419 | border: none; |
771 | 416 | /* We don't want extra padding on nested tables, like batch navigation. */ | 420 | |
772 | 417 | padding: 0; | 421 | th { |
773 | 418 | } | 422 | border: none; |
774 | 419 | 423 | } | |
775 | 420 | table.listing thead th, | 424 | } |
776 | 421 | table.listing tr.thead th { | 425 | } |
777 | 422 | white-space: nowrap; | 426 | |
778 | 423 | } | 427 | tfoot tr { |
779 | 424 | 428 | border: none; | |
780 | 425 | table.listing td { | 429 | } |
781 | 426 | border: 1px #d2d2d2; | 430 | |
782 | 427 | border-style: dotted none none none; | 431 | table { |
783 | 428 | } | 432 | tfoot td, td { |
784 | 429 | 433 | border: none; | |
785 | 430 | table.listing tr.category:first-child td { | 434 | } |
786 | 431 | border-top-style: none; | 435 | } |
787 | 432 | padding-top: 0; | 436 | |
788 | 433 | } | 437 | tfoot td { |
789 | 434 | 438 | border: 1px solid #d2d2d2; | |
790 | 435 | table.listing .section-break td { | 439 | } |
791 | 436 | border-width: 1px 0 0 0; | 440 | |
792 | 437 | border-style: solid; | 441 | th, td { |
793 | 438 | border-color: #d2d2d2; | 442 | padding: 0.25em; |
794 | 439 | height: 1em; | 443 | } |
795 | 440 | } | 444 | |
796 | 441 | 445 | table { | |
797 | 442 | table.listing .note td { | 446 | th, td { |
798 | 443 | border-style: none; | 447 | /* We don't want extra padding on nested tables, like batch navigation. */ |
799 | 444 | } | 448 | padding: 0; |
800 | 445 | 449 | } | |
801 | 446 | table.listing img { | 450 | } |
802 | 447 | vertical-align: middle; | 451 | |
803 | 448 | } | 452 | thead th, tr.thead th { |
804 | 449 | 453 | white-space: nowrap; | |
805 | 450 | table.listing tr.secondary th, | 454 | } |
806 | 451 | table.listing tr.secondary td { | 455 | |
807 | 452 | border-top: none; | 456 | td { |
808 | 453 | } | 457 | border: 1px #d2d2d2; |
809 | 454 | 458 | border-style: dotted none none none; | |
810 | 455 | table.listing table.simple { | 459 | } |
811 | 456 | margin-left: 2em; | 460 | |
812 | 457 | } | 461 | tr.category:first-child td { |
813 | 458 | 462 | border-top-style: none; | |
814 | 459 | table.listing table.simple td { | 463 | padding-top: 0; |
815 | 460 | padding: 0.25em; | 464 | } |
816 | 461 | } | 465 | |
817 | 462 | 466 | .section-break td { | |
818 | 463 | table.listing .section-heading { | 467 | border-width: 1px 0 0 0; |
819 | 464 | border: none; | 468 | border-style: solid; |
820 | 465 | padding-top: 1.5em; | 469 | border-color: #d2d2d2; |
821 | 466 | } | 470 | height: 1em; |
822 | 467 | 471 | } | |
823 | 468 | table.summary th, | 472 | |
824 | 469 | table.summary td, | 473 | .note td { |
825 | 470 | table.listing table.summary th, | 474 | border-style: none; |
826 | 471 | table.listing table.summary td { | 475 | } |
827 | 472 | /* Summary tables havesubdued headers and a little row spacing. */ | 476 | |
828 | 473 | padding: 0 0.5em 0.5em 0; | 477 | img { |
829 | 474 | } | 478 | vertical-align: middle; |
830 | 475 | 479 | } | |
831 | 476 | table.summary th { | 480 | |
832 | 477 | font-weight: normal; | 481 | tr.secondary { |
833 | 478 | } | 482 | th, td { |
834 | 479 | 483 | border-top: none; | |
835 | 480 | table.summary caption { | 484 | } |
836 | 481 | font-style: italic; | 485 | } |
837 | 482 | margin-left: 1em; | 486 | |
838 | 483 | } | 487 | table.simple { |
839 | 484 | 488 | margin-left: 2em; | |
840 | 485 | table.summary ul, | 489 | |
841 | 486 | table.summary ul li { | 490 | td { |
842 | 487 | list-style-position: inside; | 491 | padding: 0.25em; |
843 | 488 | margin: 0; | 492 | } |
844 | 489 | padding: 0; | 493 | } |
845 | 490 | } | 494 | |
846 | 491 | 495 | .section-heading { | |
847 | 492 | .results { | 496 | border: none; |
848 | 497 | padding-top: 1.5em; | ||
849 | 498 | } | ||
850 | 499 | } | ||
851 | 500 | |||
852 | 501 | &.summary { | ||
853 | 502 | th, td { | ||
854 | 503 | /* Summary tables havesubdued headers and a little row spacing. */ | ||
855 | 504 | padding: 0 0.5em 0.5em 0; | ||
856 | 505 | } | ||
857 | 506 | } | ||
858 | 507 | |||
859 | 508 | &.listing table.summary { | ||
860 | 509 | th, td { | ||
861 | 510 | /* Summary tables havesubdued headers and a little row spacing. */ | ||
862 | 511 | padding: 0 0.5em 0.5em 0; | ||
863 | 512 | } | ||
864 | 513 | } | ||
865 | 514 | |||
866 | 515 | &.summary { | ||
867 | 516 | th { | ||
868 | 517 | font-weight: normal; | ||
869 | 518 | } | ||
870 | 519 | |||
871 | 520 | caption { | ||
872 | 521 | font-style: italic; | ||
873 | 522 | margin-left: 1em; | ||
874 | 523 | } | ||
875 | 524 | |||
876 | 525 | ul { | ||
877 | 526 | list-style-position: inside; | ||
878 | 527 | margin: 0; | ||
879 | 528 | padding: 0; | ||
880 | 529 | |||
881 | 530 | li { | ||
882 | 531 | list-style-position: inside; | ||
883 | 532 | margin: 0; | ||
884 | 533 | padding: 0; | ||
885 | 534 | } | ||
886 | 535 | } | ||
887 | 536 | } | ||
888 | 537 | } | ||
889 | 538 | |||
890 | 539 | .results { | ||
891 | 493 | background-color: #f4f4f4; | 540 | background-color: #f4f4f4; |
892 | 494 | padding: 2px 10px 5px 10px; | 541 | padding: 2px 10px 5px 10px; |
893 | 495 | border-bottom-right-radius: 5px; | 542 | border-bottom-right-radius: 5px; |
894 | 496 | border-bottom-left-radius: 5px; | 543 | border-bottom-left-radius: 5px; |
896 | 497 | } | 544 | } |
897 | 545 | |||
898 | 546 | @import 'typography', | ||
899 | 547 | 'colours', | ||
900 | 548 | 'forms', | ||
901 | 549 | 'layout', | ||
902 | 550 | 'modifiers' | ||
903 | diff --git a/lib/canonical/launchpad/icing/css/colours.css b/lib/canonical/launchpad/icing/css/colours.css | |||
904 | 498 | deleted file mode 100644 | 551 | deleted file mode 100644 |
905 | index e43f46d..0000000 | |||
906 | --- a/lib/canonical/launchpad/icing/css/colours.css | |||
907 | +++ /dev/null | |||
908 | @@ -1,351 +0,0 @@ | |||
909 | 1 | |||
910 | 2 | |||
911 | 3 | .questionstatusOPEN { | ||
912 | 4 | color: #000; | ||
913 | 5 | } | ||
914 | 6 | .questionstatusNEEDSINFO { | ||
915 | 7 | /* brown */ | ||
916 | 8 | color: #930; | ||
917 | 9 | } | ||
918 | 10 | .questionstatusANSWERED { | ||
919 | 11 | /* grey-green */ | ||
920 | 12 | color: #363; | ||
921 | 13 | } | ||
922 | 14 | .questionstatusSOLVED { | ||
923 | 15 | color: #090; | ||
924 | 16 | } | ||
925 | 17 | .questionstatusEXPIRED { | ||
926 | 18 | color: #666; | ||
927 | 19 | } | ||
928 | 20 | .questionstatusINVALID { | ||
929 | 21 | color: #c00; | ||
930 | 22 | } | ||
931 | 23 | |||
932 | 24 | |||
933 | 25 | .specstatusAPPROVED, .specstatusAPPROVED a { | ||
934 | 26 | color: green; | ||
935 | 27 | } | ||
936 | 28 | .specstatusPENDINGAPPROVAL, .specstatusPENDINGAPPROVAL a, | ||
937 | 29 | .specstatusPENDINGREVIEW, .specstatusPENDINGREVIEW a { | ||
938 | 30 | color: #f09; | ||
939 | 31 | } | ||
940 | 32 | .specstatusDRAFT, .specstatusDRAFT a, | ||
941 | 33 | .specstatusDISCUSSION, .specstatusDISCUSSION a { | ||
942 | 34 | color: #930; | ||
943 | 35 | } | ||
944 | 36 | .specstatusNEW, .specstatusNEW a { | ||
945 | 37 | color: red; | ||
946 | 38 | } | ||
947 | 39 | .specstatusSUPERSEDED, .specstatusSUPERSEDED a, | ||
948 | 40 | .specstatusOBSOLETE, .specstatusOBSOLETE a, | ||
949 | 41 | .specpriorityNOTFORUS, .specpriorityNOTFORUS a, | ||
950 | 42 | .specpriorityUNDEFINED, .specpriorityUNDEFINED a { | ||
951 | 43 | color: gray; | ||
952 | 44 | } | ||
953 | 45 | .specpriorityLOW, .specpriorityLOW a { | ||
954 | 46 | color: black; | ||
955 | 47 | } | ||
956 | 48 | .specpriorityMEDIUM, .specpriorityMEDIUM a { | ||
957 | 49 | color: #f60; | ||
958 | 50 | } | ||
959 | 51 | .specpriorityHIGH, .specpriorityHIGH a, | ||
960 | 52 | .specpriorityESSENTIAL, .specpriorityESSENTIAL a { | ||
961 | 53 | color: red; | ||
962 | 54 | } | ||
963 | 55 | .specdeliveryUNKNOWN, .specdeliveryUNKNOWN a, | ||
964 | 56 | .specdeliveryNOTSTARTED, .specdeliveryNOTSTARTED a { | ||
965 | 57 | color: gray; | ||
966 | 58 | } | ||
967 | 59 | .specdeliveryDEFERRED, .specdeliveryDEFERRED a, | ||
968 | 60 | .specdeliveryNEEDSINFRASTUCTURE, .specdeliveryNEEDSINFRASTUCTURE a, | ||
969 | 61 | .specdeliveryBLOCKED, .specdeliveryBLOCKED a { | ||
970 | 62 | color: red; | ||
971 | 63 | } | ||
972 | 64 | .specdeliverySTARTED, .specdeliverySTARTED a, | ||
973 | 65 | .specdeliveryGOOD, .specdeliveryGOOD a { | ||
974 | 66 | color: blue; | ||
975 | 67 | } | ||
976 | 68 | .specdeliverySLOW, .specdeliverySLOW a { | ||
977 | 69 | color: red; | ||
978 | 70 | } | ||
979 | 71 | .specdeliveryBETA, .specdeliveryBETA a { | ||
980 | 72 | color: #f60; | ||
981 | 73 | } | ||
982 | 74 | .specdeliveryNEEDSREVIEW, .specdeliveryNEEDSREVIEW a { | ||
983 | 75 | color: purple; | ||
984 | 76 | } | ||
985 | 77 | .specdeliveryAWAITINGDEPLOYMENT, .specdeliveryAWAITINGDEPLOYMENT a { | ||
986 | 78 | color: red; | ||
987 | 79 | } | ||
988 | 80 | .specdeliveryIMPLEMENTED, .specdeliveryIMPLEMENTED a, | ||
989 | 81 | .specdeliveryINFORMATIONAL, .specdeliveryINFORMATIONAL a { | ||
990 | 82 | color: green; | ||
991 | 83 | } | ||
992 | 84 | |||
993 | 85 | |||
994 | 86 | .bug-activity { | ||
995 | 87 | color: #555; | ||
996 | 88 | } | ||
997 | 89 | .statusNEW, .statusNEW a { | ||
998 | 90 | color: #930; | ||
999 | 91 | } | ||
1000 | 92 | .statusINCOMPLETE, .statusINCOMPLETE a, | ||
1001 | 93 | .statusCONFIRMED, .statusCONFIRMED a { | ||
1002 | 94 | color: red; | ||
1003 | 95 | } | ||
1004 | 96 | .statusTRIAGED, .statusTRIAGED a { | ||
1005 | 97 | color: #f60; | ||
1006 | 98 | } | ||
1007 | 99 | .statusINPROGRESS, .statusINPROGRESS a { | ||
1008 | 100 | color: black; | ||
1009 | 101 | } | ||
1010 | 102 | .statusFIXCOMMITTED, .statusFIXCOMMITTED a { | ||
1011 | 103 | color: #050; | ||
1012 | 104 | } | ||
1013 | 105 | .statusFIXRELEASED, .statusFIXRELEASED a { | ||
1014 | 106 | color: green; | ||
1015 | 107 | } | ||
1016 | 108 | .statusINVALID, .statusINVALID a, | ||
1017 | 109 | .statusWONTFIX, .statusWONTFIX a, | ||
1018 | 110 | .statusOPINION, .statusOPINION a { | ||
1019 | 111 | color: #555; | ||
1020 | 112 | } | ||
1021 | 113 | .importanceCRITICAL, .importanceCRITICAL a { | ||
1022 | 114 | color: red; | ||
1023 | 115 | } | ||
1024 | 116 | .importanceHIGH, .importanceHIGH a { | ||
1025 | 117 | color: #f60; | ||
1026 | 118 | } | ||
1027 | 119 | .importanceMEDIUM, .importanceMEDIUM a { | ||
1028 | 120 | color: green; | ||
1029 | 121 | } | ||
1030 | 122 | .importanceLOW, .importanceLOW a { | ||
1031 | 123 | color: black; | ||
1032 | 124 | } | ||
1033 | 125 | .importanceWISHLIST, .importanceWISHLIST a { | ||
1034 | 126 | color: blue; | ||
1035 | 127 | } | ||
1036 | 128 | .importanceUNDECIDED, .importanceUNDECIDED a { | ||
1037 | 129 | color: #999; | ||
1038 | 130 | } | ||
1039 | 131 | #client-listing .statusUNKNOWN, #client-listing .statusUNKNOWN a, | ||
1040 | 132 | #client-listing .statusNEW, #client-listing .statusNEW a, | ||
1041 | 133 | #client-listing .statusINCOMPLETE, #client-listing .statusINCOMPLETE a { | ||
1042 | 134 | color: #c63600; | ||
1043 | 135 | background-color: #ffdabe; | ||
1044 | 136 | } | ||
1045 | 137 | #client-listing .statusCONFIRMED, #client-listing .statusCONFIRMED a, | ||
1046 | 138 | #client-listing .statusTRIAGED, #client-listing .statusTRIAGED a { | ||
1047 | 139 | color: #896e00; | ||
1048 | 140 | background-color: #f4f1a4; | ||
1049 | 141 | } | ||
1050 | 142 | #client-listing .statusINPROGRESS, #client-listing .statusINPROGRESS a, | ||
1051 | 143 | #client-listing .statusFIXCOMMITTED, #client-listing .statusFIXCOMMITTED a { | ||
1052 | 144 | color: #137587; | ||
1053 | 145 | background-color: #cbe7ef; | ||
1054 | 146 | } | ||
1055 | 147 | #client-listing .statusFIXRELEASED, #client-listing .statusFIXRELEASED a { | ||
1056 | 148 | color: #4f7b10; | ||
1057 | 149 | background-color: #cef1a0; | ||
1058 | 150 | } | ||
1059 | 151 | #client-listing .statusEXPIRED, #client-listing .statusEXPIRED a, | ||
1060 | 152 | #client-listing .statusINVALID, #client-listing .statusINVALID a, | ||
1061 | 153 | #client-listing .statusWONTFIX, #client-listing .statusWONTFIX a, | ||
1062 | 154 | #client-listing .statusOPINION, #client-listing .statusOPINION a { | ||
1063 | 155 | color: #464646; | ||
1064 | 156 | background-color: #ddd; | ||
1065 | 157 | } | ||
1066 | 158 | #client-listing .importanceCRITICAL, #client-listing .importanceCRITICAL a { | ||
1067 | 159 | background-color: #DF382C; | ||
1068 | 160 | color: white; | ||
1069 | 161 | } | ||
1070 | 162 | #client-listing .importanceHIGH, #client-listing .importanceHIGH a { | ||
1071 | 163 | background-color: #EFB73E; | ||
1072 | 164 | color: white; | ||
1073 | 165 | } | ||
1074 | 166 | #client-listing .importanceMEDIUM, #client-listing .importanceMEDIUM a { | ||
1075 | 167 | background-color: #19B6EE; | ||
1076 | 168 | color: white; | ||
1077 | 169 | } | ||
1078 | 170 | #client-listing .importanceLOW, #client-listing .importanceLOW a { | ||
1079 | 171 | background-color: #38B44A; | ||
1080 | 172 | color: white; | ||
1081 | 173 | } | ||
1082 | 174 | #client-listing .importanceWISHLIST, #client-listing .importanceWISHLIST a { | ||
1083 | 175 | background-color: #724dc8; | ||
1084 | 176 | color: white; | ||
1085 | 177 | } | ||
1086 | 178 | #client-listing .importanceUNDECIDED, #client-listing .importanceUNDECIDED a { | ||
1087 | 179 | background-color: #666666; | ||
1088 | 180 | color: white; | ||
1089 | 181 | } | ||
1090 | 182 | |||
1091 | 183 | a.official-tag { | ||
1092 | 184 | /* Looks just like a normal link */ | ||
1093 | 185 | } | ||
1094 | 186 | a.unofficial-tag { | ||
1095 | 187 | color: #6699ee; | ||
1096 | 188 | } | ||
1097 | 189 | |||
1098 | 190 | |||
1099 | 191 | |||
1100 | 192 | .vcsimportSUCCESS { | ||
1101 | 193 | /* inherited text color */ | ||
1102 | 194 | } | ||
1103 | 195 | .vcsimportFAILURE { | ||
1104 | 196 | color: Red; | ||
1105 | 197 | } | ||
1106 | 198 | .greylink a:link, .greylink a:visited { | ||
1107 | 199 | color: gray; | ||
1108 | 200 | } | ||
1109 | 201 | .stale-diff { | ||
1110 | 202 | color: #f60; | ||
1111 | 203 | } | ||
1112 | 204 | .conflicts-diff { | ||
1113 | 205 | color: red; | ||
1114 | 206 | } | ||
1115 | 207 | .branchstatusMATURE, .branchstatusMATURE a { | ||
1116 | 208 | color: #090; | ||
1117 | 209 | } | ||
1118 | 210 | .branchstatusDEVELOPMENT, .branchstatusDEVELOPMENT a { | ||
1119 | 211 | color: #900; | ||
1120 | 212 | } | ||
1121 | 213 | .branchstatusEXPERIMENTAL, .branchstatusEXPERIMENTAL a { | ||
1122 | 214 | color: #930; | ||
1123 | 215 | } | ||
1124 | 216 | .branchstatusMERGED, .branchstatusMERGED a, | ||
1125 | 217 | .branchstatusABANDONED, .branchstatusABANDONED a { | ||
1126 | 218 | color: gray; | ||
1127 | 219 | } | ||
1128 | 220 | .branchstatusNEW, .branchstatusNEW a { | ||
1129 | 221 | color: black; | ||
1130 | 222 | } | ||
1131 | 223 | .voteAPPROVE { | ||
1132 | 224 | color: green; | ||
1133 | 225 | } | ||
1134 | 226 | .voteNEEDS_FIXING { | ||
1135 | 227 | color: #930; | ||
1136 | 228 | } | ||
1137 | 229 | .voteDISAPPROVE, | ||
1138 | 230 | .voteRESUBMIT { | ||
1139 | 231 | color: red; | ||
1140 | 232 | } | ||
1141 | 233 | .voteABSTAIN { | ||
1142 | 234 | color: #666; | ||
1143 | 235 | } | ||
1144 | 236 | .votePENDING { | ||
1145 | 237 | color: #f60; | ||
1146 | 238 | } | ||
1147 | 239 | .mergestatusWORK_IN_PROGRESS, .mergestatusWORK_IN_PROGRESS a { | ||
1148 | 240 | color: black; | ||
1149 | 241 | } | ||
1150 | 242 | .mergestatusNEEDS_REVIEW, .mergestatusNEEDS_REVIEW a { | ||
1151 | 243 | color: #f60; | ||
1152 | 244 | } | ||
1153 | 245 | .mergestatusCODE_APPROVED, .mergestatusCODE_APPROVED a, | ||
1154 | 246 | .mergestatusMERGED, .mergestatusMERGED a { | ||
1155 | 247 | color: green; | ||
1156 | 248 | } | ||
1157 | 249 | .mergestatusREJECTED, .mergestatusREJECTED a, | ||
1158 | 250 | .mergestatusMERGE_FAILED, .mergestatusMERGE_FAILED a { | ||
1159 | 251 | color: red; | ||
1160 | 252 | } | ||
1161 | 253 | .mergestatusQUEUED, .mergestatusQUEUED a { | ||
1162 | 254 | color: black; | ||
1163 | 255 | } | ||
1164 | 256 | .mergestatusSUPERSEDED, .mergestatusSUPERSEDED a { | ||
1165 | 257 | color: #666; | ||
1166 | 258 | } | ||
1167 | 259 | .codeimportNEW { | ||
1168 | 260 | color: #930; | ||
1169 | 261 | } | ||
1170 | 262 | .codeimportREVIEWED { | ||
1171 | 263 | color: green; | ||
1172 | 264 | } | ||
1173 | 265 | .codeimportINVALID, | ||
1174 | 266 | .codeimportSUSPENDED, | ||
1175 | 267 | .codeimportFAILING { | ||
1176 | 268 | color: red; | ||
1177 | 269 | } | ||
1178 | 270 | |||
1179 | 271 | |||
1180 | 272 | .translationimportstatusAPPROVED, | ||
1181 | 273 | .translationimportstatusAPPROVED a { | ||
1182 | 274 | color: #050; | ||
1183 | 275 | } | ||
1184 | 276 | .translationimportstatusIMPORTED, | ||
1185 | 277 | .translationimportstatusIMPORTED a { | ||
1186 | 278 | color: green; | ||
1187 | 279 | } | ||
1188 | 280 | .translationimportstatusDELETED, | ||
1189 | 281 | .translationimportstatusDELETED a { | ||
1190 | 282 | color: black; | ||
1191 | 283 | } | ||
1192 | 284 | .translationimportstatusFAILED, | ||
1193 | 285 | .translationimportstatusFAILED a { | ||
1194 | 286 | color: red; | ||
1195 | 287 | } | ||
1196 | 288 | .translationimportstatusNEEDS_REVIEW, | ||
1197 | 289 | .translationimportstatusNEEDS_REVIEW a { | ||
1198 | 290 | color: #f60; | ||
1199 | 291 | } | ||
1200 | 292 | .translationimportstatusBLOCKED, | ||
1201 | 293 | .translationimportstatusBLOCKED a { | ||
1202 | 294 | color: blue; | ||
1203 | 295 | } | ||
1204 | 296 | .translationimportstatusNEEDS_INFORMATION, | ||
1205 | 297 | .translationimportstatusNEEDS_INFORMATION a { | ||
1206 | 298 | color: maroon; | ||
1207 | 299 | } | ||
1208 | 300 | .dismissed, .dismissed a { | ||
1209 | 301 | color: #666; | ||
1210 | 302 | } | ||
1211 | 303 | |||
1212 | 304 | |||
1213 | 305 | .distromirrorstatusUP, | ||
1214 | 306 | .distromirrorstatusONEHOURBEHIND, | ||
1215 | 307 | .distromirrorstatusTWOHOURSBEHIND, | ||
1216 | 308 | .distromirrorstatusFOURHOURSBEHIND, | ||
1217 | 309 | .distromirrorstatusSIXHOURSBEHIND { | ||
1218 | 310 | color: green; | ||
1219 | 311 | } | ||
1220 | 312 | .distromirrorstatusONEDAYBEHIND { | ||
1221 | 313 | color: #f60; | ||
1222 | 314 | } | ||
1223 | 315 | .distromirrorstatusTWODAYSBEHIND, | ||
1224 | 316 | .distromirrorstatusONEWEEKBEHIND { | ||
1225 | 317 | color: red; | ||
1226 | 318 | } | ||
1227 | 319 | .distromirrorstatusUNKNOWN { | ||
1228 | 320 | color: #666; | ||
1229 | 321 | } | ||
1230 | 322 | .buildstatusNEEDSBUILD { | ||
1231 | 323 | color: gray; | ||
1232 | 324 | } | ||
1233 | 325 | .buildstatusBUILDING { | ||
1234 | 326 | color: black; | ||
1235 | 327 | } | ||
1236 | 328 | .buildstatusFULLYBUILT { | ||
1237 | 329 | color: green; | ||
1238 | 330 | } | ||
1239 | 331 | .buildstatusFAILEDTOBUILD, | ||
1240 | 332 | .buildstatusMANUALDEPWAIT, | ||
1241 | 333 | .buildstatusCHROOTWAIT, | ||
1242 | 334 | .buildstatusSUPERSEDED, | ||
1243 | 335 | .buildstatusFAILEDTOUPLOAD { | ||
1244 | 336 | color: red; | ||
1245 | 337 | } | ||
1246 | 338 | |||
1247 | 339 | |||
1248 | 340 | .launchpad-gold { | ||
1249 | 341 | color: #F8C300; | ||
1250 | 342 | } | ||
1251 | 343 | |||
1252 | 344 | |||
1253 | 345 | .green { | ||
1254 | 346 | color: green; | ||
1255 | 347 | } | ||
1256 | 348 | |||
1257 | 349 | .red { | ||
1258 | 350 | color: red; | ||
1259 | 351 | } | ||
1260 | diff --git a/lib/canonical/launchpad/icing/css/colours.scss b/lib/canonical/launchpad/icing/css/colours.scss | |||
1261 | 352 | new file mode 100644 | 0 | new file mode 100644 |
1262 | index 0000000..6b4c041 | |||
1263 | --- /dev/null | |||
1264 | +++ b/lib/canonical/launchpad/icing/css/colours.scss | |||
1265 | @@ -0,0 +1,633 @@ | |||
1266 | 1 | .questionstatusOPEN { | ||
1267 | 2 | color: #000; | ||
1268 | 3 | } | ||
1269 | 4 | |||
1270 | 5 | .questionstatusNEEDSINFO { | ||
1271 | 6 | /* brown */ | ||
1272 | 7 | color: #930; | ||
1273 | 8 | } | ||
1274 | 9 | |||
1275 | 10 | .questionstatusANSWERED { | ||
1276 | 11 | /* grey-green */ | ||
1277 | 12 | color: #363; | ||
1278 | 13 | } | ||
1279 | 14 | |||
1280 | 15 | .questionstatusSOLVED { | ||
1281 | 16 | color: #090; | ||
1282 | 17 | } | ||
1283 | 18 | |||
1284 | 19 | .questionstatusEXPIRED { | ||
1285 | 20 | color: #666; | ||
1286 | 21 | } | ||
1287 | 22 | |||
1288 | 23 | .questionstatusINVALID { | ||
1289 | 24 | color: #c00; | ||
1290 | 25 | } | ||
1291 | 26 | |||
1292 | 27 | .specstatusAPPROVED { | ||
1293 | 28 | color: green; | ||
1294 | 29 | |||
1295 | 30 | a { | ||
1296 | 31 | color: green; | ||
1297 | 32 | } | ||
1298 | 33 | } | ||
1299 | 34 | |||
1300 | 35 | .specstatusPENDINGAPPROVAL, .specstatusPENDINGREVIEW { | ||
1301 | 36 | color: #f09; | ||
1302 | 37 | |||
1303 | 38 | a { | ||
1304 | 39 | color: #f09; | ||
1305 | 40 | } | ||
1306 | 41 | } | ||
1307 | 42 | |||
1308 | 43 | .specstatusDRAFT, .specstatusDISCUSSION { | ||
1309 | 44 | color: #930; | ||
1310 | 45 | |||
1311 | 46 | a { | ||
1312 | 47 | color: #930; | ||
1313 | 48 | } | ||
1314 | 49 | } | ||
1315 | 50 | |||
1316 | 51 | .specstatusNEW { | ||
1317 | 52 | color: red; | ||
1318 | 53 | |||
1319 | 54 | a { | ||
1320 | 55 | color: red; | ||
1321 | 56 | } | ||
1322 | 57 | } | ||
1323 | 58 | |||
1324 | 59 | .specstatusSUPERSEDED, .specstatusOBSOLETE, .specpriorityNOTFORUS, .specpriorityUNDEFINED { | ||
1325 | 60 | color: gray; | ||
1326 | 61 | |||
1327 | 62 | a { | ||
1328 | 63 | color: gray; | ||
1329 | 64 | } | ||
1330 | 65 | } | ||
1331 | 66 | |||
1332 | 67 | .specpriorityLOW { | ||
1333 | 68 | color: black; | ||
1334 | 69 | |||
1335 | 70 | a { | ||
1336 | 71 | color: black; | ||
1337 | 72 | } | ||
1338 | 73 | } | ||
1339 | 74 | |||
1340 | 75 | .specpriorityMEDIUM { | ||
1341 | 76 | color: #f60; | ||
1342 | 77 | |||
1343 | 78 | a { | ||
1344 | 79 | color: #f60; | ||
1345 | 80 | } | ||
1346 | 81 | } | ||
1347 | 82 | |||
1348 | 83 | .specpriorityHIGH, .specpriorityESSENTIAL { | ||
1349 | 84 | color: red; | ||
1350 | 85 | |||
1351 | 86 | a { | ||
1352 | 87 | color: red; | ||
1353 | 88 | } | ||
1354 | 89 | } | ||
1355 | 90 | |||
1356 | 91 | .specdeliveryUNKNOWN, .specdeliveryNOTSTARTED { | ||
1357 | 92 | color: gray; | ||
1358 | 93 | |||
1359 | 94 | a { | ||
1360 | 95 | color: gray; | ||
1361 | 96 | } | ||
1362 | 97 | } | ||
1363 | 98 | |||
1364 | 99 | .specdeliveryDEFERRED, .specdeliveryNEEDSINFRASTUCTURE, .specdeliveryBLOCKED { | ||
1365 | 100 | color: red; | ||
1366 | 101 | |||
1367 | 102 | a { | ||
1368 | 103 | color: red; | ||
1369 | 104 | } | ||
1370 | 105 | } | ||
1371 | 106 | |||
1372 | 107 | .specdeliverySTARTED, .specdeliveryGOOD { | ||
1373 | 108 | color: blue; | ||
1374 | 109 | |||
1375 | 110 | a { | ||
1376 | 111 | color: blue; | ||
1377 | 112 | } | ||
1378 | 113 | } | ||
1379 | 114 | |||
1380 | 115 | .specdeliverySLOW { | ||
1381 | 116 | color: red; | ||
1382 | 117 | |||
1383 | 118 | a { | ||
1384 | 119 | color: red; | ||
1385 | 120 | } | ||
1386 | 121 | } | ||
1387 | 122 | |||
1388 | 123 | .specdeliveryBETA { | ||
1389 | 124 | color: #f60; | ||
1390 | 125 | |||
1391 | 126 | a { | ||
1392 | 127 | color: #f60; | ||
1393 | 128 | } | ||
1394 | 129 | } | ||
1395 | 130 | |||
1396 | 131 | .specdeliveryNEEDSREVIEW { | ||
1397 | 132 | color: purple; | ||
1398 | 133 | |||
1399 | 134 | a { | ||
1400 | 135 | color: purple; | ||
1401 | 136 | } | ||
1402 | 137 | } | ||
1403 | 138 | |||
1404 | 139 | .specdeliveryAWAITINGDEPLOYMENT { | ||
1405 | 140 | color: red; | ||
1406 | 141 | |||
1407 | 142 | a { | ||
1408 | 143 | color: red; | ||
1409 | 144 | } | ||
1410 | 145 | } | ||
1411 | 146 | |||
1412 | 147 | .specdeliveryIMPLEMENTED, .specdeliveryINFORMATIONAL { | ||
1413 | 148 | color: green; | ||
1414 | 149 | |||
1415 | 150 | a { | ||
1416 | 151 | color: green; | ||
1417 | 152 | } | ||
1418 | 153 | } | ||
1419 | 154 | |||
1420 | 155 | .bug-activity { | ||
1421 | 156 | color: #555; | ||
1422 | 157 | } | ||
1423 | 158 | |||
1424 | 159 | .statusNEW { | ||
1425 | 160 | color: #930; | ||
1426 | 161 | |||
1427 | 162 | a { | ||
1428 | 163 | color: #930; | ||
1429 | 164 | } | ||
1430 | 165 | } | ||
1431 | 166 | |||
1432 | 167 | .statusINCOMPLETE, .statusCONFIRMED { | ||
1433 | 168 | color: red; | ||
1434 | 169 | |||
1435 | 170 | a { | ||
1436 | 171 | color: red; | ||
1437 | 172 | } | ||
1438 | 173 | } | ||
1439 | 174 | |||
1440 | 175 | .statusTRIAGED { | ||
1441 | 176 | color: #f60; | ||
1442 | 177 | |||
1443 | 178 | a { | ||
1444 | 179 | color: #f60; | ||
1445 | 180 | } | ||
1446 | 181 | } | ||
1447 | 182 | |||
1448 | 183 | .statusINPROGRESS { | ||
1449 | 184 | color: black; | ||
1450 | 185 | |||
1451 | 186 | a { | ||
1452 | 187 | color: black; | ||
1453 | 188 | } | ||
1454 | 189 | } | ||
1455 | 190 | |||
1456 | 191 | .statusFIXCOMMITTED { | ||
1457 | 192 | color: #050; | ||
1458 | 193 | |||
1459 | 194 | a { | ||
1460 | 195 | color: #050; | ||
1461 | 196 | } | ||
1462 | 197 | } | ||
1463 | 198 | |||
1464 | 199 | .statusFIXRELEASED { | ||
1465 | 200 | color: green; | ||
1466 | 201 | |||
1467 | 202 | a { | ||
1468 | 203 | color: green; | ||
1469 | 204 | } | ||
1470 | 205 | } | ||
1471 | 206 | |||
1472 | 207 | .statusINVALID, .statusWONTFIX, .statusOPINION { | ||
1473 | 208 | color: #555; | ||
1474 | 209 | |||
1475 | 210 | a { | ||
1476 | 211 | color: #555; | ||
1477 | 212 | } | ||
1478 | 213 | } | ||
1479 | 214 | |||
1480 | 215 | .importanceCRITICAL { | ||
1481 | 216 | color: red; | ||
1482 | 217 | |||
1483 | 218 | a { | ||
1484 | 219 | color: red; | ||
1485 | 220 | } | ||
1486 | 221 | } | ||
1487 | 222 | |||
1488 | 223 | .importanceHIGH { | ||
1489 | 224 | color: #f60; | ||
1490 | 225 | |||
1491 | 226 | a { | ||
1492 | 227 | color: #f60; | ||
1493 | 228 | } | ||
1494 | 229 | } | ||
1495 | 230 | |||
1496 | 231 | .importanceMEDIUM { | ||
1497 | 232 | color: green; | ||
1498 | 233 | |||
1499 | 234 | a { | ||
1500 | 235 | color: green; | ||
1501 | 236 | } | ||
1502 | 237 | } | ||
1503 | 238 | |||
1504 | 239 | .importanceLOW { | ||
1505 | 240 | color: black; | ||
1506 | 241 | |||
1507 | 242 | a { | ||
1508 | 243 | color: black; | ||
1509 | 244 | } | ||
1510 | 245 | } | ||
1511 | 246 | |||
1512 | 247 | .importanceWISHLIST { | ||
1513 | 248 | color: blue; | ||
1514 | 249 | |||
1515 | 250 | a { | ||
1516 | 251 | color: blue; | ||
1517 | 252 | } | ||
1518 | 253 | } | ||
1519 | 254 | |||
1520 | 255 | .importanceUNDECIDED { | ||
1521 | 256 | color: #999; | ||
1522 | 257 | |||
1523 | 258 | a { | ||
1524 | 259 | color: #999; | ||
1525 | 260 | } | ||
1526 | 261 | } | ||
1527 | 262 | |||
1528 | 263 | #client-listing { | ||
1529 | 264 | .statusUNKNOWN, .statusNEW, .statusINCOMPLETE { | ||
1530 | 265 | color: #c63600; | ||
1531 | 266 | background-color: #ffdabe; | ||
1532 | 267 | |||
1533 | 268 | a { | ||
1534 | 269 | color: #c63600; | ||
1535 | 270 | background-color: #ffdabe; | ||
1536 | 271 | } | ||
1537 | 272 | } | ||
1538 | 273 | |||
1539 | 274 | .statusCONFIRMED, .statusTRIAGED { | ||
1540 | 275 | color: #896e00; | ||
1541 | 276 | background-color: #f4f1a4; | ||
1542 | 277 | |||
1543 | 278 | a { | ||
1544 | 279 | color: #896e00; | ||
1545 | 280 | background-color: #f4f1a4; | ||
1546 | 281 | } | ||
1547 | 282 | } | ||
1548 | 283 | |||
1549 | 284 | .statusINPROGRESS, .statusFIXCOMMITTED { | ||
1550 | 285 | color: #137587; | ||
1551 | 286 | background-color: #cbe7ef; | ||
1552 | 287 | |||
1553 | 288 | a { | ||
1554 | 289 | color: #137587; | ||
1555 | 290 | background-color: #cbe7ef; | ||
1556 | 291 | } | ||
1557 | 292 | } | ||
1558 | 293 | |||
1559 | 294 | .statusFIXRELEASED { | ||
1560 | 295 | color: #4f7b10; | ||
1561 | 296 | background-color: #cef1a0; | ||
1562 | 297 | |||
1563 | 298 | a { | ||
1564 | 299 | color: #4f7b10; | ||
1565 | 300 | background-color: #cef1a0; | ||
1566 | 301 | } | ||
1567 | 302 | } | ||
1568 | 303 | |||
1569 | 304 | .statusEXPIRED, .statusINVALID, .statusWONTFIX, .statusOPINION { | ||
1570 | 305 | color: #464646; | ||
1571 | 306 | background-color: #ddd; | ||
1572 | 307 | |||
1573 | 308 | a { | ||
1574 | 309 | color: #464646; | ||
1575 | 310 | background-color: #ddd; | ||
1576 | 311 | } | ||
1577 | 312 | } | ||
1578 | 313 | |||
1579 | 314 | .importanceCRITICAL { | ||
1580 | 315 | background-color: #DF382C; | ||
1581 | 316 | color: white; | ||
1582 | 317 | |||
1583 | 318 | a { | ||
1584 | 319 | background-color: #DF382C; | ||
1585 | 320 | color: white; | ||
1586 | 321 | } | ||
1587 | 322 | } | ||
1588 | 323 | |||
1589 | 324 | .importanceHIGH { | ||
1590 | 325 | background-color: #EFB73E; | ||
1591 | 326 | color: white; | ||
1592 | 327 | |||
1593 | 328 | a { | ||
1594 | 329 | background-color: #EFB73E; | ||
1595 | 330 | color: white; | ||
1596 | 331 | } | ||
1597 | 332 | } | ||
1598 | 333 | |||
1599 | 334 | .importanceMEDIUM { | ||
1600 | 335 | background-color: #19B6EE; | ||
1601 | 336 | color: white; | ||
1602 | 337 | |||
1603 | 338 | a { | ||
1604 | 339 | background-color: #19B6EE; | ||
1605 | 340 | color: white; | ||
1606 | 341 | } | ||
1607 | 342 | } | ||
1608 | 343 | |||
1609 | 344 | .importanceLOW { | ||
1610 | 345 | background-color: #38B44A; | ||
1611 | 346 | color: white; | ||
1612 | 347 | |||
1613 | 348 | a { | ||
1614 | 349 | background-color: #38B44A; | ||
1615 | 350 | color: white; | ||
1616 | 351 | } | ||
1617 | 352 | } | ||
1618 | 353 | |||
1619 | 354 | .importanceWISHLIST { | ||
1620 | 355 | background-color: #724dc8; | ||
1621 | 356 | color: white; | ||
1622 | 357 | |||
1623 | 358 | a { | ||
1624 | 359 | background-color: #724dc8; | ||
1625 | 360 | color: white; | ||
1626 | 361 | } | ||
1627 | 362 | } | ||
1628 | 363 | |||
1629 | 364 | .importanceUNDECIDED { | ||
1630 | 365 | background-color: #666666; | ||
1631 | 366 | color: white; | ||
1632 | 367 | |||
1633 | 368 | a { | ||
1634 | 369 | background-color: #666666; | ||
1635 | 370 | color: white; | ||
1636 | 371 | } | ||
1637 | 372 | } | ||
1638 | 373 | } | ||
1639 | 374 | |||
1640 | 375 | a { | ||
1641 | 376 | &.official-tag { | ||
1642 | 377 | /* Looks just like a normal link */ | ||
1643 | 378 | } | ||
1644 | 379 | |||
1645 | 380 | &.unofficial-tag { | ||
1646 | 381 | color: #6699ee; | ||
1647 | 382 | } | ||
1648 | 383 | } | ||
1649 | 384 | |||
1650 | 385 | .vcsimportSUCCESS { | ||
1651 | 386 | /* inherited text color */ | ||
1652 | 387 | } | ||
1653 | 388 | |||
1654 | 389 | .vcsimportFAILURE { | ||
1655 | 390 | color: Red; | ||
1656 | 391 | } | ||
1657 | 392 | |||
1658 | 393 | .greylink a { | ||
1659 | 394 | &:link, &:visited { | ||
1660 | 395 | color: gray; | ||
1661 | 396 | } | ||
1662 | 397 | } | ||
1663 | 398 | |||
1664 | 399 | .stale-diff { | ||
1665 | 400 | color: #f60; | ||
1666 | 401 | } | ||
1667 | 402 | |||
1668 | 403 | .conflicts-diff { | ||
1669 | 404 | color: red; | ||
1670 | 405 | } | ||
1671 | 406 | |||
1672 | 407 | .branchstatusMATURE { | ||
1673 | 408 | color: #090; | ||
1674 | 409 | |||
1675 | 410 | a { | ||
1676 | 411 | color: #090; | ||
1677 | 412 | } | ||
1678 | 413 | } | ||
1679 | 414 | |||
1680 | 415 | .branchstatusDEVELOPMENT { | ||
1681 | 416 | color: #900; | ||
1682 | 417 | |||
1683 | 418 | a { | ||
1684 | 419 | color: #900; | ||
1685 | 420 | } | ||
1686 | 421 | } | ||
1687 | 422 | |||
1688 | 423 | .branchstatusEXPERIMENTAL { | ||
1689 | 424 | color: #930; | ||
1690 | 425 | |||
1691 | 426 | a { | ||
1692 | 427 | color: #930; | ||
1693 | 428 | } | ||
1694 | 429 | } | ||
1695 | 430 | |||
1696 | 431 | .branchstatusMERGED, .branchstatusABANDONED { | ||
1697 | 432 | color: gray; | ||
1698 | 433 | |||
1699 | 434 | a { | ||
1700 | 435 | color: gray; | ||
1701 | 436 | } | ||
1702 | 437 | } | ||
1703 | 438 | |||
1704 | 439 | .branchstatusNEW { | ||
1705 | 440 | color: black; | ||
1706 | 441 | |||
1707 | 442 | a { | ||
1708 | 443 | color: black; | ||
1709 | 444 | } | ||
1710 | 445 | } | ||
1711 | 446 | |||
1712 | 447 | .voteAPPROVE { | ||
1713 | 448 | color: green; | ||
1714 | 449 | } | ||
1715 | 450 | |||
1716 | 451 | .voteNEEDS_FIXING { | ||
1717 | 452 | color: #930; | ||
1718 | 453 | } | ||
1719 | 454 | |||
1720 | 455 | .voteDISAPPROVE, .voteRESUBMIT { | ||
1721 | 456 | color: red; | ||
1722 | 457 | } | ||
1723 | 458 | |||
1724 | 459 | .voteABSTAIN { | ||
1725 | 460 | color: #666; | ||
1726 | 461 | } | ||
1727 | 462 | |||
1728 | 463 | .votePENDING { | ||
1729 | 464 | color: #f60; | ||
1730 | 465 | } | ||
1731 | 466 | |||
1732 | 467 | .mergestatusWORK_IN_PROGRESS { | ||
1733 | 468 | color: black; | ||
1734 | 469 | |||
1735 | 470 | a { | ||
1736 | 471 | color: black; | ||
1737 | 472 | } | ||
1738 | 473 | } | ||
1739 | 474 | |||
1740 | 475 | .mergestatusNEEDS_REVIEW { | ||
1741 | 476 | color: #f60; | ||
1742 | 477 | |||
1743 | 478 | a { | ||
1744 | 479 | color: #f60; | ||
1745 | 480 | } | ||
1746 | 481 | } | ||
1747 | 482 | |||
1748 | 483 | .mergestatusCODE_APPROVED, .mergestatusMERGED { | ||
1749 | 484 | color: green; | ||
1750 | 485 | |||
1751 | 486 | a { | ||
1752 | 487 | color: green; | ||
1753 | 488 | } | ||
1754 | 489 | } | ||
1755 | 490 | |||
1756 | 491 | .mergestatusREJECTED, .mergestatusMERGE_FAILED { | ||
1757 | 492 | color: red; | ||
1758 | 493 | |||
1759 | 494 | a { | ||
1760 | 495 | color: red; | ||
1761 | 496 | } | ||
1762 | 497 | } | ||
1763 | 498 | |||
1764 | 499 | .mergestatusQUEUED { | ||
1765 | 500 | color: black; | ||
1766 | 501 | |||
1767 | 502 | a { | ||
1768 | 503 | color: black; | ||
1769 | 504 | } | ||
1770 | 505 | } | ||
1771 | 506 | |||
1772 | 507 | .mergestatusSUPERSEDED { | ||
1773 | 508 | color: #666; | ||
1774 | 509 | |||
1775 | 510 | a { | ||
1776 | 511 | color: #666; | ||
1777 | 512 | } | ||
1778 | 513 | } | ||
1779 | 514 | |||
1780 | 515 | .codeimportNEW { | ||
1781 | 516 | color: #930; | ||
1782 | 517 | } | ||
1783 | 518 | |||
1784 | 519 | .codeimportREVIEWED { | ||
1785 | 520 | color: green; | ||
1786 | 521 | } | ||
1787 | 522 | |||
1788 | 523 | .codeimportINVALID, .codeimportSUSPENDED, .codeimportFAILING { | ||
1789 | 524 | color: red; | ||
1790 | 525 | } | ||
1791 | 526 | |||
1792 | 527 | .translationimportstatusAPPROVED { | ||
1793 | 528 | color: #050; | ||
1794 | 529 | |||
1795 | 530 | a { | ||
1796 | 531 | color: #050; | ||
1797 | 532 | } | ||
1798 | 533 | } | ||
1799 | 534 | |||
1800 | 535 | .translationimportstatusIMPORTED { | ||
1801 | 536 | color: green; | ||
1802 | 537 | |||
1803 | 538 | a { | ||
1804 | 539 | color: green; | ||
1805 | 540 | } | ||
1806 | 541 | } | ||
1807 | 542 | |||
1808 | 543 | .translationimportstatusDELETED { | ||
1809 | 544 | color: black; | ||
1810 | 545 | |||
1811 | 546 | a { | ||
1812 | 547 | color: black; | ||
1813 | 548 | } | ||
1814 | 549 | } | ||
1815 | 550 | |||
1816 | 551 | .translationimportstatusFAILED { | ||
1817 | 552 | color: red; | ||
1818 | 553 | |||
1819 | 554 | a { | ||
1820 | 555 | color: red; | ||
1821 | 556 | } | ||
1822 | 557 | } | ||
1823 | 558 | |||
1824 | 559 | .translationimportstatusNEEDS_REVIEW { | ||
1825 | 560 | color: #f60; | ||
1826 | 561 | |||
1827 | 562 | a { | ||
1828 | 563 | color: #f60; | ||
1829 | 564 | } | ||
1830 | 565 | } | ||
1831 | 566 | |||
1832 | 567 | .translationimportstatusBLOCKED { | ||
1833 | 568 | color: blue; | ||
1834 | 569 | |||
1835 | 570 | a { | ||
1836 | 571 | color: blue; | ||
1837 | 572 | } | ||
1838 | 573 | } | ||
1839 | 574 | |||
1840 | 575 | .translationimportstatusNEEDS_INFORMATION { | ||
1841 | 576 | color: maroon; | ||
1842 | 577 | |||
1843 | 578 | a { | ||
1844 | 579 | color: maroon; | ||
1845 | 580 | } | ||
1846 | 581 | } | ||
1847 | 582 | |||
1848 | 583 | .dismissed { | ||
1849 | 584 | color: #666; | ||
1850 | 585 | |||
1851 | 586 | a { | ||
1852 | 587 | color: #666; | ||
1853 | 588 | } | ||
1854 | 589 | } | ||
1855 | 590 | |||
1856 | 591 | .distromirrorstatusUP, .distromirrorstatusONEHOURBEHIND, .distromirrorstatusTWOHOURSBEHIND, .distromirrorstatusFOURHOURSBEHIND, .distromirrorstatusSIXHOURSBEHIND { | ||
1857 | 592 | color: green; | ||
1858 | 593 | } | ||
1859 | 594 | |||
1860 | 595 | .distromirrorstatusONEDAYBEHIND { | ||
1861 | 596 | color: #f60; | ||
1862 | 597 | } | ||
1863 | 598 | |||
1864 | 599 | .distromirrorstatusTWODAYSBEHIND, .distromirrorstatusONEWEEKBEHIND { | ||
1865 | 600 | color: red; | ||
1866 | 601 | } | ||
1867 | 602 | |||
1868 | 603 | .distromirrorstatusUNKNOWN { | ||
1869 | 604 | color: #666; | ||
1870 | 605 | } | ||
1871 | 606 | |||
1872 | 607 | .buildstatusNEEDSBUILD { | ||
1873 | 608 | color: gray; | ||
1874 | 609 | } | ||
1875 | 610 | |||
1876 | 611 | .buildstatusBUILDING { | ||
1877 | 612 | color: black; | ||
1878 | 613 | } | ||
1879 | 614 | |||
1880 | 615 | .buildstatusFULLYBUILT { | ||
1881 | 616 | color: green; | ||
1882 | 617 | } | ||
1883 | 618 | |||
1884 | 619 | .buildstatusFAILEDTOBUILD, .buildstatusMANUALDEPWAIT, .buildstatusCHROOTWAIT, .buildstatusSUPERSEDED, .buildstatusFAILEDTOUPLOAD { | ||
1885 | 620 | color: red; | ||
1886 | 621 | } | ||
1887 | 622 | |||
1888 | 623 | .launchpad-gold { | ||
1889 | 624 | color: #F8C300; | ||
1890 | 625 | } | ||
1891 | 626 | |||
1892 | 627 | .green { | ||
1893 | 628 | color: green; | ||
1894 | 629 | } | ||
1895 | 630 | |||
1896 | 631 | .red { | ||
1897 | 632 | color: red; | ||
1898 | 633 | } | ||
1899 | diff --git a/lib/canonical/launchpad/icing/css/forms.css b/lib/canonical/launchpad/icing/css/forms.scss | |||
1900 | 0 | similarity index 68% | 634 | similarity index 68% |
1901 | 1 | rename from lib/canonical/launchpad/icing/css/forms.css | 635 | rename from lib/canonical/launchpad/icing/css/forms.css |
1902 | 2 | rename to lib/canonical/launchpad/icing/css/forms.scss | 636 | rename to lib/canonical/launchpad/icing/css/forms.scss |
1903 | index f946c69..592408d 100644 | |||
1904 | --- a/lib/canonical/launchpad/icing/css/forms.css | |||
1905 | +++ b/lib/canonical/launchpad/icing/css/forms.scss | |||
1906 | @@ -1,458 +1,585 @@ | |||
1907 | 1 | // This file the result of auto-converting forms.css to scss. | ||
1908 | 2 | |||
1909 | 1 | form { | 3 | form { |
1910 | 2 | margin-bottom: 1em; | 4 | margin-bottom: 1em; |
1911 | 5 | |||
1912 | 6 | h1 { | ||
1913 | 7 | margin-bottom: 1em; | ||
1914 | 3 | } | 8 | } |
1926 | 4 | form h1 { | 9 | |
1927 | 5 | margin-bottom: 1em; | 10 | table { |
1928 | 6 | } | 11 | th, td { |
1929 | 7 | form table th, form table td { | 12 | padding: 2px; |
1930 | 8 | padding: 2px; | 13 | } |
1931 | 9 | } | 14 | |
1932 | 10 | form table tbody th { | 15 | tbody th, label { |
1933 | 11 | font-weight: bold; | 16 | font-weight: bold; |
1934 | 12 | } | 17 | } |
1924 | 13 | form table label { | ||
1925 | 14 | font-weight: bold; | ||
1935 | 15 | } | 18 | } |
1937 | 16 | .compound { | 19 | } |
1938 | 20 | |||
1939 | 21 | .compound { | ||
1940 | 17 | margin-bottom: .5em; | 22 | margin-bottom: .5em; |
1943 | 18 | } | 23 | } |
1944 | 19 | .field.subordinate label { | 24 | |
1945 | 25 | .field.subordinate label { | ||
1946 | 20 | font-weight: normal; | 26 | font-weight: normal; |
1949 | 21 | } | 27 | } |
1950 | 22 | fieldset { | 28 | |
1951 | 29 | fieldset { | ||
1952 | 23 | border-width: 2px 0 0; | 30 | border-width: 2px 0 0; |
1953 | 24 | margin: 1em 0; | 31 | margin: 1em 0; |
1954 | 25 | padding: 1em 0 0; | 32 | padding: 1em 0 0; |
1957 | 26 | } | 33 | } |
1958 | 27 | label { | 34 | |
1959 | 35 | label { | ||
1960 | 28 | white-space: nowrap; | 36 | white-space: nowrap; |
1961 | 37 | } | ||
1962 | 38 | |||
1963 | 39 | input { | ||
1964 | 40 | &[type='image'] { | ||
1965 | 41 | vertical-align: middle; | ||
1966 | 29 | } | 42 | } |
1971 | 30 | input[type='image'] { | 43 | |
1968 | 31 | vertical-align: middle; | ||
1969 | 32 | } | ||
1970 | 33 | input { | ||
1972 | 34 | visibility: inherit; | 44 | visibility: inherit; |
1973 | 45 | |||
1974 | 46 | &[type=radio] { | ||
1975 | 47 | margin-left: 1em; | ||
1976 | 35 | } | 48 | } |
1979 | 36 | input[type=radio], | 49 | } |
1980 | 37 | .processors input { | 50 | |
1981 | 51 | .processors input { | ||
1982 | 38 | margin-left: 1em; | 52 | margin-left: 1em; |
1985 | 39 | } | 53 | } |
1986 | 40 | input.urlTextType { | 54 | |
1987 | 55 | input.urlTextType { | ||
1988 | 41 | width: 40em; | 56 | width: 40em; |
1991 | 42 | } | 57 | } |
1992 | 43 | textarea { | 58 | |
1993 | 59 | textarea { | ||
1994 | 44 | display: block; | 60 | display: block; |
1995 | 45 | width: 90%; | 61 | width: 90%; |
1996 | 46 | max-width: 60em; | 62 | max-width: 60em; |
1997 | 47 | padding: 2px; | 63 | padding: 2px; |
2000 | 48 | } | 64 | } |
2001 | 49 | button { | 65 | |
2002 | 66 | button { | ||
2003 | 50 | padding: 0; | 67 | padding: 0; |
2014 | 51 | } | 68 | |
2015 | 52 | button.overlay-close-button { | 69 | &.overlay-close-button { |
2016 | 53 | float: right; | 70 | float: right; |
2017 | 54 | width: 15px; | 71 | width: 15px; |
2018 | 55 | height: 15px; | 72 | height: 15px; |
2019 | 56 | display: block; | 73 | display: block; |
2020 | 57 | margin-top: 4px; | 74 | margin-top: 4px; |
2021 | 58 | } | 75 | } |
2022 | 59 | input[type=input] + button, | 76 | } |
2023 | 60 | img[src$=spinner] + button { | 77 | |
2024 | 78 | input[type=input] + button, img[src$=spinner] + button { | ||
2025 | 61 | margin-left: 6px !important; | 79 | margin-left: 6px !important; |
2031 | 62 | } | 80 | } |
2032 | 63 | .selection-choices { | 81 | |
2033 | 64 | margin: 0.75em 0 0 1em | 82 | .selection-choices { |
2034 | 65 | } | 83 | margin: 0.75em 0 0 1em; |
2035 | 66 | .fieldRequired, .fieldOptional { | 84 | } |
2036 | 85 | |||
2037 | 86 | .fieldRequired, .fieldOptional { | ||
2038 | 67 | color: #999; | 87 | color: #999; |
2041 | 68 | } | 88 | } |
2042 | 69 | .field.subordinate { | 89 | |
2043 | 90 | .field.subordinate { | ||
2044 | 70 | margin-left: 2.6em; | 91 | margin-left: 2.6em; |
2047 | 71 | } | 92 | } |
2048 | 72 | .formHelp { | 93 | |
2049 | 94 | .formHelp { | ||
2050 | 73 | max-width: 45em; | 95 | max-width: 45em; |
2051 | 74 | margin: 0.2em 0 0.5em 0.2em; | 96 | margin: 0.2em 0 0.5em 0.2em; |
2052 | 75 | color: #666; | 97 | color: #666; |
2055 | 76 | } | 98 | } |
2056 | 77 | .subordinate[type="checkbox"] + label + .formHelp { | 99 | |
2057 | 100 | .subordinate[type="checkbox"] + label + .formHelp { | ||
2058 | 78 | margin-left: 3.4em; | 101 | margin-left: 3.4em; |
2061 | 79 | } | 102 | } |
2062 | 80 | .listbox { | 103 | |
2063 | 104 | .listbox { | ||
2064 | 81 | /* a scrolling list of checkboxes or radio buttons */ | 105 | /* a scrolling list of checkboxes or radio buttons */ |
2065 | 82 | border: 1px solid #8cacbb; | 106 | border: 1px solid #8cacbb; |
2066 | 83 | display: inline-block; | 107 | display: inline-block; |
2067 | 84 | max-height: 12em; | 108 | max-height: 12em; |
2068 | 85 | overflow: auto; | 109 | overflow: auto; |
2069 | 86 | overflow: -moz-scrollbars-vertical; | 110 | overflow: -moz-scrollbars-vertical; |
2070 | 111 | |||
2071 | 112 | label { | ||
2072 | 113 | background-color: #f6f6f6; | ||
2073 | 114 | border: solid white; | ||
2074 | 115 | border-width: 0 0 1px 0; | ||
2075 | 116 | display: block; | ||
2076 | 87 | } | 117 | } |
2084 | 88 | .listbox label { | 118 | } |
2085 | 89 | background-color: #f6f6f6; | 119 | |
2086 | 90 | border: solid white; | 120 | .extra-form-buttons { |
2080 | 91 | border-width: 0 0 1px 0; | ||
2081 | 92 | display: block; | ||
2082 | 93 | } | ||
2083 | 94 | .extra-form-buttons { | ||
2087 | 95 | text-align: center; | 121 | text-align: center; |
2088 | 96 | padding-top: 1em; | 122 | padding-top: 1em; |
2089 | 123 | |||
2090 | 124 | button { | ||
2091 | 125 | margin-right: 0.7em; | ||
2092 | 97 | } | 126 | } |
2101 | 98 | .extra-form-buttons button { | 127 | } |
2094 | 99 | margin-right: 0.7em; | ||
2095 | 100 | } | ||
2096 | 101 | .actions * { | ||
2097 | 102 | /* | ||
2098 | 103 | Action links are those that begin the process of doing something. | ||
2099 | 104 | For example, "Register a branch", "Edit profile", "Link to CVE". | ||
2100 | 105 | When presented inline, they are rendered by launchpad-inline-link.pt. | ||
2102 | 106 | 128 | ||
2105 | 107 | Action buttons are those that submit a multi-row form. | 129 | .actions { |
2106 | 108 | Often an action button will have an "or _Cancel_" link next to it. | 130 | * { |
2107 | 131 | /* | ||
2108 | 132 | Action links are those that begin the process of doing something. | ||
2109 | 133 | For example, "Register a branch", "Edit profile", "Link to CVE". | ||
2110 | 134 | When presented inline, they are rendered by launchpad-inline-link.pt. | ||
2111 | 109 | 135 | ||
2124 | 110 | We want 0.5em horizontal gap between links and buttons in these | 136 | Action buttons are those that submit a multi-row form. |
2125 | 111 | sections. Using margin-left would cause a bad gap to the left of a | 137 | Often an action button will have an "or _Cancel_" link next to it. |
2126 | 112 | leftmost item. Using margin-right would cause a bad gap to the right of | 138 | |
2127 | 113 | a rightmost item. We could fix these problems with :first-child/:last- | 139 | We want 0.5em horizontal gap between links and buttons in these |
2128 | 114 | child, but not in IE. So we do something a little tricky. We go ahead | 140 | sections. Using margin-left would cause a bad gap to the left of a |
2129 | 115 | and give each child of the actions container a right margin: | 141 | leftmost item. Using margin-right would cause a bad gap to the right of |
2130 | 116 | */ | 142 | a rightmost item. We could fix these problems with :first-child/:last- |
2131 | 117 | margin-right: 0.5em; | 143 | child, but not in IE. So we do something a little tricky. We go ahead |
2132 | 118 | } | 144 | and give each child of the actions container a right margin: |
2133 | 119 | .actions * * { | 145 | */ |
2134 | 120 | /* because ">" doesn't work in IE6 */ | 146 | margin-right: 0.5em; |
2135 | 121 | margin-right: 0; | 147 | |
2136 | 148 | * { | ||
2137 | 149 | /* because ">" doesn't work in IE6 */ | ||
2138 | 150 | margin-right: 0; | ||
2139 | 151 | } | ||
2140 | 122 | } | 152 | } |
2142 | 123 | .actions { | 153 | |
2143 | 124 | /* Then in addition to the top/bottom margins of the actions container, | 154 | /* Then in addition to the top/bottom margins of the actions container, |
2144 | 125 | we give it a *negative* right margin, cancelling out that of the last | 155 | we give it a *negative* right margin, cancelling out that of the last |
2145 | 126 | child. */ | 156 | child. */ |
2146 | 127 | margin: 1em -0.5em 1em 0; | 157 | margin: 1em -0.5em 1em 0; |
2147 | 158 | } | ||
2148 | 159 | |||
2149 | 160 | table { | ||
2150 | 161 | &.radio-button-widget tr td { | ||
2151 | 162 | /* Opera doesn't use the general tr above for the radio button table */ | ||
2152 | 163 | vertical-align: top; | ||
2153 | 128 | } | 164 | } |
2176 | 129 | table.radio-button-widget tr td { | 165 | |
2177 | 130 | /* Opera doesn't use the general tr above for the radio button table */ | 166 | &.listing div { |
2178 | 131 | vertical-align: top; | 167 | &.field > { |
2179 | 132 | } | 168 | table { |
2180 | 133 | table.listing div.field>table { | 169 | /* Hack to add breathing room to bug status forms: */ |
2181 | 134 | /* Hack to add breathing room to bug status forms: */ | 170 | margin-top: 0.5em; |
2182 | 135 | margin-top: 0.5em; | 171 | } |
2183 | 136 | } | 172 | |
2184 | 137 | table.listing div.field>label, | 173 | label, div > label { |
2185 | 138 | table.listing div.field>div>label, | 174 | display: block; |
2186 | 139 | table.listing div.actions { | 175 | margin-top: 1em; |
2187 | 140 | display: block; | 176 | } |
2188 | 141 | margin-top: 1em; | 177 | } |
2189 | 142 | } | 178 | |
2190 | 143 | table.form, table.extra-options { | 179 | &.actions { |
2191 | 144 | /* Many forms are laid out using tables, with appropriate spacing: */ | 180 | display: block; |
2192 | 145 | /* http://launchpad.test/firefox/+edit */ | 181 | margin-top: 1em; |
2193 | 146 | margin: 1em 0 inherit inherit; | 182 | } |
2172 | 147 | width: 100%; | ||
2173 | 148 | } | ||
2174 | 149 | table.form th { | ||
2175 | 150 | font-weight: normal; | ||
2194 | 151 | } | 183 | } |
2199 | 152 | table.form th, table.form td, | 184 | |
2200 | 153 | table.form table.extra-options td, | 185 | &.form, &.extra-options { |
2201 | 154 | table.form table.extra-options th { | 186 | /* Many forms are laid out using tables, with appropriate spacing: */ |
2202 | 155 | padding-bottom: 1em; | 187 | /* http://launchpad.test/firefox/+edit */ |
2203 | 188 | margin: 1em 0 inherit inherit; | ||
2204 | 189 | width: 100%; | ||
2205 | 156 | } | 190 | } |
2212 | 157 | table.form table.listing th, | 191 | |
2213 | 158 | table.form table.listing td { | 192 | &.form { |
2214 | 159 | padding-bottom: 0.25em; | 193 | th { |
2215 | 160 | } | 194 | font-weight: normal; |
2216 | 161 | table.form td td { | 195 | padding-bottom: 1em; |
2217 | 162 | padding-bottom: 0; | 196 | } |
2218 | 197 | |||
2219 | 198 | td { | ||
2220 | 199 | padding-bottom: 1em; | ||
2221 | 200 | } | ||
2222 | 201 | |||
2223 | 202 | table { | ||
2224 | 203 | &.extra-options { | ||
2225 | 204 | td, th { | ||
2226 | 205 | padding-bottom: 1em; | ||
2227 | 206 | } | ||
2228 | 207 | } | ||
2229 | 208 | |||
2230 | 209 | &.listing { | ||
2231 | 210 | th, td { | ||
2232 | 211 | padding-bottom: 0.25em; | ||
2233 | 212 | } | ||
2234 | 213 | } | ||
2235 | 214 | } | ||
2236 | 215 | |||
2237 | 216 | td td { | ||
2238 | 217 | padding-bottom: 0; | ||
2239 | 218 | } | ||
2240 | 163 | } | 219 | } |
2244 | 164 | .long td { | 220 | } |
2245 | 165 | /* Long forms are composed of multiple tables and visible fieldsets */ | 221 | |
2246 | 166 | padding-right: 1em; | 222 | .long { |
2247 | 223 | td { | ||
2248 | 224 | /* Long forms are composed of multiple tables and visible fieldsets */ | ||
2249 | 225 | padding-right: 1em; | ||
2250 | 167 | } | 226 | } |
2253 | 168 | .long fieldset { | 227 | |
2254 | 169 | margin-top: 1em; | 228 | fieldset { |
2255 | 229 | margin-top: 1em; | ||
2256 | 170 | } | 230 | } |
2260 | 171 | .long legend { | 231 | |
2261 | 172 | color: #666; | 232 | legend { |
2262 | 173 | font-weight: bold; | 233 | color: #666; |
2263 | 234 | font-weight: bold; | ||
2264 | 174 | } | 235 | } |
2266 | 175 | .collapsible { | 236 | } |
2267 | 237 | |||
2268 | 238 | .collapsible { | ||
2269 | 176 | /* Collapsible sections | 239 | /* Collapsible sections |
2270 | 177 | Some page sections are hidden by default, expanded by clicking a link. | 240 | Some page sections are hidden by default, expanded by clicking a link. |
2271 | 178 | see lp.js:activate_collapsibles() */ | 241 | see lp.js:activate_collapsibles() */ |
2272 | 179 | border: none; | 242 | border: none; |
2273 | 180 | margin: 0; | 243 | margin: 0; |
2274 | 244 | } | ||
2275 | 245 | |||
2276 | 246 | fieldset.collapsible { | ||
2277 | 247 | padding: 16px 0 0; | ||
2278 | 248 | |||
2279 | 249 | /* "Add a comment/attachment" form in bug reports */ | ||
2280 | 250 | } | ||
2281 | 251 | |||
2282 | 252 | .collapsible { | ||
2283 | 253 | h2 { | ||
2284 | 254 | margin-top: 0; | ||
2285 | 181 | } | 255 | } |
2294 | 182 | fieldset.collapsible { | 256 | |
2295 | 183 | padding: 16px 0 0; /* "Add a comment/attachment" form in bug reports */ | 257 | .collapsed { |
2296 | 184 | } | 258 | display: none; |
2289 | 185 | .collapsible h2 { | ||
2290 | 186 | margin-top: 0; | ||
2291 | 187 | } | ||
2292 | 188 | .collapsible .collapsed { | ||
2293 | 189 | display: none; | ||
2297 | 190 | } | 259 | } |
2300 | 191 | .collapsible .expanded { | 260 | |
2301 | 192 | display: block; | 261 | .expanded { |
2302 | 262 | display: block; | ||
2303 | 193 | } | 263 | } |
2306 | 194 | .collapsible > :first-child { | 264 | |
2307 | 195 | font-weight: normal; | 265 | > :first-child { |
2308 | 266 | font-weight: normal; | ||
2309 | 267 | text-decoration: none; | ||
2310 | 196 | } | 268 | } |
2313 | 197 | .collapsible > :first-child, .collapsible :first-child a:hover { | 269 | |
2314 | 198 | text-decoration: none; | 270 | :first-child a:hover { |
2315 | 271 | text-decoration: none; | ||
2316 | 199 | } | 272 | } |
2319 | 200 | .collapsible > :first-child a span { | 273 | |
2320 | 201 | text-decoration: underline; | 274 | > :first-child a span { |
2321 | 275 | text-decoration: underline; | ||
2322 | 202 | } | 276 | } |
2324 | 203 | img.collapseIcon { | 277 | } |
2325 | 278 | |||
2326 | 279 | img.collapseIcon { | ||
2327 | 204 | text-decoration: none; | 280 | text-decoration: none; |
2328 | 205 | vertical-align: middle; | 281 | vertical-align: middle; |
2331 | 206 | } | 282 | } |
2332 | 207 | .collapsible .collapsed { | 283 | |
2333 | 284 | .collapsible .collapsed { | ||
2334 | 208 | border: none; | 285 | border: none; |
2335 | 209 | margin-bottom: 0; | 286 | margin-bottom: 0; |
2336 | 287 | } | ||
2337 | 288 | |||
2338 | 289 | .yui3-pretty-overlay #yui3-pretty-overlay-modal { | ||
2339 | 290 | h1, h2 { | ||
2340 | 291 | /* lazr is injecting presumptive markup. */ | ||
2341 | 292 | color: #333; | ||
2342 | 293 | margin-right: 15px; | ||
2343 | 210 | } | 294 | } |
2351 | 211 | .yui3-pretty-overlay #yui3-pretty-overlay-modal h1, | 295 | } |
2352 | 212 | .yui3-pretty-overlay #yui3-pretty-overlay-modal h2 { | 296 | |
2353 | 213 | /* lazr is injecting presumptive markup. */ | 297 | .yui3-editable_text { |
2347 | 214 | color: #333; | ||
2348 | 215 | margin-right: 15px; | ||
2349 | 216 | } | ||
2350 | 217 | .yui3-editable_text { | ||
2354 | 218 | outline: none; | 298 | outline: none; |
2357 | 219 | } | 299 | } |
2358 | 220 | .yui3-ieditor { | 300 | |
2359 | 301 | .yui3-ieditor { | ||
2360 | 221 | padding-right: 288px; | 302 | padding-right: 288px; |
2363 | 222 | } | 303 | } |
2364 | 223 | .yui3-skin-sam .yui3-ieditor-input { | 304 | |
2365 | 305 | .yui3-skin-sam .yui3-ieditor-input { | ||
2366 | 224 | margin-top: 0; | 306 | margin-top: 0; |
2369 | 225 | } | 307 | } |
2370 | 226 | h1 .yui3-ieditor-errors { | 308 | |
2371 | 309 | h1 .yui3-ieditor-errors { | ||
2372 | 227 | font-size: 12px; | 310 | font-size: 12px; |
2375 | 228 | } | 311 | } |
2376 | 229 | .steps h2 { | 312 | |
2377 | 313 | .steps h2 { | ||
2378 | 230 | /* lazr is injecting presumptive markup. */ | 314 | /* lazr is injecting presumptive markup. */ |
2379 | 231 | font-size: 12px; | 315 | font-size: 12px; |
2380 | 232 | line-height: 30px; | 316 | line-height: 30px; |
2383 | 233 | } | 317 | } |
2384 | 234 | .step-links { | 318 | |
2385 | 319 | .step-links { | ||
2386 | 235 | padding-top: 0; | 320 | padding-top: 0; |
2387 | 236 | padding-bottom: 0; | 321 | padding-bottom: 0; |
2388 | 237 | margin-left: 0.75em; | 322 | margin-left: 0.75em; |
2389 | 238 | margin-right: 10em; | 323 | margin-right: 10em; |
2390 | 239 | text-align: left; | 324 | text-align: left; |
2391 | 325 | |||
2392 | 326 | .prev { | ||
2393 | 327 | margin-right: 0.7em; | ||
2394 | 240 | } | 328 | } |
2400 | 241 | .step-links .prev { | 329 | } |
2401 | 242 | margin-right: 0.7em; | 330 | |
2402 | 243 | } | 331 | .lazr-multiline-edit { |
2403 | 244 | .lazr-multiline-edit .yui3-ieditor { | 332 | .yui3-ieditor { |
2404 | 245 | padding-right: 0; | 333 | padding-right: 0; |
2405 | 246 | } | 334 | } |
2410 | 247 | .lazr-multiline-edit .clearfix h3 { | 335 | |
2411 | 248 | /* Undo the damage done by lazr. */ | 336 | .clearfix h3 { |
2412 | 249 | font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; | 337 | /* Undo the damage done by lazr. */ |
2413 | 250 | line-height: 12px; | 338 | font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; |
2414 | 339 | line-height: 12px; | ||
2415 | 251 | } | 340 | } |
2417 | 252 | .widget-hd.js-action { | 341 | } |
2418 | 342 | |||
2419 | 343 | .widget-hd.js-action { | ||
2420 | 253 | /* The js-action class is also used for non-links, for example, with | 344 | /* The js-action class is also used for non-links, for example, with |
2421 | 254 | expand/collapse sections. */ | 345 | expand/collapse sections. */ |
2422 | 255 | color: #093; | 346 | color: #093; |
2423 | 256 | cursor: pointer; | 347 | cursor: pointer; |
2424 | 348 | |||
2425 | 349 | &:hover { | ||
2426 | 350 | text-decoration: underline; | ||
2427 | 257 | } | 351 | } |
2431 | 258 | .widget-hd.js-action:hover { | 352 | } |
2429 | 259 | text-decoration: underline; | ||
2430 | 260 | } | ||
2432 | 261 | 353 | ||
2434 | 262 | .yui3-ichoicesource-content .value:hover { | 354 | .yui3-ichoicesource-content .value:hover { |
2435 | 263 | text-decoration: underline; | 355 | text-decoration: underline; |
2436 | 264 | cursor: pointer; | 356 | cursor: pointer; |
2438 | 265 | } | 357 | } |
2439 | 266 | 358 | ||
2441 | 267 | .no-click:hover { | 359 | .no-click:hover { |
2442 | 268 | text-decoration: none !important; | 360 | text-decoration: none !important; |
2443 | 269 | cursor: default !important; | 361 | cursor: default !important; |
2447 | 270 | } | 362 | } |
2448 | 271 | 363 | ||
2449 | 272 | .yui3-buglisting-config-util a { | 364 | .yui3-buglisting-config-util a { |
2450 | 273 | position: relative; | 365 | position: relative; |
2451 | 274 | top: 3px; | 366 | top: 3px; |
2452 | 275 | left: 4px; | 367 | left: 4px; |
2455 | 276 | } | 368 | } |
2456 | 277 | .yui3-baseconfigutil a { | 369 | |
2457 | 370 | .yui3-baseconfigutil a { | ||
2458 | 278 | cursor: pointer; | 371 | cursor: pointer; |
2459 | 372 | } | ||
2460 | 373 | |||
2461 | 374 | .yui3-buglisting-config-util-overlay { | ||
2462 | 375 | a.close-button { | ||
2463 | 376 | visibility: inherit; | ||
2464 | 279 | } | 377 | } |
2470 | 280 | .yui3-buglisting-config-util-overlay a.close-button { | 378 | |
2471 | 281 | visibility: inherit; | 379 | form { |
2472 | 282 | } | 380 | width: 80%; |
2468 | 283 | .yui3-buglisting-config-util-overlay form { | ||
2469 | 284 | width: 80%; | ||
2473 | 285 | } | 381 | } |
2476 | 286 | .yui3-buglisting-config-util-overlay div.yui3-lazr-formoverlay-actions { | 382 | |
2477 | 287 | text-align: left; | 383 | div.yui3-lazr-formoverlay-actions { |
2478 | 384 | text-align: left; | ||
2479 | 288 | } | 385 | } |
2485 | 289 | .yui3-buglisting-config-util-overlay .reset-buglisting { | 386 | |
2486 | 290 | position: relative; | 387 | .reset-buglisting { |
2487 | 291 | top: 20px; | 388 | position: relative; |
2488 | 292 | left: 75px; | 389 | top: 20px; |
2489 | 293 | cursor: pointer; | 390 | left: 75px; |
2490 | 391 | cursor: pointer; | ||
2491 | 294 | } | 392 | } |
2493 | 295 | .error.message, .warning.message, .informational.message { | 393 | } |
2494 | 394 | |||
2495 | 395 | .error.message, .warning.message, .informational.message { | ||
2496 | 296 | border: solid #666; | 396 | border: solid #666; |
2497 | 297 | border-width: 1px 2px 2px 1px; | 397 | border-width: 1px 2px 2px 1px; |
2498 | 298 | color: black; | 398 | color: black; |
2499 | 299 | margin: 1em auto 1em auto; | 399 | margin: 1em auto 1em auto; |
2500 | 300 | padding: 0 1em 1em 2em; | 400 | padding: 0 1em 1em 2em; |
2501 | 301 | width: 30em; | 401 | width: 30em; |
2505 | 302 | } | 402 | } |
2506 | 303 | .error.message::before, .warning.message::before, | 403 | |
2507 | 304 | .informational.message::before { | 404 | .error.message::before, .warning.message::before, .informational.message::before { |
2508 | 305 | /* The alerts are preceded with an icon overlaying the top left corner: */ | 405 | /* The alerts are preceded with an icon overlaying the top left corner: */ |
2509 | 306 | display: block; | 406 | display: block; |
2510 | 307 | margin: -15px 0 -6px -35px; | 407 | margin: -15px 0 -6px -35px; |
2513 | 308 | } | 408 | } |
2514 | 309 | .error { | 409 | |
2515 | 410 | .error { | ||
2516 | 310 | /* Error messages are pink, with alerts having an error icon: */ | 411 | /* Error messages are pink, with alerts having an error icon: */ |
2517 | 311 | background: #ffe4e4; | 412 | background: #ffe4e4; |
2518 | 413 | |||
2519 | 414 | &.message::before { | ||
2520 | 415 | content: url(/@@/error-large); | ||
2521 | 312 | } | 416 | } |
2526 | 313 | .error.message::before { | 417 | } |
2527 | 314 | content: url(/@@/error-large); | 418 | |
2528 | 315 | } | 419 | .warning { |
2525 | 316 | .warning { | ||
2529 | 317 | /* Warning messages are orange, with alerts having a warning icon: */ | 420 | /* Warning messages are orange, with alerts having a warning icon: */ |
2530 | 318 | background: #fff59c; | 421 | background: #fff59c; |
2531 | 422 | |||
2532 | 423 | &.message::before { | ||
2533 | 424 | content: url(/@@/warning-large); | ||
2534 | 319 | } | 425 | } |
2539 | 320 | .warning.message::before { | 426 | } |
2540 | 321 | content: url(/@@/warning-large); | 427 | |
2541 | 322 | } | 428 | .informational { |
2538 | 323 | .informational { | ||
2542 | 324 | /* Informational messages are blue-to-grey, alerts have an info icon. */ | 429 | /* Informational messages are blue-to-grey, alerts have an info icon. */ |
2543 | 325 | 430 | ||
2544 | 326 | background: #d4e8ff url(/+icing/blue-fade-to-grey); | 431 | background: #d4e8ff url(/+icing/blue-fade-to-grey); |
2545 | 432 | |||
2546 | 433 | &.message::before { | ||
2547 | 434 | content: url(/@@/info-large); | ||
2548 | 327 | } | 435 | } |
2554 | 328 | .informational.message::before { | 436 | |
2555 | 329 | content: url(/@@/info-large); | 437 | p.last { |
2556 | 330 | } | 438 | margin-bottom: 0; |
2552 | 331 | .informational p.last { | ||
2553 | 332 | margin-bottom: 0; | ||
2557 | 333 | } | 439 | } |
2559 | 334 | .debugging { | 440 | } |
2560 | 441 | |||
2561 | 442 | .debugging { | ||
2562 | 335 | /* Debugging messages are white on grey, alerts have an info icon. */ | 443 | /* Debugging messages are white on grey, alerts have an info icon. */ |
2563 | 336 | background: #666; | 444 | background: #666; |
2564 | 337 | color: white; | 445 | color: white; |
2565 | 446 | |||
2566 | 447 | &.message::before { | ||
2567 | 448 | content: url(/@@/info-large); | ||
2568 | 338 | } | 449 | } |
2573 | 339 | .debugging.message::before { | 450 | } |
2574 | 340 | content: url(/@@/info-large); | 451 | |
2575 | 341 | } | 452 | .error .message { |
2572 | 342 | .error .message { | ||
2576 | 343 | /* And inside, the error message itself uses a smaller icon. */ | 453 | /* And inside, the error message itself uses a smaller icon. */ |
2577 | 344 | background: url(/@@/error) center left no-repeat; | 454 | background: url(/@@/error) center left no-repeat; |
2578 | 345 | margin-bottom: 0.25em; | 455 | margin-bottom: 0.25em; |
2579 | 346 | padding-left: 18px; | 456 | padding-left: 18px; |
2582 | 347 | } | 457 | } |
2583 | 348 | table.form .error { | 458 | |
2584 | 459 | table.form .error { | ||
2585 | 349 | /* Form errors override this background color, because the lack of space | 460 | /* Form errors override this background color, because the lack of space |
2586 | 350 | between the edge of fields and the edge of the color would look bad. */ | 461 | between the edge of fields and the edge of the color would look bad. */ |
2587 | 351 | background: none; | 462 | background: none; |
2590 | 352 | } | 463 | } |
2591 | 353 | .inline-warning { | 464 | |
2592 | 465 | .inline-warning { | ||
2593 | 354 | /* Warning messages inlined in the page. */ | 466 | /* Warning messages inlined in the page. */ |
2594 | 355 | color: red; | 467 | color: red; |
2595 | 356 | font-weight: bold; | 468 | font-weight: bold; |
2598 | 357 | } | 469 | } |
2599 | 358 | .sml-informational { | 470 | |
2600 | 471 | .sml-informational { | ||
2601 | 359 | background: #d4e8ff url('/+icing/blue-fade-to-grey'); | 472 | background: #d4e8ff url('/+icing/blue-fade-to-grey'); |
2602 | 360 | border: solid #666; | 473 | border: solid #666; |
2603 | 361 | border-width: 1px 2px 2px 1px; | 474 | border-width: 1px 2px 2px 1px; |
2604 | 362 | padding: 5px 5px 5px 5px; | 475 | padding: 5px 5px 5px 5px; |
2605 | 363 | width: 44em; | 476 | width: 44em; |
2606 | 477 | |||
2607 | 478 | &::before { | ||
2608 | 479 | content: url('/@@/info'); | ||
2609 | 364 | } | 480 | } |
2614 | 365 | .sml-informational::before { | 481 | } |
2615 | 366 | content: url('/@@/info'); | 482 | |
2616 | 367 | } | 483 | .important-notice-popup { |
2613 | 368 | .important-notice-popup { | ||
2617 | 369 | padding: 1em 1em 0 1em; | 484 | padding: 1em 1em 0 1em; |
2618 | 370 | width: auto; | 485 | width: auto; |
2619 | 371 | overflow: hidden; | 486 | overflow: hidden; |
2622 | 372 | } | 487 | } |
2623 | 373 | .important-notice-container { | 488 | |
2624 | 489 | .important-notice-container { | ||
2625 | 374 | text-align: center; | 490 | text-align: center; |
2626 | 375 | width: 100%; | 491 | width: 100%; |
2627 | 376 | padding-bottom: 1em; | 492 | padding-bottom: 1em; |
2628 | 377 | position: relative; | 493 | position: relative; |
2631 | 378 | } | 494 | } |
2632 | 379 | .important-notice-balloon { | 495 | |
2633 | 496 | .important-notice-balloon { | ||
2634 | 380 | border-radius: 5px; | 497 | border-radius: 5px; |
2635 | 381 | background-color: #ededed; | 498 | background-color: #ededed; |
2636 | 382 | padding: 1em; | 499 | padding: 1em; |
2637 | 383 | border: 1px solid #000; | 500 | border: 1px solid #000; |
2638 | 384 | width: auto; | 501 | width: auto; |
2639 | 385 | overflow: hidden; | 502 | overflow: hidden; |
2642 | 386 | } | 503 | } |
2643 | 387 | .important-notice-buttons { | 504 | |
2644 | 505 | .important-notice-buttons { | ||
2645 | 388 | float: right; | 506 | float: right; |
2648 | 389 | } | 507 | } |
2649 | 390 | .important-notice-cancel-button { | 508 | |
2650 | 509 | .important-notice-cancel-button { | ||
2651 | 391 | visibility: hidden; | 510 | visibility: hidden; |
2652 | 392 | cursor: pointer; | 511 | cursor: pointer; |
2655 | 393 | } | 512 | } |
2656 | 394 | .important-notice { | 513 | |
2657 | 514 | .important-notice { | ||
2658 | 395 | padding: 0px 0px 40px 0px; | 515 | padding: 0px 0px 40px 0px; |
2659 | 396 | height: 32px; | 516 | height: 32px; |
2660 | 397 | overflow: hidden; | 517 | overflow: hidden; |
2661 | 518 | |||
2662 | 519 | a { | ||
2663 | 520 | font-weight: bold; | ||
2664 | 521 | text-decoration: underline; | ||
2665 | 398 | } | 522 | } |
2670 | 399 | .important-notice a { | 523 | } |
2667 | 400 | font-weight: bold; | ||
2668 | 401 | text-decoration: underline; | ||
2669 | 402 | } | ||
2671 | 403 | 524 | ||
2672 | 525 | /* ================== | ||
2673 | 526 | Translations Forms | ||
2674 | 527 | */ | ||
2675 | 404 | 528 | ||
2679 | 405 | /* ================== | 529 | /* ==== Translations hand-made forms ==== */ |
2677 | 406 | Translations Forms | ||
2678 | 407 | */ | ||
2680 | 408 | 530 | ||
2682 | 409 | /* ==== Translations hand-made forms ==== */ | 531 | form.translations { |
2683 | 532 | div { | ||
2684 | 533 | &.fields { | ||
2685 | 534 | padding: 1em; | ||
2686 | 535 | } | ||
2687 | 410 | 536 | ||
2690 | 411 | form.translations div.fields { | 537 | &.actions { |
2691 | 412 | padding: 1em; | 538 | padding: 1em; |
2692 | 539 | text-align: left; | ||
2693 | 540 | clear: both; | ||
2694 | 541 | } | ||
2695 | 413 | } | 542 | } |
2736 | 414 | form.translations div.actions { | 543 | |
2737 | 415 | padding: 1em; | 544 | input { |
2738 | 416 | text-align: left; | 545 | padding-left: 0.5em; |
2739 | 417 | clear: both; | 546 | padding-right: 0.5em; |
2700 | 418 | } | ||
2701 | 419 | form.translations input { | ||
2702 | 420 | padding-left: 0.5em; | ||
2703 | 421 | padding-right: 0.5em; | ||
2704 | 422 | } | ||
2705 | 423 | form.translations select { | ||
2706 | 424 | margin-left: 0.5em; | ||
2707 | 425 | padding-right: 0.5em; | ||
2708 | 426 | } | ||
2709 | 427 | form.translations label { | ||
2710 | 428 | padding-left: 0.5em; | ||
2711 | 429 | padding-right: 1em; | ||
2712 | 430 | } | ||
2713 | 431 | form.translations .listbox label { | ||
2714 | 432 | padding: 2px 1em 2px 2px; | ||
2715 | 433 | } | ||
2716 | 434 | |||
2717 | 435 | /* Provide top-alignment for radio boxes and longer explanations | ||
2718 | 436 | * without using tables. | ||
2719 | 437 | * | ||
2720 | 438 | * Examples: | ||
2721 | 439 | * https://translations.launchpad.test/evolution/trunk/+pots/evolution-2.2/es/+upload | ||
2722 | 440 | * https://translations.launchpad.test/evolution/trunk/+pots/evolution-2.2/+export | ||
2723 | 441 | */ | ||
2724 | 442 | form.translations div.alignment .content { | ||
2725 | 443 | float: left; | ||
2726 | 444 | } | ||
2727 | 445 | form.translations div.alignment .selector { | ||
2728 | 446 | margin-right: 0.5em; | ||
2729 | 447 | float: left; | ||
2730 | 448 | clear: both; | ||
2731 | 449 | } | ||
2732 | 450 | form.translations div.alignment .content label { | ||
2733 | 451 | padding: 0px; | ||
2734 | 452 | margin: 0px; | ||
2735 | 453 | font-weight: bold; | ||
2740 | 454 | } | 547 | } |
2744 | 455 | form.translations div.alignment .secondary label { | 548 | |
2745 | 456 | font-weight: normal; | 549 | select { |
2746 | 457 | padding: 2px 1em 2px 2px; | 550 | margin-left: 0.5em; |
2747 | 551 | padding-right: 0.5em; | ||
2748 | 552 | } | ||
2749 | 553 | |||
2750 | 554 | label { | ||
2751 | 555 | padding-left: 0.5em; | ||
2752 | 556 | padding-right: 1em; | ||
2753 | 557 | } | ||
2754 | 558 | |||
2755 | 559 | .listbox label { | ||
2756 | 560 | padding: 2px 1em 2px 2px; | ||
2757 | 561 | } | ||
2758 | 562 | |||
2759 | 563 | div.alignment { | ||
2760 | 564 | .content { | ||
2761 | 565 | float: left; | ||
2762 | 566 | } | ||
2763 | 567 | |||
2764 | 568 | .selector { | ||
2765 | 569 | margin-right: 0.5em; | ||
2766 | 570 | float: left; | ||
2767 | 571 | clear: both; | ||
2768 | 572 | } | ||
2769 | 573 | |||
2770 | 574 | .content label { | ||
2771 | 575 | padding: 0px; | ||
2772 | 576 | margin: 0px; | ||
2773 | 577 | font-weight: bold; | ||
2774 | 578 | } | ||
2775 | 579 | |||
2776 | 580 | .secondary label { | ||
2777 | 581 | font-weight: normal; | ||
2778 | 582 | padding: 2px 1em 2px 2px; | ||
2779 | 583 | } | ||
2780 | 458 | } | 584 | } |
2781 | 585 | } | ||
2782 | diff --git a/lib/canonical/launchpad/icing/css/layout.css b/lib/canonical/launchpad/icing/css/layout.scss | |||
2783 | 459 | similarity index 78% | 586 | similarity index 78% |
2784 | 460 | rename from lib/canonical/launchpad/icing/css/layout.css | 587 | rename from lib/canonical/launchpad/icing/css/layout.css |
2785 | 461 | rename to lib/canonical/launchpad/icing/css/layout.scss | 588 | rename to lib/canonical/launchpad/icing/css/layout.scss |
2786 | index cfe8ec3..d01f79a 100644 | |||
2787 | --- a/lib/canonical/launchpad/icing/css/layout.css | |||
2788 | +++ b/lib/canonical/launchpad/icing/css/layout.scss | |||
2789 | @@ -1,44 +1,55 @@ | |||
2790 | 1 | // This file the result of auto-converting layout.css to scss. | ||
2791 | 2 | |||
2792 | 1 | /* This probably shouldn't be here, but I'm not sure where to put it yet */ | 3 | /* This probably shouldn't be here, but I'm not sure where to put it yet */ |
2793 | 4 | |||
2794 | 2 | .yui-d0 { | 5 | .yui-d0 { |
2795 | 3 | margin: 10px 20px; | 6 | margin: 10px 20px; |
2808 | 4 | } | 7 | } |
2809 | 5 | .yui-t4 .yui-b { | 8 | |
2810 | 6 | width: 21%; | 9 | .yui-t4 { |
2811 | 7 | } | 10 | .yui-b { |
2812 | 8 | .yui-t4 .yui-main { | 11 | width: 21%; |
2801 | 9 | clear: both; | ||
2802 | 10 | float: left; | ||
2803 | 11 | margin-right: -25%; | ||
2804 | 12 | } | ||
2805 | 13 | .yui-t4 .yui-main .yui-b { | ||
2806 | 14 | width: auto; | ||
2807 | 15 | margin-right: 25%; | ||
2813 | 16 | } | 12 | } |
2814 | 17 | 13 | ||
2815 | 14 | .yui-main { | ||
2816 | 15 | clear: both; | ||
2817 | 16 | float: left; | ||
2818 | 17 | margin-right: -25%; | ||
2819 | 18 | 18 | ||
2820 | 19 | .yui-b { | ||
2821 | 20 | width: auto; | ||
2822 | 21 | margin-right: 25%; | ||
2823 | 22 | } | ||
2824 | 23 | } | ||
2825 | 24 | } | ||
2826 | 19 | 25 | ||
2831 | 20 | /* ========================= | 26 | /* ========================= |
2832 | 21 | Header | 27 | Header |
2833 | 22 | */ | 28 | */ |
2834 | 23 | .demo { | 29 | |
2835 | 30 | .demo { | ||
2836 | 24 | background-color: #fee; | 31 | background-color: #fee; |
2839 | 25 | } | 32 | } |
2840 | 26 | .login-logout { | 33 | |
2841 | 34 | .login-logout { | ||
2842 | 27 | position: absolute; | 35 | position: absolute; |
2843 | 28 | top: .5em; | 36 | top: .5em; |
2844 | 29 | right: 1.5em; | 37 | right: 1.5em; |
2847 | 30 | } | 38 | } |
2848 | 31 | #rendertime { | 39 | |
2849 | 40 | #rendertime { | ||
2850 | 32 | float: left; | 41 | float: left; |
2851 | 33 | margin: 0.1em 1.2em 0 0; | 42 | margin: 0.1em 1.2em 0 0; |
2852 | 34 | color: #666; | 43 | color: #666; |
2855 | 35 | } | 44 | } |
2856 | 36 | #ajax-time { | 45 | |
2857 | 46 | #ajax-time { | ||
2858 | 37 | float: left; | 47 | float: left; |
2859 | 38 | margin: 0 1.2em 0 0.2em; | 48 | margin: 0 1.2em 0 0.2em; |
2860 | 39 | position: relative; | 49 | position: relative; |
2863 | 40 | } | 50 | } |
2864 | 41 | #ajax-time-list { | 51 | |
2865 | 52 | #ajax-time-list { | ||
2866 | 42 | position: absolute; | 53 | position: absolute; |
2867 | 43 | z-index: 10; | 54 | z-index: 10; |
2868 | 44 | top: 20px; | 55 | top: 20px; |
2869 | @@ -49,168 +60,207 @@ | |||
2870 | 49 | -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); | 60 | -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); |
2871 | 50 | box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); | 61 | box-shadow: 0 0 5px rgba(0, 0, 0, 0.3); |
2872 | 51 | border-radius: 5px; | 62 | border-radius: 5px; |
2873 | 63 | |||
2874 | 64 | li { | ||
2875 | 65 | border-bottom: 1px solid #e0e0e0; | ||
2876 | 66 | padding: 3px 5px; | ||
2877 | 67 | |||
2878 | 68 | &:last-child { | ||
2879 | 69 | border-bottom: none; | ||
2880 | 70 | } | ||
2881 | 71 | |||
2882 | 72 | span { | ||
2883 | 73 | color: #999; | ||
2884 | 74 | font-size: 11px; | ||
2885 | 75 | display: block; | ||
2886 | 76 | } | ||
2887 | 52 | } | 77 | } |
2903 | 53 | #ajax-time-list li { | 78 | |
2904 | 54 | border-bottom: 1px solid #e0e0e0; | 79 | strong.warning { |
2905 | 55 | padding: 3px 5px; | 80 | color: #f00; |
2906 | 56 | } | 81 | background-color: transparent; |
2892 | 57 | #ajax-time-list li:last-child { | ||
2893 | 58 | border-bottom: none; | ||
2894 | 59 | } | ||
2895 | 60 | #ajax-time-list li span { | ||
2896 | 61 | color: #999; | ||
2897 | 62 | font-size: 11px; | ||
2898 | 63 | display: block; | ||
2899 | 64 | } | ||
2900 | 65 | #ajax-time-list strong.warning { | ||
2901 | 66 | color: #f00; | ||
2902 | 67 | background-color: transparent; | ||
2907 | 68 | } | 82 | } |
2914 | 69 | /* The actions row of the watermark is reused by our mhonarc templates, | 83 | } |
2915 | 70 | * which we can't easily change. So about half of this is overcomplex to | 84 | |
2916 | 71 | * support them too. Caution is also needed to avoid breaking | 85 | /* The actions row of the watermark is reused by our mhonarc templates, |
2917 | 72 | * Product:+index's inline title edit widget. | 86 | * which we can't easily change. So about half of this is overcomplex to |
2918 | 73 | */ | 87 | * support them too. Caution is also needed to avoid breaking |
2919 | 74 | div.watermark-apps-portlet { | 88 | * Product:+index's inline title edit widget. |
2920 | 89 | */ | ||
2921 | 90 | |||
2922 | 91 | div.watermark-apps-portlet { | ||
2923 | 75 | clear: both; | 92 | clear: both; |
2924 | 76 | margin-bottom: 0.8em; | 93 | margin-bottom: 0.8em; |
2939 | 77 | } | 94 | |
2940 | 78 | div.watermark-apps-portlet > div { | 95 | > div { |
2941 | 79 | display: inline-block; | 96 | display: inline-block; |
2942 | 80 | vertical-align: middle; | 97 | vertical-align: middle; |
2943 | 81 | } | 98 | |
2944 | 82 | div.watermark-apps-portlet > div.wide { | 99 | &.wide { |
2945 | 83 | width: 75%; | 100 | width: 75%; |
2946 | 84 | } | 101 | } |
2947 | 85 | div.watermark-apps-portlet > div > img, | 102 | |
2948 | 86 | div.watermark-apps-portlet > div > a > img { | 103 | > { |
2949 | 87 | display: block; | 104 | img, a > img { |
2950 | 88 | margin: 0 1em 0 0; | 105 | display: block; |
2951 | 89 | } | 106 | margin: 0 1em 0 0; |
2952 | 90 | #watermark-heading { | 107 | } |
2953 | 108 | } | ||
2954 | 109 | } | ||
2955 | 110 | } | ||
2956 | 111 | |||
2957 | 112 | #watermark-heading { | ||
2958 | 91 | color: #000; | 113 | color: #000; |
2959 | 92 | font-weight: normal; | 114 | font-weight: normal; |
2960 | 93 | font-size: 20px; | 115 | font-size: 20px; |
2961 | 94 | line-height: 26px; | 116 | line-height: 26px; |
2962 | 95 | margin: 0; | 117 | margin: 0; |
2963 | 118 | |||
2964 | 119 | :first-child { | ||
2965 | 120 | font-size: 32px; | ||
2966 | 121 | line-height: 32px; | ||
2967 | 96 | } | 122 | } |
2971 | 97 | #watermark-heading :first-child { | 123 | |
2972 | 98 | font-size: 32px; | 124 | :link, :visited { |
2973 | 99 | line-height: 32px; | 125 | color: #000; |
2974 | 100 | } | 126 | } |
2979 | 101 | #watermark-heading :link, #watermark-heading :visited { | 127 | } |
2980 | 102 | color: #000; | 128 | |
2981 | 103 | } | 129 | .watermark-apps-portlet ul.facetmenu { |
2978 | 104 | .watermark-apps-portlet ul.facetmenu { | ||
2982 | 105 | margin-top: 12px; | 130 | margin-top: 12px; |
2983 | 106 | margin-left: -0.5em; | 131 | margin-left: -0.5em; |
2984 | 107 | white-space: nowrap; | 132 | white-space: nowrap; |
2985 | 133 | |||
2986 | 134 | li { | ||
2987 | 135 | display: inline; | ||
2988 | 136 | list-style-type: none; | ||
2989 | 137 | |||
2990 | 138 | a, span { | ||
2991 | 139 | padding: 0.3em 0.5em; | ||
2992 | 140 | margin-right: 0.4em; | ||
2993 | 141 | } | ||
2994 | 142 | |||
2995 | 143 | a { | ||
2996 | 144 | &:link, &:visited { | ||
2997 | 145 | color: #000; | ||
2998 | 146 | text-decoration: none; | ||
2999 | 147 | } | ||
3000 | 148 | |||
3001 | 149 | &:hover { | ||
3002 | 150 | color: #000; | ||
3003 | 151 | background-color: #f3f3f3; | ||
3004 | 152 | } | ||
3005 | 153 | } | ||
3006 | 154 | |||
3007 | 155 | &.active { | ||
3008 | 156 | a, span { | ||
3009 | 157 | font-weight: bold; | ||
3010 | 158 | color: #fff; | ||
3011 | 159 | background-color: #747474; | ||
3012 | 160 | } | ||
3013 | 161 | } | ||
3014 | 162 | |||
3015 | 163 | &.disabled-tab { | ||
3016 | 164 | color: #747474; | ||
3017 | 165 | } | ||
3018 | 108 | } | 166 | } |
3047 | 109 | .watermark-apps-portlet ul.facetmenu li { | 167 | } |
3048 | 110 | display: inline; | 168 | |
3049 | 111 | list-style-type: none; | 169 | .context-publication { |
3022 | 112 | } | ||
3023 | 113 | .watermark-apps-portlet ul.facetmenu li a, | ||
3024 | 114 | .watermark-apps-portlet ul.facetmenu li span { | ||
3025 | 115 | padding: 0.3em 0.5em; | ||
3026 | 116 | margin-right: 0.4em; | ||
3027 | 117 | } | ||
3028 | 118 | .watermark-apps-portlet ul.facetmenu li a:link, | ||
3029 | 119 | .watermark-apps-portlet ul.facetmenu li a:visited { | ||
3030 | 120 | color: #000; | ||
3031 | 121 | text-decoration: none; | ||
3032 | 122 | } | ||
3033 | 123 | .watermark-apps-portlet ul.facetmenu li a:hover { | ||
3034 | 124 | color: #000; | ||
3035 | 125 | background-color: #f3f3f3; | ||
3036 | 126 | } | ||
3037 | 127 | .watermark-apps-portlet ul.facetmenu li.active a, | ||
3038 | 128 | .watermark-apps-portlet ul.facetmenu li.active span { | ||
3039 | 129 | font-weight: bold; | ||
3040 | 130 | color: #fff; | ||
3041 | 131 | background-color: #747474; | ||
3042 | 132 | } | ||
3043 | 133 | .watermark-apps-portlet ul.facetmenu li.disabled-tab { | ||
3044 | 134 | color: #747474; | ||
3045 | 135 | } | ||
3046 | 136 | .context-publication { | ||
3050 | 137 | margin-bottom: 1em; | 170 | margin-bottom: 1em; |
3053 | 138 | } | 171 | } |
3054 | 139 | .registering { | 172 | |
3055 | 173 | .registering { | ||
3056 | 140 | /* Registered slot */ | 174 | /* Registered slot */ |
3057 | 141 | margin: .5em 0 1em 0; | 175 | margin: .5em 0 1em 0; |
3058 | 142 | font-size: 10px; | 176 | font-size: 10px; |
3059 | 143 | color: #666; | 177 | color: #666; |
3062 | 144 | } | 178 | } |
3063 | 145 | .breadcrumbs { | 179 | |
3064 | 180 | .breadcrumbs { | ||
3065 | 146 | margin-left: 0; | 181 | margin-left: 0; |
3066 | 147 | list-style-type: none; | 182 | list-style-type: none; |
3067 | 148 | clear: both; | 183 | clear: both; |
3068 | 149 | font-size: 10px; | 184 | font-size: 10px; |
3069 | 185 | |||
3070 | 186 | li { | ||
3071 | 187 | display: inline; | ||
3072 | 188 | padding: 0; | ||
3073 | 189 | |||
3074 | 190 | a { | ||
3075 | 191 | color: #494949; | ||
3076 | 192 | } | ||
3077 | 193 | |||
3078 | 194 | &:after { | ||
3079 | 195 | content: "Ā» "; | ||
3080 | 196 | } | ||
3081 | 197 | |||
3082 | 198 | &:last-child { | ||
3083 | 199 | /* The following leaves a small margin in chrome/webkit, but using none | ||
3084 | 200 | doesn't hide the Ā» in webkit either (both work for FF3.5). */ | ||
3085 | 201 | font-weight: bold; | ||
3086 | 202 | |||
3087 | 203 | &:after { | ||
3088 | 204 | content: ''; | ||
3089 | 205 | } | ||
3090 | 206 | } | ||
3091 | 150 | } | 207 | } |
3111 | 151 | .breadcrumbs li { | 208 | } |
3112 | 152 | display: inline; | 209 | |
3113 | 153 | padding: 0; | 210 | #logincontrol { |
3095 | 154 | } | ||
3096 | 155 | .breadcrumbs li a { | ||
3097 | 156 | color: #494949; | ||
3098 | 157 | } | ||
3099 | 158 | .breadcrumbs li:after { | ||
3100 | 159 | content: "\00BB \0020" | ||
3101 | 160 | } | ||
3102 | 161 | .breadcrumbs li:last-child { | ||
3103 | 162 | /* The following leaves a small margin in chrome/webkit, but using none | ||
3104 | 163 | doesn't hide the Ā» in webkit either (both work for FF3.5). */ | ||
3105 | 164 | font-weight: bold; | ||
3106 | 165 | } | ||
3107 | 166 | .breadcrumbs li:last-child:after { | ||
3108 | 167 | content: ''; | ||
3109 | 168 | } | ||
3110 | 169 | #logincontrol { | ||
3114 | 170 | /* Top right of the page is a link to log in or a button to log out: */ | 211 | /* Top right of the page is a link to log in or a button to log out: */ |
3115 | 171 | float: right; | 212 | float: right; |
3116 | 213 | |||
3117 | 214 | img { | ||
3118 | 215 | /* align the image with the text */ | ||
3119 | 216 | margin-bottom: -2px; | ||
3120 | 172 | } | 217 | } |
3127 | 173 | #logincontrol img { | 218 | |
3128 | 174 | /* align the image with the text */ | 219 | form { |
3129 | 175 | margin-bottom: -2px; | 220 | margin: 0; |
3124 | 176 | } | ||
3125 | 177 | #logincontrol form { | ||
3126 | 178 | margin: 0; | ||
3130 | 179 | } | 221 | } |
3135 | 180 | #logincontrol input[type='submit'] { | 222 | |
3136 | 181 | /* The button lacks the right margin that buttons usually have: */ | 223 | input[type='submit'] { |
3137 | 182 | font-size: 10px; | 224 | /* The button lacks the right margin that buttons usually have: */ |
3138 | 183 | margin-right: 0; | 225 | font-size: 10px; |
3139 | 226 | margin-right: 0; | ||
3140 | 184 | } | 227 | } |
3141 | 228 | } | ||
3142 | 185 | 229 | ||
3143 | 230 | /* ========================= | ||
3144 | 231 | Footer | ||
3145 | 232 | */ | ||
3146 | 186 | 233 | ||
3151 | 187 | /* ========================= | 234 | .footer { |
3148 | 188 | Footer | ||
3149 | 189 | */ | ||
3150 | 190 | .footer { | ||
3152 | 191 | clear: both; | 235 | clear: both; |
3153 | 192 | margin-top: 4em; | 236 | margin-top: 4em; |
3154 | 193 | padding-top: 0.5em; | 237 | padding-top: 0.5em; |
3155 | 238 | |||
3156 | 239 | .lp-arcana { | ||
3157 | 240 | background: url(/@@/footer-background.png) top left repeat-x; | ||
3158 | 241 | padding: 0.8em; | ||
3159 | 242 | border-radius: 5px 5px 0 0; | ||
3160 | 243 | height: 2em; | ||
3161 | 244 | |||
3162 | 245 | img { | ||
3163 | 246 | vertical-align: middle; | ||
3164 | 247 | } | ||
3165 | 194 | } | 248 | } |
3177 | 195 | .footer .lp-arcana { | 249 | |
3178 | 196 | background: url(/@@/footer-background.png) top left repeat-x; | 250 | .sitemessage { |
3179 | 197 | padding: 0.8em; | 251 | text-align: right; |
3169 | 198 | border-radius: 5px 5px 0 0; | ||
3170 | 199 | height: 2em; | ||
3171 | 200 | } | ||
3172 | 201 | .footer .lp-arcana img { | ||
3173 | 202 | vertical-align: middle; | ||
3174 | 203 | } | ||
3175 | 204 | .footer .sitemessage { | ||
3176 | 205 | text-align: right; | ||
3180 | 206 | } | 252 | } |
3184 | 207 | .footer .colophon { | 253 | |
3185 | 208 | margin: 3em 3em 1em 3em; | 254 | .colophon { |
3186 | 209 | text-align: center; | 255 | margin: 3em 3em 1em 3em; |
3187 | 256 | text-align: center; | ||
3188 | 210 | } | 257 | } |
3191 | 211 | .footer .lp-branding { | 258 | |
3192 | 212 | float: left; | 259 | .lp-branding { |
3193 | 260 | float: left; | ||
3194 | 213 | } | 261 | } |
3197 | 214 | .footer form { | 262 | |
3198 | 215 | display: inline; | 263 | form { |
3199 | 264 | display: inline; | ||
3200 | 216 | } | 265 | } |
3201 | 266 | } | ||
3202 | diff --git a/lib/canonical/launchpad/icing/css/modifiers.css b/lib/canonical/launchpad/icing/css/modifiers.scss | |||
3203 | 217 | similarity index 75% | 267 | similarity index 75% |
3204 | 218 | rename from lib/canonical/launchpad/icing/css/modifiers.css | 268 | rename from lib/canonical/launchpad/icing/css/modifiers.css |
3205 | 219 | rename to lib/canonical/launchpad/icing/css/modifiers.scss | 269 | rename to lib/canonical/launchpad/icing/css/modifiers.scss |
3206 | index 03f4292..11c8f31 100644 | |||
3207 | --- a/lib/canonical/launchpad/icing/css/modifiers.css | |||
3208 | +++ b/lib/canonical/launchpad/icing/css/modifiers.scss | |||
3209 | @@ -1,224 +1,245 @@ | |||
3213 | 1 | div.left, | 1 | // This file the result of auto-converting modifiers.css to scss. |
3214 | 2 | div.right { | 2 | |
3215 | 3 | width: 50%; | 3 | div { |
3216 | 4 | &.left, &.right { | ||
3217 | 5 | width: 50%; | ||
3218 | 6 | } | ||
3219 | 7 | |||
3220 | 8 | &.left { | ||
3221 | 9 | clear: both; | ||
3222 | 10 | float: left; | ||
3223 | 4 | } | 11 | } |
3224 | 12 | } | ||
3225 | 5 | 13 | ||
3228 | 6 | div.left, | 14 | .cves { |
3227 | 7 | .cves { | ||
3229 | 8 | clear: both; | 15 | clear: both; |
3230 | 9 | float: left; | 16 | float: left; |
3232 | 10 | } | 17 | } |
3233 | 11 | 18 | ||
3237 | 12 | div.right { | 19 | div { |
3238 | 13 | clear: right; | 20 | &.right { |
3239 | 14 | float: right; | 21 | clear: right; |
3240 | 22 | float: right; | ||
3241 | 15 | } | 23 | } |
3242 | 16 | 24 | ||
3246 | 17 | div.centered { | 25 | &.centered { |
3247 | 18 | text-align: center; | 26 | text-align: center; |
3245 | 19 | } | ||
3248 | 20 | 27 | ||
3252 | 21 | div.centered table { | 28 | table { |
3253 | 22 | margin: 0 auto; | 29 | margin: 0 auto; |
3254 | 23 | text-align: left; | 30 | text-align: left; |
3255 | 31 | } | ||
3256 | 24 | } | 32 | } |
3257 | 25 | 33 | ||
3260 | 26 | div.see-all { | 34 | &.see-all { |
3261 | 27 | text-align: right; | 35 | text-align: right; |
3262 | 28 | } | 36 | } |
3263 | 37 | } | ||
3264 | 29 | 38 | ||
3267 | 30 | span.nolink { | 39 | span { |
3268 | 31 | font-weight: bold; | 40 | &.nolink { |
3269 | 41 | font-weight: bold; | ||
3270 | 32 | } | 42 | } |
3271 | 33 | 43 | ||
3274 | 34 | span.see-all { | 44 | &.see-all { |
3275 | 35 | float: right; | 45 | float: right; |
3276 | 36 | } | 46 | } |
3277 | 47 | } | ||
3278 | 37 | 48 | ||
3280 | 38 | .see-all a { | 49 | .see-all a { |
3281 | 39 | padding-left: 8px; | 50 | padding-left: 8px; |
3282 | 40 | background: inherit; | 51 | background: inherit; |
3283 | 41 | font-size: 12px; | 52 | font-size: 12px; |
3284 | 42 | text-decoration: underline; | 53 | text-decoration: underline; |
3286 | 43 | } | 54 | } |
3287 | 44 | 55 | ||
3289 | 45 | .transparent { | 56 | .transparent { |
3290 | 46 | opacity: 0; | 57 | opacity: 0; |
3294 | 47 | filter: alpha(opacity=0); | 58 | filter: alpha(opacity = 0); |
3295 | 48 | -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; | 59 | -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; |
3296 | 49 | } | 60 | } |
3297 | 50 | 61 | ||
3299 | 51 | .rss-right { | 62 | .rss-right { |
3300 | 52 | background: url(/@@/rss.png) right center no-repeat; | 63 | background: url(/@@/rss.png) right center no-repeat; |
3302 | 53 | } | 64 | } |
3303 | 54 | 65 | ||
3305 | 55 | .logo { | 66 | .logo { |
3306 | 56 | float: left; | 67 | float: left; |
3307 | 57 | display: inline; | 68 | display: inline; |
3308 | 58 | width: 64px; | 69 | width: 64px; |
3309 | 59 | height: 64px; | 70 | height: 64px; |
3310 | 60 | margin: 0 5px 0 0; | 71 | margin: 0 5px 0 0; |
3312 | 61 | } | 72 | } |
3313 | 62 | 73 | ||
3315 | 63 | .registered { | 74 | .registered { |
3316 | 64 | color: #666; | 75 | color: #666; |
3318 | 65 | } | 76 | } |
3319 | 66 | 77 | ||
3321 | 67 | .description { | 78 | .description { |
3322 | 68 | clear: both; | 79 | clear: both; |
3324 | 69 | } | 80 | } |
3325 | 70 | 81 | ||
3327 | 71 | .search-results { | 82 | .search-results { |
3328 | 72 | margin-top: 1em; | 83 | margin-top: 1em; |
3330 | 73 | } | 84 | } |
3331 | 74 | 85 | ||
3333 | 75 | .top-portlet .summary { | 86 | .top-portlet .summary { |
3334 | 76 | margin: 0 0 1em 0; | 87 | margin: 0 0 1em 0; |
3335 | 88 | |||
3336 | 77 | /* Same as h3, this appears under a h1. */ | 89 | /* Same as h3, this appears under a h1. */ |
3337 | 78 | font-size: 16px; | 90 | font-size: 16px; |
3339 | 79 | } | 91 | } |
3340 | 80 | 92 | ||
3342 | 81 | .main-portlet { | 93 | .main-portlet { |
3343 | 82 | margin: 1em 0 1em 0; | 94 | margin: 1em 0 1em 0; |
3345 | 83 | } | 95 | } |
3346 | 84 | 96 | ||
3348 | 85 | .pre { | 97 | .pre { |
3349 | 86 | white-space: pre; | 98 | white-space: pre; |
3351 | 87 | } | 99 | } |
3352 | 88 | 100 | ||
3354 | 89 | .clearfix:after { | 101 | .clearfix:after { |
3355 | 90 | /* use class="clearfix" whenever floats should be enclosed */ | 102 | /* use class="clearfix" whenever floats should be enclosed */ |
3356 | 91 | content: "."; | 103 | content: "."; |
3357 | 92 | display: block; | 104 | display: block; |
3358 | 93 | height: 0; | 105 | height: 0; |
3359 | 94 | clear: both; | 106 | clear: both; |
3360 | 95 | visibility: hidden; | 107 | visibility: hidden; |
3362 | 96 | } | 108 | } |
3363 | 97 | 109 | ||
3365 | 98 | * html .clearfix { | 110 | * html .clearfix { |
3366 | 99 | /* Work around float bug in MSIE */ | 111 | /* Work around float bug in MSIE */ |
3367 | 100 | height: 1%; | 112 | height: 1%; |
3369 | 101 | } | 113 | } |
3370 | 102 | 114 | ||
3372 | 103 | div.beta { | 115 | div.beta { |
3373 | 104 | background-color: #c24848; | 116 | background-color: #c24848; |
3374 | 105 | margin-bottom: 7px; | 117 | margin-bottom: 7px; |
3375 | 106 | margin-top: 7px; | 118 | margin-top: 7px; |
3376 | 107 | height: 10px; | 119 | height: 10px; |
3377 | 108 | width: 175px; | 120 | width: 175px; |
3378 | 109 | } | ||
3379 | 110 | 121 | ||
3382 | 111 | div.beta img { | 122 | img { |
3383 | 112 | height: 10px; | 123 | height: 10px; |
3384 | 113 | } | 124 | } |
3385 | 125 | } | ||
3386 | 114 | 126 | ||
3388 | 115 | .scrolled-box { | 127 | .scrolled-box { |
3389 | 116 | max-height: 4.5em; | 128 | max-height: 4.5em; |
3390 | 117 | overflow-y: scroll; | 129 | overflow-y: scroll; |
3392 | 118 | } | 130 | } |
3393 | 119 | 131 | ||
3401 | 120 | .ellipsis.single-line { | 132 | .ellipsis { |
3402 | 121 | display: inline-block; | 133 | &.single-line { |
3403 | 122 | white-space: nowrap; | 134 | display: inline-block; |
3404 | 123 | overflow: hidden; | 135 | white-space: nowrap; |
3405 | 124 | text-overflow: ellipsis; | 136 | overflow: hidden; |
3406 | 125 | -o-text-overflow: ellipsis; | 137 | text-overflow: ellipsis; |
3407 | 126 | -ms-text-overflow: ellipsis; | 138 | -o-text-overflow: ellipsis; |
3408 | 139 | -ms-text-overflow: ellipsis; | ||
3409 | 127 | } | 140 | } |
3410 | 128 | 141 | ||
3413 | 129 | .ellipsis.wide { | 142 | &.wide { |
3414 | 130 | max-width: 60em; | 143 | max-width: 60em; |
3415 | 131 | } | 144 | } |
3416 | 132 | 145 | ||
3421 | 133 | .ellipsis:before { | 146 | &:before { |
3422 | 134 | content: attr(data-ellipsis-original-text); | 147 | content: attr(data-ellipsis-original-text); |
3423 | 135 | position: absolute; | 148 | position: absolute; |
3424 | 136 | display: block; | 149 | display: block; |
3425 | 137 | } | 150 | } |
3428 | 138 | .ellipsis:hover:before { | 151 | |
3429 | 139 | display: block; | 152 | &:hover:before { |
3430 | 153 | display: block; | ||
3431 | 140 | } | 154 | } |
3432 | 155 | } | ||
3433 | 141 | 156 | ||
3435 | 142 | .exception { | 157 | .exception { |
3436 | 143 | color: #cc0000; | 158 | color: #cc0000; |
3438 | 144 | } | 159 | } |
3439 | 145 | 160 | ||
3441 | 146 | .highlight { | 161 | .highlight { |
3442 | 147 | background: #ddd; | 162 | background: #ddd; |
3443 | 148 | border: 1px solid #ddd; | 163 | border: 1px solid #ddd; |
3445 | 149 | } | 164 | } |
3446 | 150 | 165 | ||
3448 | 151 | .lowlight { | 166 | .lowlight { |
3449 | 152 | opacity: .5; | 167 | opacity: .5; |
3453 | 153 | filter: alpha(opacity=50); | 168 | filter: alpha(opacity = 50); |
3454 | 154 | -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; | 169 | -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; |
3455 | 155 | } | 170 | } |
3456 | 156 | 171 | ||
3459 | 157 | .status :link, | 172 | .status :link, .importance :link { |
3458 | 158 | .importance :link { | ||
3460 | 159 | text-decoration: none; | 173 | text-decoration: none; |
3462 | 160 | } | 174 | } |
3463 | 161 | 175 | ||
3466 | 162 | .lesser, | 176 | .lesser, .duplicate-details { |
3465 | 163 | .duplicate-details { | ||
3467 | 164 | font-size: 10px; | 177 | font-size: 10px; |
3468 | 165 | clear: left; | 178 | clear: left; |
3470 | 166 | } | 179 | } |
3471 | 167 | 180 | ||
3477 | 168 | pre.changelog, | 181 | pre.changelog { |
3473 | 169 | table.diff td.line-no, table.diff td.ss-line-no, | ||
3474 | 170 | table.diff td.text, | ||
3475 | 171 | .comment-text, | ||
3476 | 172 | .bug-activity { | ||
3478 | 173 | font-family: monospace; | 182 | font-family: monospace; |
3479 | 183 | } | ||
3480 | 184 | |||
3481 | 185 | table.diff td { | ||
3482 | 186 | &.line-no, &.ss-line-no, &.text { | ||
3483 | 187 | font-family: monospace; | ||
3484 | 174 | } | 188 | } |
3485 | 189 | } | ||
3486 | 190 | |||
3487 | 191 | .comment-text, .bug-activity { | ||
3488 | 192 | font-family: monospace; | ||
3489 | 193 | } | ||
3490 | 175 | 194 | ||
3492 | 176 | .cloud-size-smallest { | 195 | .cloud-size-smallest { |
3493 | 177 | font-size: 10px; | 196 | font-size: 10px; |
3495 | 178 | } | 197 | } |
3496 | 179 | 198 | ||
3498 | 180 | .cloud-size-small { | 199 | .cloud-size-small { |
3499 | 181 | font-size: 12px; | 200 | font-size: 12px; |
3501 | 182 | } | 201 | } |
3502 | 183 | 202 | ||
3504 | 184 | .cloud-size-medium { | 203 | .cloud-size-medium { |
3505 | 185 | font-size: 14px; | 204 | font-size: 14px; |
3507 | 186 | } | 205 | } |
3508 | 187 | 206 | ||
3510 | 188 | .cloud-size-large { | 207 | .cloud-size-large { |
3511 | 189 | font-size: 16px; | 208 | font-size: 16px; |
3513 | 190 | } | 209 | } |
3514 | 191 | 210 | ||
3516 | 192 | .cloud-size-largest { | 211 | .cloud-size-largest { |
3517 | 193 | font-size: 18px; | 212 | font-size: 18px; |
3519 | 194 | } | 213 | } |
3520 | 195 | 214 | ||
3522 | 196 | .cloud-dark { | 215 | .cloud-dark { |
3523 | 197 | color: #00f; | 216 | color: #00f; |
3525 | 198 | } | 217 | } |
3526 | 199 | 218 | ||
3528 | 200 | .cloud-medium { | 219 | .cloud-medium { |
3529 | 201 | color: #7878ff; | 220 | color: #7878ff; |
3531 | 202 | } | 221 | } |
3532 | 203 | 222 | ||
3534 | 204 | .cloud-light { | 223 | .cloud-light { |
3535 | 205 | color: #b8b8ff; | 224 | color: #b8b8ff; |
3537 | 206 | } | 225 | } |
3538 | 207 | 226 | ||
3544 | 208 | /* ========================= | 227 | /* ========================= |
3545 | 209 | Universal presentation | 228 | Universal presentation |
3546 | 210 | Sprites | 229 | Sprites |
3547 | 211 | */ | 230 | */ |
3548 | 212 | .sprite { | 231 | |
3549 | 232 | .sprite { | ||
3550 | 213 | padding: 0 0 6px 18px; | 233 | padding: 0 0 6px 18px; |
3551 | 214 | line-height: 18px; | 234 | line-height: 18px; |
3554 | 215 | } | 235 | } |
3555 | 216 | .block-sprite { | 236 | |
3556 | 237 | .block-sprite { | ||
3557 | 217 | padding: 2px 2px 15px 36px; | 238 | padding: 2px 2px 15px 36px; |
3558 | 218 | margin-bottom: 0; | 239 | margin-bottom: 0; |
3560 | 219 | } | 240 | } |
3561 | 220 | 241 | ||
3563 | 221 | .action-icon { | 242 | .action-icon { |
3564 | 222 | /* Textual browsers read the text, graphical browsers see the sprite. */ | 243 | /* Textual browsers read the text, graphical browsers see the sprite. */ |
3565 | 223 | display: inline-block; | 244 | display: inline-block; |
3566 | 224 | margin-left: 6px; | 245 | margin-left: 6px; |
3567 | @@ -227,53 +248,58 @@ table.diff td.text, | |||
3568 | 227 | vertical-align: text-top; | 248 | vertical-align: text-top; |
3569 | 228 | text-indent: 3px; | 249 | text-indent: 3px; |
3570 | 229 | overflow: hidden; | 250 | overflow: hidden; |
3571 | 230 | } | ||
3572 | 231 | 251 | ||
3575 | 232 | .action-icon + .action-icon { | 252 | + .action-icon { |
3576 | 233 | margin-left: 0px; | 253 | margin-left: 0px; |
3577 | 234 | } | 254 | } |
3578 | 235 | 255 | ||
3581 | 236 | .action-icon.standalone { | 256 | &.standalone { |
3582 | 237 | margin-top: -6px; | 257 | margin-top: -6px; |
3583 | 238 | } | 258 | } |
3584 | 259 | } | ||
3585 | 239 | 260 | ||
3587 | 240 | th .action-icon { | 261 | th .action-icon { |
3588 | 241 | height: 12px; | 262 | height: 12px; |
3590 | 242 | } | 263 | } |
3591 | 243 | 264 | ||
3595 | 244 | h1 a.sprite, | 265 | h1 a.sprite, h2 a.sprite { |
3593 | 245 | h2 a.sprite, | ||
3594 | 246 | h3 a.sprite { | ||
3596 | 247 | position: relative; | 266 | position: relative; |
3597 | 248 | top: 8px; | 267 | top: 8px; |
3598 | 249 | font-size: 12px; | 268 | font-size: 12px; |
3600 | 250 | } | 269 | } |
3601 | 251 | 270 | ||
3603 | 252 | h3 a.sprite { | 271 | h3 a.sprite { |
3604 | 272 | position: relative; | ||
3605 | 273 | top: 8px; | ||
3606 | 274 | font-size: 12px; | ||
3607 | 253 | top: 4px; | 275 | top: 4px; |
3609 | 254 | } | 276 | } |
3610 | 277 | |||
3611 | 278 | /* Hide the grey background for the Calendar content. */ | ||
3612 | 255 | 279 | ||
3615 | 256 | /* Hide the grey background for the Calendar content. */ | 280 | .yui3-skin-sam .yui3-pretty-overlay .yui3-calendar-content { |
3614 | 257 | .yui3-skin-sam .yui3-pretty-overlay .yui3-calendar-content { | ||
3616 | 258 | background: none; | 281 | background: none; |
3617 | 259 | border: none; | 282 | border: none; |
3619 | 260 | } | 283 | } |
3620 | 284 | |||
3621 | 285 | /* Center the Calendar within its overlay. */ | ||
3622 | 261 | 286 | ||
3625 | 262 | /* Center the Calendar within its overlay. */ | 287 | .yui3-calendarbase { |
3624 | 263 | .yui3-calendarbase { | ||
3626 | 264 | margin: 0 auto; | 288 | margin: 0 auto; |
3628 | 265 | } | 289 | } |
3629 | 290 | |||
3630 | 291 | /* Hidden must be the last rule because it overides all other rules. */ | ||
3631 | 266 | 292 | ||
3634 | 267 | /* Hidden must be the last rule because it overides all other rules. */ | 293 | .inline { |
3633 | 268 | .inline { | ||
3635 | 269 | display: inline; | 294 | display: inline; |
3636 | 270 | margin: 0; | 295 | margin: 0; |
3638 | 271 | } | 296 | } |
3639 | 297 | |||
3640 | 298 | /* Use 'hidden' to hide elements unconditionally. | ||
3641 | 299 | * Some things we want to hide by default only if javascript is enabled; for | ||
3642 | 300 | * these cases use 'hide-on-load'. | ||
3643 | 301 | */ | ||
3644 | 272 | 302 | ||
3650 | 273 | /* Use 'hidden' to hide elements unconditionally. | 303 | .hidden, .yui3-js-enabled .hide-on-load { |
3646 | 274 | * Some things we want to hide by default only if javascript is enabled; for | ||
3647 | 275 | * these cases use 'hide-on-load'. | ||
3648 | 276 | */ | ||
3649 | 277 | .hidden, .yui3-js-enabled .hide-on-load { | ||
3651 | 278 | display: none; | 304 | display: none; |
3653 | 279 | } | 305 | } |
3654 | diff --git a/lib/canonical/launchpad/icing/css/typography.css b/lib/canonical/launchpad/icing/css/typography.scss | |||
3655 | 280 | similarity index 62% | 306 | similarity index 62% |
3656 | 281 | rename from lib/canonical/launchpad/icing/css/typography.css | 307 | rename from lib/canonical/launchpad/icing/css/typography.css |
3657 | 282 | rename to lib/canonical/launchpad/icing/css/typography.scss | 308 | rename to lib/canonical/launchpad/icing/css/typography.scss |
3658 | index b3011c1..3b2e1cd 100644 | |||
3659 | --- a/lib/canonical/launchpad/icing/css/typography.css | |||
3660 | +++ b/lib/canonical/launchpad/icing/css/typography.scss | |||
3661 | @@ -1,106 +1,182 @@ | |||
3662 | 1 | // This file the result of auto-converting typography.css to scss. | ||
3663 | 2 | |||
3664 | 3 | $page-width: 45em; | ||
3665 | 4 | $wider-page: $page-width + 15em; | ||
3666 | 5 | $reduced-spacing: 0.8em; | ||
3667 | 6 | $link-colour: #03a; | ||
3668 | 7 | $active-link-colour: #36c; | ||
3669 | 8 | $separate-link-colour: #093; | ||
3670 | 1 | 9 | ||
3671 | 2 | h1, h2, h3, h4, h5, h6 { | 10 | h1, h2, h3, h4, h5, h6 { |
3672 | 3 | background: none; | 11 | background: none; |
3673 | 4 | clear: left; | 12 | clear: left; |
3676 | 5 | } | 13 | } |
3677 | 6 | h1 { | 14 | |
3678 | 15 | h1 { | ||
3679 | 7 | clear: none; | 16 | clear: none; |
3680 | 8 | font-size: 30px; | 17 | font-size: 30px; |
3681 | 9 | line-height: 34px; | 18 | line-height: 34px; |
3684 | 10 | } | 19 | } |
3685 | 11 | h2 { | 20 | |
3686 | 21 | h2 { | ||
3687 | 12 | margin-top: 16px; | 22 | margin-top: 16px; |
3688 | 13 | margin-bottom: 8px; | 23 | margin-bottom: 8px; |
3689 | 14 | font-size: 22px; | 24 | font-size: 22px; |
3690 | 15 | line-height: 26px; | 25 | line-height: 26px; |
3693 | 16 | } | 26 | } |
3694 | 17 | h3 { | 27 | |
3695 | 28 | h3 { | ||
3696 | 18 | margin-top: 16px; | 29 | margin-top: 16px; |
3697 | 19 | margin-bottom: 8px; | 30 | margin-bottom: 8px; |
3698 | 20 | font-size: 16px; | 31 | font-size: 16px; |
3699 | 21 | line-height: 20px; | 32 | line-height: 20px; |
3702 | 22 | } | 33 | } |
3703 | 23 | .yui-u > div > h3:first-child { | 34 | |
3704 | 35 | .yui-u > div > h3:first-child { | ||
3705 | 24 | margin-top: 0; | 36 | margin-top: 0; |
3708 | 25 | } | 37 | } |
3709 | 26 | p { | 38 | |
3710 | 39 | p { | ||
3711 | 27 | width: auto; | 40 | width: auto; |
3718 | 28 | margin-bottom: 0.8em; | 41 | margin-bottom: $reduced-spacing; |
3719 | 29 | } | 42 | } |
3720 | 30 | div + p, ul + p, table + p { | 43 | |
3721 | 31 | margin-top: 0.8em; | 44 | div + p, ul + p, table + p { |
3722 | 32 | } | 45 | margin-top: $reduced-spacing; |
3723 | 33 | p, li, dt, dd, blockquote, .narrow, .narrow-listing { | 46 | } |
3724 | 47 | |||
3725 | 48 | p, li, dt, dd, blockquote, .narrow, .narrow-listing { | ||
3726 | 34 | /* Wrap the text before the eye gets lost. */ | 49 | /* Wrap the text before the eye gets lost. */ |
3736 | 35 | max-width: 45em; | 50 | max-width: $page-width; |
3737 | 36 | } | 51 | } |
3738 | 37 | .wide * { | 52 | |
3739 | 38 | max-width: 60em; | 53 | .wide * { |
3740 | 39 | } | 54 | max-width: $wider-page; |
3741 | 40 | table.wide { | 55 | } |
3742 | 41 | width: 60em; | 56 | |
3743 | 42 | } | 57 | table.wide { |
3744 | 43 | pre, code, samp, tt, .console { | 58 | width: $wider-page; |
3745 | 59 | } | ||
3746 | 60 | |||
3747 | 61 | pre, code, samp, tt, .console { | ||
3748 | 44 | font-family: monospace; | 62 | font-family: monospace; |
3752 | 45 | margin-bottom: 0.8em; | 63 | margin-bottom: $reduced-spacing; |
3753 | 46 | } | 64 | } |
3754 | 47 | pre.wrap { | 65 | |
3755 | 66 | pre.wrap { | ||
3756 | 48 | /* From nice_pre in tales.py */ | 67 | /* From nice_pre in tales.py */ |
3757 | 49 | white-space: pre-wrap; | 68 | white-space: pre-wrap; |
3758 | 50 | word-wrap: break-word; | 69 | word-wrap: break-word; |
3760 | 51 | } | 70 | } |
3761 | 52 | 71 | ||
3763 | 53 | :link, :visited, a.js-action { | 72 | :link, :visited, a.js-action { |
3764 | 54 | /* Links are blue, brighter when clicked, and greyer once visited. */ | 73 | /* Links are blue, brighter when clicked, and greyer once visited. */ |
3766 | 55 | color: #03a; | 74 | color: $link-colour; |
3767 | 56 | text-decoration: none; | 75 | text-decoration: none; |
3770 | 57 | } | 76 | } |
3771 | 58 | :link:hover, :visited:hover, a.js-action:hover { | 77 | |
3772 | 78 | :link:hover, :visited:hover, a.js-action:hover { | ||
3773 | 59 | text-decoration: underline; | 79 | text-decoration: underline; |
3774 | 80 | } | ||
3775 | 81 | |||
3776 | 82 | :link:active, :visited:active { | ||
3777 | 83 | color: $active-link-colour; | ||
3778 | 84 | } | ||
3779 | 85 | |||
3780 | 86 | a { | ||
3781 | 87 | &.js-action:active { | ||
3782 | 88 | color: $active-link-colour; | ||
3783 | 60 | } | 89 | } |
3786 | 61 | :link:active, :visited:active, a.js-action:active { | 90 | |
3787 | 62 | color: #36c; | 91 | &[onclick] { |
3788 | 92 | /* Links that don't open separate pages are green. */ | ||
3789 | 93 | color: $separate-link-colour; | ||
3790 | 94 | cursor: pointer; | ||
3791 | 63 | } | 95 | } |
3795 | 64 | a[onclick], .collapsible legend a, a.js-action, | 96 | } |
3796 | 65 | a[onclick]:active, .collapsible legend a:active, a.js-action, | 97 | |
3797 | 66 | a.js-action:active { | 98 | .collapsible legend a { |
3798 | 67 | /* Links that don't open separate pages are green. */ | 99 | /* Links that don't open separate pages are green. */ |
3800 | 68 | color: #093; | 100 | color: $separate-link-colour; |
3801 | 69 | cursor: pointer; | 101 | cursor: pointer; |
3802 | 102 | } | ||
3803 | 103 | |||
3804 | 104 | a { | ||
3805 | 105 | &.js-action, &[onclick]:active { | ||
3806 | 106 | /* Links that don't open separate pages are green. */ | ||
3807 | 107 | color: $separate-link-colour; | ||
3808 | 108 | cursor: pointer; | ||
3809 | 70 | } | 109 | } |
3813 | 71 | a.help { | 110 | } |
3814 | 72 | border-bottom: 1px dotted #03a; | 111 | |
3815 | 73 | cursor: help; | 112 | .collapsible legend a:active { |
3816 | 113 | /* Links that don't open separate pages are green. */ | ||
3817 | 114 | color: $separate-link-colour; | ||
3818 | 115 | cursor: pointer; | ||
3819 | 116 | } | ||
3820 | 117 | |||
3821 | 118 | a { | ||
3822 | 119 | &.js-action { | ||
3823 | 120 | /* Links that don't open separate pages are green. */ | ||
3824 | 121 | color: $separate-link-colour; | ||
3825 | 122 | cursor: pointer; | ||
3826 | 123 | |||
3827 | 124 | &:active { | ||
3828 | 125 | /* Links that don't open separate pages are green. */ | ||
3829 | 126 | color: $separate-link-colour; | ||
3830 | 127 | cursor: pointer; | ||
3831 | 128 | } | ||
3832 | 74 | } | 129 | } |
3835 | 75 | a.help:hover, a.action-icon:hover { | 130 | |
3836 | 76 | text-decoration: none; | 131 | &.help { |
3837 | 132 | border-bottom: 1px dotted $link-colour; | ||
3838 | 133 | cursor: help; | ||
3839 | 134 | |||
3840 | 135 | &:hover { | ||
3841 | 136 | text-decoration: none; | ||
3842 | 137 | } | ||
3843 | 77 | } | 138 | } |
3851 | 78 | a.help.icon, a.sprite.maybe.help { | 139 | |
3852 | 79 | border: none; | 140 | &.action-icon:hover { |
3853 | 80 | } | 141 | text-decoration: none; |
3854 | 81 | a.invalid-link, a.invalid-link:active, a.invalid-link:hover { | 142 | } |
3855 | 82 | color: #909090; | 143 | |
3856 | 83 | text-decoration: none; | 144 | &.help.icon, &.sprite.maybe.help { |
3857 | 84 | cursor: default; | 145 | border: none; |
3858 | 146 | } | ||
3859 | 147 | |||
3860 | 148 | &.invalid-link { | ||
3861 | 149 | color: #909090; | ||
3862 | 150 | text-decoration: none; | ||
3863 | 151 | cursor: default; | ||
3864 | 152 | |||
3865 | 153 | &:active, &:hover { | ||
3866 | 154 | color: #909090; | ||
3867 | 155 | text-decoration: none; | ||
3868 | 156 | cursor: default; | ||
3869 | 157 | } | ||
3870 | 85 | } | 158 | } |
3872 | 86 | img, a img { | 159 | } |
3873 | 160 | |||
3874 | 161 | img, a img { | ||
3875 | 87 | /* No border on images that are links. */ | 162 | /* No border on images that are links. */ |
3876 | 88 | border: none; | 163 | border: none; |
3879 | 89 | } | 164 | } |
3880 | 90 | abbr[title], acronym[title] { | 165 | |
3881 | 166 | abbr[title], acronym[title] { | ||
3882 | 91 | border-bottom: 1px dotted black; | 167 | border-bottom: 1px dotted black; |
3883 | 92 | cursor: help; | 168 | cursor: help; |
3886 | 93 | } | 169 | } |
3887 | 94 | em { | 170 | |
3888 | 171 | em { | ||
3889 | 95 | font-style: italic; | 172 | font-style: italic; |
3895 | 96 | } | 173 | } |
3896 | 97 | strong { | 174 | |
3897 | 98 | font-weight: bold; | 175 | strong, .title { |
3893 | 99 | } | ||
3894 | 100 | .title { | ||
3898 | 101 | font-weight: bold; | 176 | font-weight: bold; |
3901 | 102 | } | 177 | } |
3902 | 103 | kbd { | 178 | |
3903 | 179 | kbd { | ||
3904 | 104 | background-color: #ddd; | 180 | background-color: #ddd; |
3905 | 105 | border: 1px solid; | 181 | border: 1px solid; |
3906 | 106 | border-color: white gray gray white; | 182 | border-color: white gray gray white; |
3907 | @@ -108,10 +184,12 @@ kbd { | |||
3908 | 108 | margin: 1px; | 184 | margin: 1px; |
3909 | 109 | min-width: 1em; | 185 | min-width: 1em; |
3910 | 110 | outline: 1px #666; | 186 | outline: 1px #666; |
3913 | 111 | } | 187 | } |
3914 | 112 | tt.command { | 188 | |
3915 | 189 | tt.command { | ||
3916 | 113 | padding-left: 2em; | 190 | padding-left: 2em; |
3919 | 114 | } | 191 | } |
3920 | 115 | .nowrap { | 192 | |
3921 | 193 | .nowrap { | ||
3922 | 116 | white-space: nowrap; | 194 | white-space: nowrap; |
3924 | 117 | } | 195 | } |
Ran it locally, and couldn't spot any visual problem.
LGTM.