Commit 2163ba8aebd9aed449c6374bc4fd81decb5b77db
Committed by
Tomáz Martins
1 parent
e10c6225
Exists in
master
and in
79 other branches
Fixing box-2 and box-3 to work with box-4
Adding this calls to the rules: .template-leftbar .template-lefttopright Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: TomazMartins <tomaz.r.martins@gmail.com>
Showing
2 changed files
with
211 additions
and
23 deletions
Show diff stats
css/left-bar.css
1 | /******************** Box-2 ********************/ | 1 | /******************** Box-2 ********************/ |
2 | 2 | ||
3 | -.box-2{ | 3 | +/*** WARNING - WITHOUT BOX-4 ***/ |
4 | + | ||
5 | +.template-leftbar .box-2 { | ||
4 | width:150px; | 6 | width:150px; |
5 | } | 7 | } |
6 | 8 | ||
7 | -#content .box-2 .block-outer .block-title { | 9 | +.template-leftbar #content .box-2 .block-outer .block-title { |
8 | background: #eee; | 10 | background: #eee; |
9 | color: #4562b1; | 11 | color: #4562b1; |
10 | border-top: 4px solid #4562b1; | 12 | border-top: 4px solid #4562b1; |
@@ -13,14 +15,86 @@ | @@ -13,14 +15,86 @@ | ||
13 | 15 | ||
14 | /*** Menus - Link list block ***/ | 16 | /*** Menus - Link list block ***/ |
15 | 17 | ||
16 | -#content .box-2 .link-list-block li { | 18 | +.template-leftbar #content .box-2 .link-list-block li { |
19 | + margin: 0; | ||
20 | + padding: 0; | ||
21 | + border-bottom: 1px solid #ddd; | ||
22 | + border-top: none; | ||
23 | +} | ||
24 | + | ||
25 | +.template-leftbar #content .box-2 .link-list-block li a { | ||
26 | + width: auto; | ||
27 | + padding: 6px 5px 8px 18px; | ||
28 | + background-color: #fff; | ||
29 | + background-position: 0px 50%; | ||
30 | + color: #2C66CE; | ||
31 | + border-right: none; | ||
32 | + border-top: 0px solid #64946E; | ||
33 | + border-radius: 0 0 0 0; | ||
34 | + font-weight: normal; | ||
35 | + font-size: 14px; | ||
36 | + line-height: 17px; | ||
37 | +} | ||
38 | + | ||
39 | +.template-leftbar #content .box-2 .link-list-block h3.empty + ul { | ||
40 | + border-top: 1px solid #ddd; | ||
41 | +} | ||
42 | + | ||
43 | +.template-leftbar #content .box-2 .link-list-block h3.empty + ul li a { | ||
44 | + padding-left: 0px; | ||
45 | + padding-right: 0px; | ||
46 | + background-image: none; | ||
47 | +} | ||
48 | + | ||
49 | +.template-leftbar #content .box-2 .link-list-block li a.link-this-page, | ||
50 | +.template-leftbar #content .box-2 .link-list-block li a.link-this-page:hover { | ||
51 | + border-right: none; | ||
52 | +} | ||
53 | + | ||
54 | +.template-leftbar #content .box-2 .link-list-block li a:hover { | ||
55 | + background-color: #FFFFFF; | ||
56 | + color: #000; | ||
57 | +} | ||
58 | +.template-leftbar #content .box-2 .link-list-block li a.link-this-page { | ||
59 | + width: auto; | ||
60 | + margin-left: 0px; | ||
61 | + background-color: #ffffff; | ||
62 | + font-weight: bold; | ||
63 | +} | ||
64 | + | ||
65 | +/*** END OF WARNING - WITHOUT BOX-4 ***/ | ||
66 | + | ||
67 | +/*** WARNING - WITH BOX-4 ***/ | ||
68 | + | ||
69 | +/************ DUPLICATE ************ | ||
70 | + | ||
71 | + This part of the code is duplicated because, if there is | ||
72 | + a change of layout from template-leftbar to lefttopright | ||
73 | + the CSS fit without many complication. | ||
74 | + | ||
75 | + */ | ||
76 | + | ||
77 | +.template-lefttopright .box-3 { | ||
78 | + width:150px; | ||
79 | +} | ||
80 | + | ||
81 | +.template-lefttopright #content .box-3 .block-outer .block-title { | ||
82 | + background: #eee; | ||
83 | + color: #4562b1; | ||
84 | + border-top: 4px solid #4562b1; | ||
85 | + line-height: 15px; | ||
86 | +} | ||
87 | + | ||
88 | +/*** Menus - Link list block ***/ | ||
89 | + | ||
90 | +.template-lefttopright #content .box-3 .link-list-block li { | ||
17 | margin: 0; | 91 | margin: 0; |
18 | padding: 0; | 92 | padding: 0; |
19 | border-bottom: 1px solid #ddd; | 93 | border-bottom: 1px solid #ddd; |
20 | border-top: none; | 94 | border-top: none; |
21 | } | 95 | } |
22 | 96 | ||
23 | -#content .box-2 .link-list-block li a { | 97 | +.template-lefttopright #content .box-3 .link-list-block li a { |
24 | width: auto; | 98 | width: auto; |
25 | padding: 6px 5px 8px 18px; | 99 | padding: 6px 5px 8px 18px; |
26 | background-color: #fff; | 100 | background-color: #fff; |
@@ -34,32 +108,36 @@ | @@ -34,32 +108,36 @@ | ||
34 | line-height: 17px; | 108 | line-height: 17px; |
35 | } | 109 | } |
36 | 110 | ||
37 | -#content .box-2 .link-list-block h3.empty + ul { | 111 | +.template-lefttopright #content .box-3 .link-list-block h3.empty + ul { |
38 | border-top: 1px solid #ddd; | 112 | border-top: 1px solid #ddd; |
39 | } | 113 | } |
40 | 114 | ||
41 | -#content .box-2 .link-list-block h3.empty + ul li a { | 115 | +.template-lefttopright #content .box-3 .link-list-block h3.empty + ul li a { |
42 | padding-left: 0px; | 116 | padding-left: 0px; |
43 | padding-right: 0px; | 117 | padding-right: 0px; |
44 | background-image: none; | 118 | background-image: none; |
45 | } | 119 | } |
46 | 120 | ||
47 | -#content .box-2 .link-list-block li a.link-this-page, | ||
48 | -#content .box-2 .link-list-block li a.link-this-page:hover { | 121 | +.template-lefttopright #content .box-3 .link-list-block li a.link-this-page, |
122 | +.template-lefttopright #content .box-3 .link-list-block li a.link-this-page:hover { | ||
49 | border-right: none; | 123 | border-right: none; |
50 | } | 124 | } |
51 | 125 | ||
52 | -#content .box-2 .link-list-block li a:hover { | 126 | +.template-lefttopright #content .box-3 .link-list-block li a:hover { |
53 | background-color: #FFFFFF; | 127 | background-color: #FFFFFF; |
54 | color: #000; | 128 | color: #000; |
55 | } | 129 | } |
56 | -#content .box-2 .link-list-block li a.link-this-page { | 130 | +.template-lefttopright #content .box-3 .link-list-block li a.link-this-page { |
57 | width: auto; | 131 | width: auto; |
58 | margin-left: 0px; | 132 | margin-left: 0px; |
59 | background-color: #ffffff; | 133 | background-color: #ffffff; |
60 | font-weight: bold; | 134 | font-weight: bold; |
61 | } | 135 | } |
62 | 136 | ||
137 | +/************ END OF DUPLICATE ************ | ||
138 | + | ||
139 | +/*** END OF WARNING - WITH BOX-4 ***/ | ||
140 | + | ||
63 | /*** Statistics block **/ | 141 | /*** Statistics block **/ |
64 | .statistics-block-data ul { | 142 | .statistics-block-data ul { |
65 | margin-top: 10px; | 143 | margin-top: 10px; |
@@ -83,6 +161,9 @@ span.amount { | @@ -83,6 +161,9 @@ span.amount { | ||
83 | span.label { | 161 | span.label { |
84 | font-size: 14px; | 162 | font-size: 14px; |
85 | } | 163 | } |
164 | + | ||
86 | /*** end of statistics block **/ | 165 | /*** end of statistics block **/ |
87 | 166 | ||
167 | +/*** WARNING - WITH BOX-4 ***/ | ||
168 | + | ||
88 | /******************** end Box-2 ********************/ | 169 | /******************** end Box-2 ********************/ |
css/software-pages.css
@@ -221,22 +221,24 @@ | @@ -221,22 +221,24 @@ | ||
221 | 221 | ||
222 | /*** Right bar ***/ | 222 | /*** Right bar ***/ |
223 | 223 | ||
224 | +/*** WARNING - WHITOUT BOX-4 ***/ | ||
225 | + | ||
224 | /* Link-list block */ | 226 | /* Link-list block */ |
225 | -#content .box-3 .block-title { | 227 | +.template-leftbar #content .box-3 .block-title { |
226 | border-top: 4px solid #4562b1; | 228 | border-top: 4px solid #4562b1; |
227 | line-height: 15px; | 229 | line-height: 15px; |
228 | background: #eee; | 230 | background: #eee; |
229 | color: #4562b1; | 231 | color: #4562b1; |
230 | } | 232 | } |
231 | 233 | ||
232 | -#content .box-3 .link-list-block li { | 234 | +.template-leftbar #content .box-3 .link-list-block li { |
233 | margin: 0px; | 235 | margin: 0px; |
234 | padding: 0px; | 236 | padding: 0px; |
235 | border-bottom: 1px solid #ddd; | 237 | border-bottom: 1px solid #ddd; |
236 | border-top: none; | 238 | border-top: none; |
237 | } | 239 | } |
238 | 240 | ||
239 | -#content .box-3 .link-list-block li a { | 241 | +.template-leftbar #content .box-3 .link-list-block li a { |
240 | border-right: none; | 242 | border-right: none; |
241 | border-top: 0px solid #64946E; | 243 | border-top: 0px solid #64946E; |
242 | border-radius: 0px 0px 0px 0px; | 244 | border-radius: 0px 0px 0px 0px; |
@@ -250,21 +252,21 @@ | @@ -250,21 +252,21 @@ | ||
250 | font-size: 14px; | 252 | font-size: 14px; |
251 | } | 253 | } |
252 | 254 | ||
253 | -#content .box-3 .link-list-block h3.empty + ul { | 255 | +.template-leftbar #content .box-3 .link-list-block h3.empty + ul { |
254 | border-top: 1px solid #ddd; | 256 | border-top: 1px solid #ddd; |
255 | } | 257 | } |
256 | 258 | ||
257 | -#content .box-3 .link-list-block li a.link-this-page, | ||
258 | -#content .box-3 .link-list-block li a.link-this-page:hover { | 259 | +.template-leftbar #content .box-3 .link-list-block li a.link-this-page, |
260 | +.template-leftbar #content .box-3 .link-list-block li a.link-this-page:hover { | ||
259 | border-right: none; | 261 | border-right: none; |
260 | } | 262 | } |
261 | 263 | ||
262 | -#content .box-3 .link-list-block li a:hover { | 264 | +.template-leftbar #content .box-3 .link-list-block li a:hover { |
263 | background-color: #FFFFFF; | 265 | background-color: #FFFFFF; |
264 | color: #000; | 266 | color: #000; |
265 | } | 267 | } |
266 | 268 | ||
267 | -#content .box-3 .link-list-block li a.link-this-page { | 269 | +.template-leftbar #content .box-3 .link-list-block li a.link-this-page { |
268 | margin-left: 0px; | 270 | margin-left: 0px; |
269 | width: auto; | 271 | width: auto; |
270 | background-color: #ffffff; | 272 | background-color: #ffffff; |
@@ -272,9 +274,9 @@ | @@ -272,9 +274,9 @@ | ||
272 | } | 274 | } |
273 | 275 | ||
274 | /* Repository block */ | 276 | /* Repository block */ |
275 | -.box-3 #bt_repositorio, | ||
276 | -.box-3 #bt_repositorio:active, | ||
277 | -.box-3 #bt_repositorio:visited { | 277 | +.template-leftbar .box-3 #bt_repositorio, |
278 | +.template-leftbar .box-3 #bt_repositorio:active, | ||
279 | +.template-leftbar .box-3 #bt_repositorio:visited { | ||
278 | border-radius: 4px; | 280 | border-radius: 4px; |
279 | padding: 12px 10px; | 281 | padding: 12px 10px; |
280 | background: #EAEBEE; | 282 | background: #EAEBEE; |
@@ -284,7 +286,7 @@ | @@ -284,7 +286,7 @@ | ||
284 | position: relative; | 286 | position: relative; |
285 | } | 287 | } |
286 | 288 | ||
287 | -.box-3 #bt_repositorio::after { | 289 | +.template-leftbar .box-3 #bt_repositorio::after { |
288 | margin-top: -2px; | 290 | margin-top: -2px; |
289 | padding: 4px 0px 4px 2px; | 291 | padding: 4px 0px 4px 2px; |
290 | border-radius: 4px; | 292 | border-radius: 4px; |
@@ -299,13 +301,118 @@ | @@ -299,13 +301,118 @@ | ||
299 | content: url('../images/right-arrow.png'); | 301 | content: url('../images/right-arrow.png'); |
300 | } | 302 | } |
301 | 303 | ||
302 | -.box-3 #content #bt_repositorio:hover { | 304 | +.template-leftbar .box-3 #content #bt_repositorio:hover { |
303 | color: #FFF; | 305 | color: #FFF; |
304 | background: #2C66CE; | 306 | background: #2C66CE; |
305 | text-decoration: none; | 307 | text-decoration: none; |
306 | } | 308 | } |
309 | +/*** END - WARNING - WHITOUT BOX-4 ***/ | ||
310 | + | ||
307 | /*** end of right bar ***/ | 311 | /*** end of right bar ***/ |
308 | 312 | ||
313 | +/************ DUPLICATE ************/ | ||
314 | + | ||
315 | +/* | ||
316 | + This part of the code is duplicated because, if there is | ||
317 | + a change of layout from template-leftbar to lefttopright | ||
318 | + the CSS fit without many complication. | ||
319 | + */ | ||
320 | + | ||
321 | +/*** Right bar ***/ | ||
322 | + | ||
323 | +/*** WARNING - WITH BOX-4 ***/ | ||
324 | + | ||
325 | +/* Link-list block */ | ||
326 | +.template-lefttopright #content .box-2 .block-title { | ||
327 | + border-top: 4px solid #4562b1; | ||
328 | + line-height: 15px; | ||
329 | + background: #eee; | ||
330 | + color: #4562b1; | ||
331 | +} | ||
332 | + | ||
333 | +.template-lefttopright #content .box-2 .link-list-block li { | ||
334 | + margin: 0px; | ||
335 | + padding: 0px; | ||
336 | + border-bottom: 1px solid #ddd; | ||
337 | + border-top: none; | ||
338 | +} | ||
339 | + | ||
340 | +.template-lefttopright #content .box-2 .link-list-block li a { | ||
341 | + border-right: none; | ||
342 | + border-top: 0px solid #64946E; | ||
343 | + border-radius: 0px 0px 0px 0px; | ||
344 | + padding: 6px 5px 8px 18px; | ||
345 | + width: auto; | ||
346 | + line-height: 17px; | ||
347 | + background-color: #fff; | ||
348 | + background-position: 0px 50%; | ||
349 | + color: #2C66CE; | ||
350 | + font-weight: normal; | ||
351 | + font-size: 14px; | ||
352 | +} | ||
353 | + | ||
354 | +.template-lefttopright #content .box-2 .link-list-block h3.empty + ul { | ||
355 | + border-top: 1px solid #ddd; | ||
356 | +} | ||
357 | + | ||
358 | +.template-lefttopright #content .box-2 .link-list-block li a.link-this-page, | ||
359 | +.template-lefttopright #content .box-2 .link-list-block li a.link-this-page:hover { | ||
360 | + border-right: none; | ||
361 | +} | ||
362 | + | ||
363 | +.template-lefttopright #content .box-2 .link-list-block li a:hover { | ||
364 | + background-color: #FFFFFF; | ||
365 | + color: #000; | ||
366 | +} | ||
367 | + | ||
368 | +.template-lefttopright #content .box-2 .link-list-block li a.link-this-page { | ||
369 | + margin-left: 0px; | ||
370 | + width: auto; | ||
371 | + background-color: #ffffff; | ||
372 | + font-weight: bold; | ||
373 | +} | ||
374 | + | ||
375 | +/* Repository block */ | ||
376 | +.template-lefttopright .box-2 #bt_repositorio, | ||
377 | +.template-lefttopright .box-2 #bt_repositorio:active, | ||
378 | +.template-lefttopright .box-2 #bt_repositorio:visited { | ||
379 | + border-radius: 4px; | ||
380 | + padding: 12px 10px; | ||
381 | + background: #EAEBEE; | ||
382 | + font: normal normal bold 12px 'open_sansbold', arial, helvetica, sans-serif; | ||
383 | + text-transform: uppercase; | ||
384 | + display: block; | ||
385 | + position: relative; | ||
386 | +} | ||
387 | + | ||
388 | +.template-lefttopright .box-2 #bt_repositorio::after { | ||
389 | + margin-top: -2px; | ||
390 | + padding: 4px 0px 4px 2px; | ||
391 | + border-radius: 4px; | ||
392 | + width: 18px; | ||
393 | + right: 10px; | ||
394 | + line-height: 20px; | ||
395 | + position: absolute; | ||
396 | + background: #2C66CE; | ||
397 | + color: #FFF; | ||
398 | + font-size: 16px; | ||
399 | + text-align: center; | ||
400 | + content: url('../images/right-arrow.png'); | ||
401 | +} | ||
402 | + | ||
403 | +.template-lefttopright .box-2 #content #bt_repositorio:hover { | ||
404 | + color: #FFF; | ||
405 | + background: #2C66CE; | ||
406 | + text-decoration: none; | ||
407 | +} | ||
408 | + | ||
409 | +/*** WARNING - WITH BOX-4 ***/ | ||
410 | + | ||
411 | +/*** end of right bar ***/ | ||
412 | + | ||
413 | +/************ END DUPLICATE ************/ | ||
414 | + | ||
415 | + | ||
309 | /*** Software internal pages ***/ | 416 | /*** Software internal pages ***/ |
310 | 417 | ||
311 | /* FAQ page */ | 418 | /* FAQ page */ |