Commit 6545ba12096e96f262f790cc9fa02210dc6f709d

Authored by Juliana
2 parents 4d3d5f6b c543671b

Merge branch 'r4' of portal.softwarepublico.gov.br:softwarepublico/noosfero-spb-theme into r4

Showing 2 changed files with 11 additions and 9 deletions   Show diff stats
css/community-pages.css
@@ -446,8 +446,7 @@ float: left; @@ -446,8 +446,7 @@ float: left;
446 /*** Right bar ***/ 446 /*** Right bar ***/
447 447
448 .template-default.profile-type-is-community .action-profile-index #content .box-3 .link-list-block, 448 .template-default.profile-type-is-community .action-profile-index #content .box-3 .link-list-block,
449 -.template-lefttopright.profile-type-is-community .action-profile-index #content .box-3 .link-list-block,  
450 -.template-leftbar.profile-type-is-community .action-profile-index #content .box-3 .link-list-block{ 449 +.template-lefttopright.profile-type-is-community .action-profile-index #content .box-2 .link-list-block
451 display: none; 450 display: none;
452 } 451 }
453 452
@@ -501,20 +500,23 @@ float: left; @@ -501,20 +500,23 @@ float: left;
501 500
502 /* Wiki block - Need to develop solution - Only display on profile page */ 501 /* Wiki block - Need to develop solution - Only display on profile page */
503 .template-default #content .box-3 .wiki-block, 502 .template-default #content .box-3 .wiki-block,
504 -.template-lefttopright #content .box-2 .wiki-block,  
505 -.template-leftbar #content .box-3 .wiki-block{ 503 +.template-lefttopright #content .box-2 .wiki-block{
506 display: none; 504 display: none;
507 } 505 }
508 506
509 .template-default .action-profile-index #content .box-3 .wiki-block, 507 .template-default .action-profile-index #content .box-3 .wiki-block,
510 .template-lefttopright .action-profile-index #content .box-2 .wiki-block, 508 .template-lefttopright .action-profile-index #content .box-2 .wiki-block,
511 -.template-leftbar .action-profile-index #content .box-3 .wiki-block,  
512 .template-default .action-profile_design-index #content .box-3 .wiki-block, 509 .template-default .action-profile_design-index #content .box-3 .wiki-block,
513 -.template-lefttopright .action-profile_design-index #content .box-2 .wiki-block,  
514 -.template-leftbar .action-profile_design-index #content .box-3 .wiki-block{ 510 +.template-lefttopright .action-profile_design-index #content .box-2 .wiki-block{
515 display: block; 511 display: block;
516 } 512 }
517 513
  514 +/* Repository block and wiki block need to look a unique block */
  515 +.action-profile-index #content .box-2 .block-outer .repository-block,
  516 +.action-profile-index #content .box-3 .block-outer .repository-block{
  517 + margin-bottom: 20px;
  518 +}
  519 +
518 /*Block with Members information - Need to develop solution - Only display on profile page */ 520 /*Block with Members information - Need to develop solution - Only display on profile page */
519 521
520 .profile-type-is-community #content .members-block{ 522 .profile-type-is-community #content .members-block{
css/main-content.css
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
4 margin-top: 50px; 4 margin-top: 50px;
5 } 5 }
6 6
7 -.box-2 .block-outer,  
8 -.box-3 .block-outer{ 7 +#content .box-2 .block-outer .block,
  8 +#content .box-3 .block-outer .block{
9 margin-bottom: 45px; 9 margin-bottom: 45px;
10 clear: both; 10 clear: both;
11 } 11 }