Download as
Browse Code »

Commit 15c66b830dc1337cd71a8263dc9816992f705775

Authored by Daniela Feitosa
1 parent fd414444
Exists in master and in 3 other branches fix_track_card_list_second_page, production, staging

Organizing portal home

Showing 4 changed files with 138 additions and 44 deletions   Show diff stats
@@ -453,7 +453,6 @@ dl.portlet li, @@ -453,7 +453,6 @@ dl.portlet li,
453 div.portletStaticText li { 453 div.portletStaticText li {
454 margin-bottom: 0.25em; 454 margin-bottom: 0.25em;
455 line-height: 1.5em; 455 line-height: 1.5em;
456 -display: list-item;  
457 } 456 }
458 #content dt { 457 #content dt {
459 font-weight: bold; 458 font-weight: bold;
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 </a> 11 </a>
12 </li> 12 </li>
13 <li> 13 <li>
14 - <a id="link-navegacao" href="#navigation" accesskey="2"> 14 + <a id="link-navegacao" href="#barra-psocial" accesskey="2">
15 Ir para o menu 15 Ir para o menu
16 <span>2</span> 16 <span>2</span>
17 </a> 17 </a>
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 </a> 23 </a>
24 </li> 24 </li>
25 <li> 25 <li>
26 - <a id="link-rodape" href="#footer" accesskey="4"> 26 + <a id="link-rodape" href="#theme-footer" accesskey="4">
27 Ir para o rodapé 27 Ir para o rodapé
28 <span>4</span> 28 <span>4</span>
29 </a> 29 </a>
@@ -16,11 +16,15 @@ body { @@ -16,11 +16,15 @@ body {
16 margin: 0px; 16 margin: 0px;
17 } 17 }
18 18
  19 +#theme-header {
  20 + font-size: 12px;
  21 +}
  22 +
19 #wrap-2 { 23 #wrap-2 {
20 max-width: 960px; 24 max-width: 960px;
21 margin: auto; 25 margin: auto;
22 border: 0px; 26 border: 0px;
23 - margin-top: 223px; 27 + margin-top: 160px;
24 } 28 }
25 29
26 #main-content-wrapper-1, 30 #main-content-wrapper-1,
@@ -35,9 +39,18 @@ body { @@ -35,9 +39,18 @@ body {
35 background: none; 39 background: none;
36 } 40 }
37 41
  42 +/* Overwriting Brasil gov style */
  43 +#portal-siteactions {
  44 + padding-bottom: 5px;
  45 + margin-top: -10px;
  46 +}
  47 +
38 /* Bar Psocial Style */ 48 /* Bar Psocial Style */
39 49
40 -#user { top: -30px; } 50 +#user {
  51 + top: -30px;
  52 + font-size: 12px;
  53 +}
41 54
42 #user form { 55 #user form {
43 display:none; 56 display:none;
@@ -355,22 +368,6 @@ div#article-parent { @@ -355,22 +368,6 @@ div#article-parent {
355 368
356 /* Blocks main style */ 369 /* Blocks main style */
357 370
358 -.action-home-index #content .box-1 .block {  
359 - width: 48%;  
360 - float: left;  
361 - margin-right: 10px;  
362 -}  
363 -  
364 -.action-home-index #content .box-1 .block.raw-html-block {  
365 - width: 100%;  
366 - background-image: url(images/bg-palacio-do-planalto.jpg);  
367 -}  
368 -  
369 -.action-home-index #content .box-1 .block.track-list-block {  
370 - width: 100%;  
371 - background-image: url(images/bg-pessoas.jpg);  
372 -}  
373 -  
374 .action-home-index #content .box-1 .block-title { 371 .action-home-index #content .box-1 .block-title {
375 padding: 0.6em 1.5em; 372 padding: 0.6em 1.5em;
376 color: #444; 373 color: #444;
@@ -454,16 +451,6 @@ div#article-parent { @@ -454,16 +451,6 @@ div#article-parent {
454 451
455 /* Block Display Content style */ 452 /* Block Display Content style */
456 453
457 -.action-home-index #content .box-1 .display-content-block {  
458 - width: 300px;  
459 -}  
460 -  
461 -#content .box-1 .statistics-block li,  
462 -#content .box-1 .display-content-block li {  
463 - list-style: none;  
464 - margin: 0px;  
465 -}  
466 -  
467 .box-1 .display-content-block { 454 .box-1 .display-content-block {
468 font-size: 14px; 455 font-size: 14px;
469 } 456 }
@@ -571,12 +558,6 @@ div#article-parent { @@ -571,12 +558,6 @@ div#article-parent {
571 margin-left: 15px; 558 margin-left: 15px;
572 } 559 }
573 560
574 -.action-home-index #content .box-1 .communities-block,  
575 -.action-home-index #content .box-1 .people-block {  
576 - background-image: url(images/bg-linhas-cinza.png);  
577 - margin-right: 0px;  
578 -}  
579 -  
580 .action-home-index #content .communities-block .block-title, 561 .action-home-index #content .communities-block .block-title,
581 .action-home-index #content .people-block .block-title { 562 .action-home-index #content .people-block .block-title {
582 display: none; 563 display: none;
@@ -769,19 +750,15 @@ div#article-parent { @@ -769,19 +750,15 @@ div#article-parent {
769 /* padrao da barra verde - estatistica */ 750 /* padrao da barra verde - estatistica */
770 .action-home-index #content .box-1 .statistics-block { 751 .action-home-index #content .box-1 .statistics-block {
771 width: 100%; 752 width: 100%;
  753 + display: inline-block;
  754 + margin: 0px;
  755 + padding: 28px 0px 15px 0px;
772 } 756 }
773 757
774 .action-home-index .statistics-block .block-title { 758 .action-home-index .statistics-block .block-title {
775 display: none; 759 display: none;
776 } 760 }
777 761
778 -.action-home-index .statistics-block-data{  
779 - background:#0c763e;  
780 - width:960px;  
781 - float:left;  
782 - padding:10px 0 25px 0;  
783 -}  
784 -  
785 .action-home-index .statistics-block-data ul{ 762 .action-home-index .statistics-block-data ul{
786 list-style:none; 763 list-style:none;
787 } 764 }
@@ -811,3 +788,83 @@ div#article-parent { @@ -811,3 +788,83 @@ div#article-parent {
811 #header input.searchButton { 788 #header input.searchButton {
812 background-image: url(images/search-button.gif); 789 background-image: url(images/search-button.gif);
813 } 790 }
  791 +
  792 +/* HOME */
  793 +
  794 +.action-home-index #wrap-2 {
  795 + max-width: none;
  796 + padding: 0px;
  797 +}
  798 +
  799 +.action-home-index #boxes {
  800 + margin-top: 0px;
  801 +}
  802 +
  803 +.action-home-index #content {
  804 + margin: 0px;
  805 +}
  806 +
  807 +.action-home-index .home-blocks-inner {
  808 + max-width: 960px;
  809 + margin: auto;
  810 +}
  811 +
  812 +.action-home-index #content-blocks {
  813 + margin-top: 30px;
  814 + clear: both;
  815 +}
  816 +
  817 +.action-home-index #content-blocks .home-blocks-inner {
  818 + text-align: center;
  819 +}
  820 +
  821 +.action-home-index #content .box-1 .display-content-block {
  822 + width: 300px;
  823 + display: inline-block;
  824 + text-align: left;
  825 +}
  826 +
  827 +.action-home-index #content #content-blocks-inner {
  828 + max-width: 960px;
  829 +}
  830 +
  831 +#content .box-1 #content .statistics-block li,
  832 +#content .box-1 #content .display-content-block li {
  833 + list-style: none;
  834 + margin: 0px;
  835 +}
  836 +
  837 +.action-home-index #content .communities-block,
  838 +.action-home-index #content .people-block {
  839 + display: inline-block;
  840 + width: 50%;
  841 + vertical-align: top;
  842 + margin-top: 30px;
  843 +}
  844 +
  845 +.action-home-index #content .box-1 .block {
  846 + margin-right: 0px;
  847 +}
  848 +
  849 +.action-home-index #statistics-blocks {
  850 + background:#0c763e;
  851 +}
  852 +
  853 +.action-home-index .statistics-block {
  854 + padding:10px 0 25px 0;
  855 +}
  856 +
  857 +.action-home-index #circles-blocks {
  858 + width: 100%;
  859 + background: url(images/bg-palacio-do-planalto.jpg);
  860 + padding-top: 20px;
  861 +}
  862 +
  863 +.action-home-index #block.track-list-blocks {
  864 + width: 100%;
  865 + background: url(images/bg-pessoas.jpg);
  866 +}
  867 +
  868 +.action-home-index #profile-blocks {
  869 + background: url(images/bg-linhas-cinza.png);
  870 +}
@@ -4,6 +4,44 @@ @@ -4,6 +4,44 @@
4 // field size and html escape 4 // field size and html escape
5 var tags_block = $('.action-home-index .tags-block'); 5 var tags_block = $('.action-home-index .tags-block');
6 var footer = $('#theme-footer'); 6 var footer = $('#theme-footer');
  7 + var blocks_area = $('#box-1 .blocks');
  8 +
  9 + circles_blocks_div = $('<div>',{ id : 'circles-blocks'});
  10 + circles_blocks_div_inner = $('<div>',{ class : 'home-blocks-inner'});
  11 + circles_blocks_div.prepend(circles_blocks_div_inner);
  12 + circles_blocks_div_inner.prepend($('.action-home-index #box-1 .raw-html-block'));
  13 +
  14 + highlight_article_blocks_div = $('<div>',{ id : 'highlight-article-blocks'});
  15 + highlight_article_blocks_div_inner = $('<div>',{ class : 'home-blocks-inner'});
  16 + highlight_article_blocks_div.prepend(highlight_article_blocks_div_inner);
  17 + highlight_article_blocks_div_inner.prepend($('.action-home-index #box-1 .article-block'));
  18 +
  19 +
  20 + statistics_blocks_div = $('<div>',{ id : 'statistics-blocks'});
  21 + statistics_blocks_div_inner = $('<div>',{ class : 'home-blocks-inner'});
  22 + statistics_blocks_div.prepend(statistics_blocks_div_inner);
  23 + statistics_blocks_div_inner.prepend($('.action-home-index #box-1 .statistics-block'));
  24 +
  25 + var display_content_blocks = $('.action-home-index #box-1 .display-content-block');
  26 + content_blocks_div = $('<div>',{ id : 'content-blocks'});
  27 + content_blocks_div_inner = $('<div>',{ class : 'home-blocks-inner'});
  28 + content_blocks_div.prepend(content_blocks_div_inner);
  29 + display_content_blocks.each(function() {
  30 + var element = $(this);
  31 + content_blocks_div_inner.prepend(element);
  32 + });
  33 +
  34 + profile_blocks_div = $('<div>',{ id : 'profile-blocks'});
  35 + profile_blocks_div_inner = $('<div>',{ class : 'home-blocks-inner'});
  36 + profile_blocks_div.prepend(profile_blocks_div_inner);
  37 + profile_blocks_div_inner.prepend($('.action-home-index #box-1 .communities-block'));
  38 + profile_blocks_div_inner.prepend($('.action-home-index #box-1 .people-block'));
  39 +
  40 + blocks_area.prepend(profile_blocks_div);
  41 + blocks_area.prepend(content_blocks_div);
  42 + blocks_area.prepend(statistics_blocks_div);
  43 + blocks_area.prepend(highlight_article_blocks_div);
  44 + blocks_area.prepend(circles_blocks_div);
7 45
8 footer.prepend(tags_block); 46 footer.prepend(tags_block);
9 })(jQuery); 47 })(jQuery);