Commit e4bb0c3bcdb2d29bdd02abce2afdf050c709c505
Exists in
master
and in
79 other branches
Merge branch 'r4' of portal.softwarepublico.gov.br:softwarepublico/noosfero-spb-theme into r4
Conflicts: css/community-pages.css
Showing
5 changed files
with
89 additions
and
17 deletions
Show diff stats
css/software-pages.css
| @@ -273,24 +273,32 @@ | @@ -273,24 +273,32 @@ | ||
| 273 | font-weight: bold; | 273 | font-weight: bold; |
| 274 | } | 274 | } |
| 275 | 275 | ||
| 276 | -/* Repository block */ | 276 | +/* Repository and Wiki blocks */ |
| 277 | + | ||
| 278 | +.template-default #content .box-3 .wiki-block, | ||
| 277 | .template-default #content .box-3 .repository-block{ | 279 | .template-default #content .box-3 .repository-block{ |
| 278 | padding: 0 0 0 10px; | 280 | padding: 0 0 0 10px; |
| 279 | } | 281 | } |
| 280 | 282 | ||
| 281 | -.template-default .box-3 #bt_repositorio, | ||
| 282 | -.template-default .box-3 #bt_repositorio:active, | ||
| 283 | -.template-default .box-3 #bt_repositorio:visited{ | 283 | +.template-default .box-3 #bt_wiki, |
| 284 | +.template-default .box-3 #bt_repositorio { | ||
| 284 | border-radius: 4px; | 285 | border-radius: 4px; |
| 285 | padding: 12px 10px; | 286 | padding: 12px 10px; |
| 286 | background: #EAEBEE; | 287 | background: #EAEBEE; |
| 288 | + color: #2C66CE; | ||
| 287 | font: normal normal bold 12px 'open_sansbold', arial, helvetica, sans-serif; | 289 | font: normal normal bold 12px 'open_sansbold', arial, helvetica, sans-serif; |
| 288 | text-transform: uppercase; | 290 | text-transform: uppercase; |
| 289 | display: block; | 291 | display: block; |
| 290 | position: relative; | 292 | position: relative; |
| 291 | } | 293 | } |
| 292 | 294 | ||
| 293 | -.template-default .box-3 #bt_repositorio::after{ | 295 | +.template-default .box-3 #bt_wiki:hover, |
| 296 | +.template-default .box-3 #bt_repositorio:hover { | ||
| 297 | + color:#172738; | ||
| 298 | +} | ||
| 299 | + | ||
| 300 | +.template-default .box-3 #bt_wiki:after, | ||
| 301 | +.template-default .box-3 #bt_repositorio:after{ | ||
| 294 | margin-top: -2px; | 302 | margin-top: -2px; |
| 295 | padding: 4px 0px 4px 2px; | 303 | padding: 4px 0px 4px 2px; |
| 296 | border-radius: 4px; | 304 | border-radius: 4px; |
| @@ -305,6 +313,7 @@ | @@ -305,6 +313,7 @@ | ||
| 305 | content: url('../images/right-arrow.png'); | 313 | content: url('../images/right-arrow.png'); |
| 306 | } | 314 | } |
| 307 | 315 | ||
| 316 | +.template-default .box-3 #content #bt_wiki:hover, | ||
| 308 | .template-default .box-3 #content #bt_repositorio:hover{ | 317 | .template-default .box-3 #content #bt_repositorio:hover{ |
| 309 | color: #FFF; | 318 | color: #FFF; |
| 310 | background: #2C66CE; | 319 | background: #2C66CE; |
| @@ -377,6 +386,7 @@ | @@ -377,6 +386,7 @@ | ||
| 377 | } | 386 | } |
| 378 | 387 | ||
| 379 | /* Repository block */ | 388 | /* Repository block */ |
| 389 | + | ||
| 380 | .template-lefttopright #content .box-2 .repository-block{ | 390 | .template-lefttopright #content .box-2 .repository-block{ |
| 381 | padding: 0 0 0 10px; | 391 | padding: 0 0 0 10px; |
| 382 | } | 392 | } |
| @@ -416,6 +426,68 @@ | @@ -416,6 +426,68 @@ | ||
| 416 | 426 | ||
| 417 | /*** WARNING - WITH BOX-4 ***/ | 427 | /*** WARNING - WITH BOX-4 ***/ |
| 418 | 428 | ||
| 429 | +/* Metrics Block */ | ||
| 430 | +.software-metrics-block { | ||
| 431 | + font-family: Arial; | ||
| 432 | + padding: 3px 0px 0px 10px; | ||
| 433 | +} | ||
| 434 | + | ||
| 435 | +.software-metrics-block .metrics-list { | ||
| 436 | + border-bottom: 1px dotted #D3D6DE; | ||
| 437 | +} | ||
| 438 | + | ||
| 439 | +.software-metrics-block .metrics-list li { | ||
| 440 | + display: table; | ||
| 441 | + margin-bottom: 10px; | ||
| 442 | +} | ||
| 443 | + | ||
| 444 | +.software-metrics-block .metrics-list li span, | ||
| 445 | +.software-metrics-block .metrics-list li a { | ||
| 446 | + display: table-cell; | ||
| 447 | + vertical-align: top; | ||
| 448 | +} | ||
| 449 | + | ||
| 450 | +.software-metrics-block .metrics-list li a:link { | ||
| 451 | + color: #2c66ce !important; | ||
| 452 | +} | ||
| 453 | + | ||
| 454 | +.software-metrics-block span.arrow-globe-icon { | ||
| 455 | + content: url('../images/arrow-globe-icon.png'); | ||
| 456 | + padding-right: 5px; | ||
| 457 | +} | ||
| 458 | + | ||
| 459 | +.software-metrics-block span.downloads-icon { | ||
| 460 | + content: url('../images/downloads-icon.png'); | ||
| 461 | + padding-right: 14px; | ||
| 462 | + padding-left: 1px; | ||
| 463 | +} | ||
| 464 | + | ||
| 465 | +.software-metrics-block span.face-icon { | ||
| 466 | + content: url('../images/beneficiados-icon.png'); | ||
| 467 | + padding-right: 14px; | ||
| 468 | + padding-left: 1px; | ||
| 469 | +} | ||
| 470 | + | ||
| 471 | +.software-metrics-block span.pig-safe-icon { | ||
| 472 | + content: url('../images/economizados-icon.png'); | ||
| 473 | + padding-right: 11px; | ||
| 474 | +} | ||
| 475 | + | ||
| 476 | +.software-metrics-block .metrics-list li a { | ||
| 477 | + letter-spacing: -0.1px; | ||
| 478 | +} | ||
| 479 | + | ||
| 480 | +.software-metrics-block .admin-estimation { | ||
| 481 | + font-size: 11px; | ||
| 482 | + line-height: 15px; | ||
| 483 | + margin-top: 7px; | ||
| 484 | + margin-left: 4px; | ||
| 485 | +} | ||
| 486 | + | ||
| 487 | +.software-metrics-block .metrics-list .saved-money { | ||
| 488 | + font-size: 14px; | ||
| 489 | +} | ||
| 490 | + | ||
| 419 | /*** end of right bar ***/ | 491 | /*** end of right bar ***/ |
| 420 | 492 | ||
| 421 | /************ END DUPLICATE ************/ | 493 | /************ END DUPLICATE ************/ |
css/use-report.css
| 1 | /*** Profile homepage ***/ | 1 | /*** Profile homepage ***/ |
| 2 | 2 | ||
| 3 | /* Ratings Header */ | 3 | /* Ratings Header */ |
| 4 | -.profile-homepage #content .community-average-rating-container{ | 4 | +.profile-homepage #content .community-average-rating-container { |
| 5 | margin-top: 21px; | 5 | margin-top: 21px; |
| 6 | overflow: auto; | 6 | overflow: auto; |
| 7 | } | 7 | } |
| 8 | 8 | ||
| 9 | -.profile-homepage #content .community-average-rating-container .star-rate-text{ | 9 | +.profile-homepage #content .community-average-rating-container .star-rate-text { |
| 10 | font-size: 14px; | 10 | font-size: 14px; |
| 11 | letter-spacing: 0.2px; | 11 | letter-spacing: 0.2px; |
| 12 | margin-right: 5px; | 12 | margin-right: 5px; |
| 13 | padding: 4px 0px 0px 3px; | 13 | padding: 4px 0px 0px 3px; |
| 14 | } | 14 | } |
| 15 | 15 | ||
| 16 | -.profile-homepage #content .community-average-rating-container .star-container{ | 16 | +.profile-homepage #content .community-average-rating-container .star-container { |
| 17 | margin-top: 2px; | 17 | margin-top: 2px; |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | -.profile-homepage #content .community-average-rating-container .rate-this-community{ | 20 | +.profile-homepage #content .community-average-rating-container .rate-this-community { |
| 21 | font-size: 14px; | 21 | font-size: 14px; |
| 22 | text-decoration: underline; | 22 | text-decoration: underline; |
| 23 | margin: 4px 0px 0px 6px; | 23 | margin: 4px 0px 0px 6px; |
| 24 | padding: 0px 0px 0px 15px; | 24 | padding: 0px 0px 0px 15px; |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | -.profile-homepage #content .community-average-rating-container .rate-this-community a{ | 27 | +.profile-homepage #content .community-average-rating-container .rate-this-community a { |
| 28 | color: #2c66ce; | 28 | color: #2c66ce; |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | .profile-homepage #content .community-average-rating-container .star-container .medium-star-negative, | 31 | .profile-homepage #content .community-average-rating-container .star-container .medium-star-negative, |
| 32 | -.profile-homepage #content .community-average-rating-container .star-container .medium-star-positive{ | 32 | +.profile-homepage #content .community-average-rating-container .star-container .medium-star-positive { |
| 33 | margin-right: 3px; | 33 | margin-right: 3px; |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | -.profile-homepage #content .communities-ratings-block .button-bar a.button.with-text{ | 36 | +.profile-homepage #content .communities-ratings-block .button-bar a.button.with-text { |
| 37 | height: 32px; | 37 | height: 32px; |
| 38 | padding: 0px 5px; | 38 | padding: 0px 5px; |
| 39 | border: 1px solid #3E67B1; | 39 | border: 1px solid #3E67B1; |
| @@ -265,14 +265,14 @@ | @@ -265,14 +265,14 @@ | ||
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | #content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-people-benefited, | 267 | #content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-people-benefited, |
| 268 | -#content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-saved-values{ | 268 | +#content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-saved-values { |
| 269 | font-size: 12px; | 269 | font-size: 12px; |
| 270 | float: left; | 270 | float: left; |
| 271 | padding-right: 10px; | 271 | padding-right: 10px; |
| 272 | height: 50px; | 272 | height: 50px; |
| 273 | } | 273 | } |
| 274 | 274 | ||
| 275 | -#content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-saved-values{ | 275 | +#content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-saved-values { |
| 276 | padding-right: 0px; | 276 | padding-right: 0px; |
| 277 | height: 70px; | 277 | height: 70px; |
| 278 | } | 278 | } |
| @@ -307,15 +307,15 @@ | @@ -307,15 +307,15 @@ | ||
| 307 | padding-right: 6px; | 307 | padding-right: 6px; |
| 308 | } | 308 | } |
| 309 | 309 | ||
| 310 | -.action-communities_ratings_plugin_profile-new_rating #content .star-rate-form .star-comment-container .comments-display-fields .comments-arrow-down::after{ | 310 | +.action-communities_ratings_plugin_profile-new_rating #content .star-rate-form .star-comment-container .comments-display-fields .comments-arrow-down::after { |
| 311 | content: url('../images/bottom-arrow-black.png'); | 311 | content: url('../images/bottom-arrow-black.png'); |
| 312 | float: right; | 312 | float: right; |
| 313 | padding-top: 7px; | 313 | padding-top: 7px; |
| 314 | padding-right: 6px; | 314 | padding-right: 6px; |
| 315 | } | 315 | } |
| 316 | 316 | ||
| 317 | -#content .star-rate-form .star-comment-container .comments-software-extra-fields #comments_people_benefited, | ||
| 318 | -#content .star-rate-form .star-comment-container .comments-software-extra-fields #comments_saved_value { | 317 | +#content .star-rate-form .star-comment-container .comments-software-extra-fields #community_rating_people_benefited, |
| 318 | +#content .star-rate-form .star-comment-container .comments-software-extra-fields #community_rating_saved_value { | ||
| 319 | display: block; | 319 | display: block; |
| 320 | height: 19px; | 320 | height: 19px; |
| 321 | width: 155px; | 321 | width: 155px; |
895 Bytes
609 Bytes
517 Bytes