Commit 08cda2511ba9a85f7c5037fc40ff8cce76640f3f

Authored by Tomáz Martins
2 parents dde6aa9e a1172355
Exists in news_page_css

Adjusting files after merge

@@ -687,15 +687,31 @@ body #content .main-block h1 { @@ -687,15 +687,31 @@ body #content .main-block h1 {
687 } 687 }
688 688
689 body #content .main-block form .button-bar input, 689 body #content .main-block form .button-bar input,
690 -body #content .main-block form .button-bar a.button{ 690 +body #content .main-block form .button-bar a.button,
  691 +body #content .main-content form .button-bar input,
  692 +body #content .main-content form .button-bar a.button {
691 background-image: none; 693 background-image: none;
692 border: 0; 694 border: 0;
693 margin-right: 10px; 695 margin-right: 10px;
694 display: inline-block; 696 display: inline-block;
695 - width: 100px; 697 + min-width: 100px;
  698 + padding-right: 5px;
  699 + padding-left: 5px;
696 text-align: center; 700 text-align: center;
697 } 701 }
698 702
  703 +body #content .main-block form .icon-add,
  704 +body #content .main-content form .icon-add {
  705 + background-image: none;
  706 + border: 0;
  707 + padding: 0 10px 0 20px;
  708 + display: inline-block;
  709 + text-align: center;
  710 + color: #fff;
  711 + position: relative;
  712 +}
  713 +
  714 +<<<<<<< HEAD
699 body #content .main-block form .icon-add{ 715 body #content .main-block form .icon-add{
700 background-image: none; 716 background-image: none;
701 border: 0; 717 border: 0;
@@ -706,7 +722,9 @@ body #content .main-block form .icon-add{ @@ -706,7 +722,9 @@ body #content .main-block form .icon-add{
706 position: relative; 722 position: relative;
707 } 723 }
708 724
709 -body #content .main-block form .icon-add:before { 725 +
  726 +body #content .main-block form .icon-add:before,
  727 +body #content .main-content form .icon-add:before {
710 left: 6px; 728 left: 6px;
711 vertical-align: middle; 729 vertical-align: middle;
712 font-size: 12px; 730 font-size: 12px;
@@ -717,6 +735,10 @@ body #content .main-block form .icon-add:before { @@ -717,6 +735,10 @@ body #content .main-block form .icon-add:before {
717 text-align: center; 735 text-align: center;
718 } 736 }
719 737
  738 +body #content form .button-bar .icon-delete {
  739 + float: none;
  740 +}
  741 +
720 .dynamic-table{ 742 .dynamic-table{
721 border: none; 743 border: none;
722 font-family: 'Open Sans', Arial, Helvetica, sans-serif; 744 font-family: 'Open Sans', Arial, Helvetica, sans-serif;
@@ -787,12 +809,13 @@ body #content .main-block form .icon-add:before { @@ -787,12 +809,13 @@ body #content .main-block form .icon-add:before {
787 padding: 5px 5px 5px 5px; 809 padding: 5px 5px 5px 5px;
788 } 810 }
789 811
790 -  
791 -body #content .main-block form .button-bar .icon-back { 812 +body #content .main-block form .button-bar .icon-back,
  813 +body #content .main-content form .button-bar .icon-back {
792 width: 150px !important; 814 width: 150px !important;
793 } 815 }
794 816
795 -#content .main-block form .button-bar input { 817 +#content .main-block form .button-bar input,
  818 +#content .main-content form .button-bar input {
796 padding: 2px 0; 819 padding: 2px 0;
797 color: #FFF; 820 color: #FFF;
798 font-size: 15px; 821 font-size: 15px;
@@ -804,7 +827,8 @@ body #content .main-block form .button-bar input:hover { @@ -804,7 +827,8 @@ body #content .main-block form .button-bar input:hover {
804 background: #5E82C6; 827 background: #5E82C6;
805 } 828 }
806 829
807 -body #content .main-block form .button-bar a.button { 830 +body #content .main-block form .button-bar a.button,
  831 +body #content .main-content form .button-bar a.button {
808 padding: 1px 0 0 0; 832 padding: 1px 0 0 0;
809 height: 0; 833 height: 0;
810 line-height: auto; 834 line-height: auto;
@@ -814,13 +838,15 @@ body #content .main-block form .button-bar a.button { @@ -814,13 +838,15 @@ body #content .main-block form .button-bar a.button {
814 height: 29px; 838 height: 29px;
815 } 839 }
816 840
817 -body #content .main-block form .button-bar a.button:hover { 841 +body #content .main-block form .button-bar a.button:hover,
  842 +body #content .main-content form .button-bar a.button:hover {
818 background: none; 843 background: none;
819 border-color: #5E82C6; 844 border-color: #5E82C6;
820 color: #5E82C6; 845 color: #5E82C6;
821 } 846 }
822 847
823 -body #content .main-block #delete-profile a { 848 +body #content .main-block #delete-profile a,
  849 +body #content .main-content #delete-profile a {
824 border-color: #C0392B; 850 border-color: #C0392B;
825 color: #C0392B; 851 color: #C0392B;
826 } 852 }
@@ -989,4 +1015,4 @@ body #content .main-block form .icon-add:before { @@ -989,4 +1015,4 @@ body #content .main-block form .icon-add:before {
989 1015
990 #category-ajax-selector .label { 1016 #category-ajax-selector .label {
991 font-size: 14px; 1017 font-size: 14px;
992 -}e  
993 \ No newline at end of file 1018 \ No newline at end of file
  1019 +}
994 \ No newline at end of file 1020 \ No newline at end of file
html-cms/sitemap.html 0 → 100644
@@ -0,0 +1,81 @@ @@ -0,0 +1,81 @@
  1 +<div id="sitemap">
  2 +<div id="first-half">
  3 +<ul>
  4 +<a href="https://portal.softwarepublico.gov.br">Home</a>
  5 +</ul>
  6 +<ul>
  7 +<a href="https://portal.softwarepublico.gov.br/social/search/communities">Comunidades</a>
  8 +</ul>
  9 +<ul>
  10 +<a href="https://portal.softwarepublico.gov.br/social/search/software_infos">Catálogo de Software</a>
  11 +</ul>
  12 +<ul>
  13 +<a href="https://portal.softwarepublico.gov.br/social/spb">SPB</a>
  14 +<li>
  15 +<a href="https://portal.softwarepublico.gov.br/social/spb/o-que-e-o-software-publico">Entenda</a>
  16 +</li>
  17 +<li>
  18 +<a href="https://portal.softwarepublico.gov.br/social/spb/inicie-um-projeto">Inicie um projeto</a>
  19 +</li>
  20 +<li>
  21 +<a href="https://portal.softwarepublico.gov.br/social/spb/publique-seu-software">Publique seu software</a>
  22 +</li>
  23 +<li>
  24 +<a href="https://portal.softwarepublico.gov.br/social/spb/sobre-o-portal">Sobre</a>
  25 +</li>
  26 +<li>
  27 +<a href="https://portal.softwarepublico.gov.br/social/spb/noticias">Notícias</a>
  28 +</li>
  29 +<li>
  30 +<a href="https://portal.softwarepublico.gov.br/social/spb/contato">Contato</a>
  31 +</li>
  32 +</ul>
  33 +<ul>
  34 +<a href="https://portal.softwarepublico.gov.br/gitlab">Code</a>
  35 +<li>
  36 +<a href="https://portal.softwarepublico.gov.br/gitlab/public/projects">Public Projects</a>
  37 +</li>
  38 +<li>
  39 +<a href="https://portal.softwarepublico.gov.br/gitlab/profile">Profile</a>
  40 +</li>
  41 +<li>
  42 +<a href="https://portal.softwarepublico.gov.br/gitlab/projects/new">New Project</a>
  43 +</li>
  44 +<li>
  45 +<a href="https://portal.softwarepublico.gov.br/gitlab/dashboard/projects">Projects</a>
  46 +</li>
  47 +<li>
  48 +<a href="https://portal.softwarepublico.gov.br/gitlab/profile/groups">Group</a>
  49 +</li>
  50 +<li>
  51 +<a href="https://portal.softwarepublico.gov.br/gitlab/dashboard/issues">Issues</a>
  52 +</li>
  53 +<li>
  54 +<a href="https://portal.softwarepublico.gov.br/gitlab/dashboard/merge_requests">Merge Requests</a>
  55 +</li>
  56 +</ul>
  57 +</div>
  58 +<div id="second-half">
  59 +<ul>
  60 +<a href="https://portal.softwarepublico.gov.br/archives/thread/">Groups</a>
  61 +</ul>
  62 +<ul>
  63 +<a href="https://portal.softwarepublico.gov.br/social/search">Social</a>
  64 +<li>
  65 +<a href="https://portal.softwarepublico.gov.br/social/search/people">Users</a>
  66 +</li>
  67 +<li>
  68 +<a href="https://portal.softwarepublico.gov.br/social/search/communities">Communities</a>
  69 +</li>
  70 +</ul>
  71 +<ul>
  72 +<a href="https://portal.softwarepublico.gov.br/social/search">Ajuda</a>
  73 +</ul>
  74 +<ul>
  75 +<a href="https://portal.softwarepublico.gov.br/social/search">Paste</a>
  76 +</ul>
  77 +<ul>
  78 +<a href="https://portal.softwarepublico.gov.br/social/search">Versão Anterior</a>
  79 +</ul>
  80 +</div>
  81 +</div>
0 \ No newline at end of file 82 \ No newline at end of file
images/bottom-arrow.png 0 → 100644

265 Bytes

images/top-arrow.png 0 → 100644

850 Bytes

news.css 0 → 100644
@@ -0,0 +1,133 @@ @@ -0,0 +1,133 @@
  1 +.action-content_viewer-view_page #content .main-block #article p {
  2 + text-align: justify;
  3 + max-height: 65px;
  4 + text-overflow: ellipsis;
  5 + overflow: hidden;
  6 +}
  7 +
  8 +/******************** New layout of blog. ********************/
  9 +
  10 +/***** Default behavior to blog posts *****/
  11 +
  12 +.action-content_viewer-view_page .blog-post .author {
  13 + display: none;
  14 +}
  15 +
  16 +.action-content_viewer-view_page.blog-post h1.title {
  17 + padding-left: 25px;
  18 + margin-bottom: 0px;
  19 +}
  20 +
  21 +.action-content_viewer-view_page .blog-post .title a {
  22 + font-size: 16px;
  23 + font-family: arial;
  24 +}
  25 +
  26 +.action-content_viewer-view_page .blog-post .post-pic {
  27 + border-radius: 8px;
  28 + width: 150px;
  29 + height: 100px;
  30 + float: left;
  31 + margin-right: 10px;
  32 + margin-bottom: 5px;
  33 + background-size: 100% 100%;
  34 +}
  35 +
  36 +.action-content_viewer-view_page .blog-post .short-post {
  37 + text-align: justify;
  38 + max-height: 25px;
  39 + text-overflow: ellipsis;
  40 + overflow: hidden;
  41 +}
  42 +
  43 +.action-content_viewer-view_page .blog-post .short-post p {
  44 + margin-bottom: -5px;
  45 +}
  46 +
  47 +/***** Behavior to special posts *****/
  48 +
  49 +/* Featured post */
  50 +
  51 +.action-content_viewer-view_page .page-1 .position-1 .post-pic {
  52 + width: 100%;
  53 + height: 315px;
  54 + max-height: 315px;
  55 +}
  56 +
  57 +.action-content_viewer-view_page .page-1 .position-1 .title a {
  58 + font-size: 32px;
  59 +}
  60 +
  61 +/* Secondary posts */
  62 +
  63 +.action-content_viewer-view_page .page-1 .position-2 .short-post,
  64 +.action-content_viewer-view_page .page-1 .position-3 .short-post,
  65 +.action-content_viewer-view_page .page-1 .position-4 .short-post {
  66 + text-align: justify;
  67 + max-height: 45px;
  68 + text-overflow: ellipsis;
  69 + overflow: hidden;
  70 +}
  71 +
  72 +.action-content_viewer-view_page .page-1 .position-2 .post-pic,
  73 +.action-content_viewer-view_page .page-1 .position-3 .post-pic,
  74 +.action-content_viewer-view_page .page-1 .position-4 .post-pic {
  75 + width: 100%;
  76 + top: 10px;
  77 + margin-top: 5px;
  78 +}
  79 +
  80 +.action-content_viewer-view_page .page-1 .position-2 {
  81 + display: table-cell;
  82 + width: 222px;
  83 + padding-left: 0px;
  84 + padding-right: 20px;
  85 +}
  86 +
  87 +.action-content_viewer-view_page .page-1 .position-3 {
  88 + display: table-cell;
  89 + width: 232px;
  90 + padding-left: 10px;
  91 + padding-right: 10px;
  92 +}
  93 +
  94 +.action-content_viewer-view_page .page-1 .position-4 {
  95 + display: table-cell;
  96 + width: 222px;
  97 + padding-left: 20px;
  98 + padding-right: 0px;
  99 +}
  100 +
  101 +.action-content_viewer-view_page #content .blog-post {
  102 + background: none;
  103 + border-bottom: 1px solid #ccc;
  104 + padding-top: 25px;
  105 +}
  106 +
  107 +.action-content_viewer-view_page #content .blog-post h1.title {
  108 + padding-top: 0 !important;
  109 + border-top: none !important;
  110 + margin-top: 0px !important;
  111 + margin-bottom: 0px !important;
  112 +}
  113 +
  114 +.action-content_viewer-view_page #content .main-block #article p {
  115 + max-height: 65px;
  116 + text-overflow: ellipsis;
  117 + overflow: hidden;
  118 +}
  119 +
  120 +.action-content_viewer-view_page #content .publishing-info {
  121 + display: inline;
  122 +}
  123 +
  124 +.action-content_viewer-view_page #content .blog-post .publishing-info {
  125 + border-top: none;
  126 + padding-top: 0px;
  127 + margin-top: 0px;
  128 + font-size: 12px;
  129 + color: #172838;
  130 + font-family: arial;
  131 + margin-bottom: 0px;
  132 +}
  133 +
page-catalog-software.css
1 /*controller-search action-search-software_infos template-default webkit*/ 1 /*controller-search action-search-software_infos template-default webkit*/
2 2
  3 +.action-search-software_infos br {
  4 + display:none;
  5 +}
  6 +
  7 +.action-search-software_infos .org {
  8 + display:none !important;
  9 +}
  10 +
3 #catalog-filter{ 11 #catalog-filter{
4 display: none; 12 display: none;
5 } 13 }
6 14
7 -.action-search-software_infos #content #main-content-wrapper-8 h1{  
8 - border-top: 4px solid #3E67B1 !important;  
9 - color: #2B65cd !important; 15 +.action-search-software_infos .main-content {
  16 + border: none;
  17 + box-shadow: none;
  18 +}
  19 +.action-search-software_infos input[type="checkbox"]{
  20 + vertical-align:sub;
  21 +}
  22 +
  23 +.action-search-software_infos #content {
  24 + padding:0px !important;
  25 + margin-top: 10px;
  26 +}
  27 +
  28 +.action-search-software_infos #content .main-content h2{
10 text-transform: uppercase; 29 text-transform: uppercase;
11 - font-size: 16px !important;  
12 - padding: 15px 0px 10px 15px;  
13 - border-bottom:none !important;  
14 - background-color:#eee;  
15 - /*padding-left: 0.8em !important;*/  
16 - /*margin-left: 0px;*/ 30 + font-family: "open_sansregular",Arial, Helvetica,sans-serif;
  31 + color: #ff0066;
  32 + font-size:16px;
17 } 33 }
18 34
19 -.action-search-software_infos #main-content-wrapper-8 .search-form{  
20 - margin-top:-10px; 35 +.action-search-software_infos #content .main-content h1{
  36 + padding:5px 0 10px 0;
  37 + font-family:Arial, Helvetica, sans-serif;
  38 + font-size: 35px !important;
  39 + font-variant: normal;
  40 +}
  41 +
  42 +.action-search-software_infos .search-form {
21 background-color: #eee; /*#f1f1f1;*/ 43 background-color: #eee; /*#f1f1f1;*/
22 } 44 }
23 45
24 .search-form{ 46 .search-form{
25 background: #ecedf1; 47 background: #ecedf1;
26 border-radius: 4px; 48 border-radius: 4px;
  49 + border:1px solid #d7d7d7;
  50 + padding: 0;
  51 + margin-top:28px;
  52 +}
  53 +
  54 +.action-search-software_infos #software-search-container .search-form h3{
  55 + padding:16px 0 10px 14px;
  56 + font-family:"open_sansregular", Arial, Helvetica, sans-serif;
  57 + margin:0;
  58 + font-weight:bold;
  59 + font-size: 15px;
  60 +}
  61 +
  62 +.search-form #search-subheader{
  63 + padding-left: 14px;
  64 +}
  65 +
  66 +.search-form #search-header #search-filters{
  67 + float: left !important;
  68 + padding-left: 14px;
  69 +}
  70 +
  71 +.search-form{
  72 + background: #ecedf1;
  73 + border-radius: 4px;
27 } 74 }
28 75
29 .search-form #search-subheader{ 76 .search-form #search-subheader{
@@ -43,10 +90,13 @@ @@ -43,10 +90,13 @@
43 } 90 }
44 91
45 #search-input { 92 #search-input {
  93 + width:95% !important;
46 font-size:110%; 94 font-size:110%;
47 - margin: 0px 0px 15px 15px; 95 + margin: 4px 0px 0px 13px;
48 border-radius: 4px; 96 border-radius: 4px;
49 - padding: 0.55em; 97 + padding: 6px;
  98 + font-size: 14px;
  99 + border: 1px solid #d7d7d7;
50 } 100 }
51 101
52 #search-input.blur { 102 #search-input.blur {
@@ -58,20 +108,14 @@ @@ -58,20 +108,14 @@
58 padding:0.55em; 108 padding:0.55em;
59 } 109 }
60 110
61 -.controller-search .search-field .formfield {  
62 - width: 80%;  
63 -}  
64 -  
65 .controller-search #content form input.button.submit { 111 .controller-search #content form input.button.submit {
66 height: 30px; 112 height: 30px;
67 max-height: 30px; 113 max-height: 30px;
68 - width: 104px;  
69 - margin-bottom: 22px;  
70 - margin-left: 32px; 114 + width: auto;
  115 + padding: 0 14px 0 14px;
  116 + margin: 14px;
71 text-transform: uppercase; 117 text-transform: uppercase;
72 - font-weight: bold;  
73 - /*border: 1px solid #4562b1;*/  
74 - /*padding:0px;*/ 118 + font-family:"open_sansbold",Arial,sans-serif;
75 color:#ffffff; 119 color:#ffffff;
76 background-color:#4562b1; 120 background-color:#4562b1;
77 } 121 }
@@ -81,8 +125,8 @@ @@ -81,8 +125,8 @@
81 color:#172738; 125 color:#172738;
82 font-size:20px; 126 font-size:20px;
83 padding:5px; 127 padding:5px;
84 -  
85 } 128 }
  129 +
86 .action-search-software_infos #content input.button{ 130 .action-search-software_infos #content input.button{
87 background-color:#2B65cd; 131 background-color:#2B65cd;
88 border: 1px solid #2B65cd; 132 border: 1px solid #2B65cd;
@@ -92,24 +136,128 @@ @@ -92,24 +136,128 @@
92 padding:0px; 136 padding:0px;
93 } 137 }
94 138
95 -.action-search-software_infos .icon-search{  
96 - background-image:none !important; 139 +.action-search-software_infos #filter-option-catalog-software:hover {
  140 + background-color: #c7c7c7;
  141 +}
  142 +
  143 +.action-search-software_infos #filter-option-catalog-software {
  144 + border:none;
  145 + font-size: 11px;
  146 + padding: 14px;
  147 + background-color: #d7d7d7;
  148 +}
  149 +
  150 +.action-search-software_infos #filter-option-catalog-software:after {
  151 + margin-left:5px;
  152 + background:url("/designs/themes/noosfero-spb-theme/images/bottom-arrow.png") no-repeat center;
  153 + background-color:#4562b1;
  154 + padding: 3px 10.5px;
  155 + border-radius: 4px;
  156 + content: "";
  157 +}
  158 +
  159 +.action-search-software_infos #cleanup-filter-catalg {
  160 + background-color:#4562b1;
  161 + font-size: 14px;
  162 + font-family:Arial;
  163 + cursor:pointer;
  164 +}
  165 +
  166 +.action-search-software_infos #close-filter-catalog {
  167 + cursor:pointer;
  168 +}
  169 +
  170 +.action-search-software_infos #close-filter-catalog:after {
  171 + margin-left:5px;
  172 + background:url("/designs/themes/noosfero-spb-theme/images/top-arrow.png") no-repeat center;
  173 + background-color:#4562b1;
  174 + padding: 2.5px 10.5px;
  175 + border-radius: 4px;
  176 + content: "";
  177 +}
  178 +
  179 +.action-search-software_infos #catalog-display-options {
  180 + font-size:14px;
  181 + font-family:Arial;
  182 +}
  183 +
  184 +.action-search-software_infos #catalog-display-options #catalog-display-options-count{
  185 + padding: 45px 0 4px 0;
  186 +}
  187 +
  188 +.action-search-software_infos #catalog-display-options #catalog-display-options-show-and-sort{
  189 + padding: 38px 0 5px 0;
  190 + font-weight:bold;
  191 +}
  192 +
  193 +.action-search-software_infos #filter-catalog-software {
  194 + background-color: #d7d7d7;
  195 +}
  196 +
  197 +.action-search-software_infos #filter-catalog-software #filter-categories-option {
  198 + border:none;
  199 +}
  200 +
  201 +.action-search-software_infos #group-categories #group-catalog-01 {
  202 + float: left;
  203 + width: 50%;
  204 +}
  205 +
  206 +.action-search-software_infos #filter-catalog-software #filter-categories-catalog h4 {
  207 + color: black;
  208 + margin: 5px 0 10px 5px;
  209 + background: transparent;
  210 +}
  211 +
  212 +.project-software{
  213 + font-weight:bold;
  214 + font-size:15px;
  215 + font-family:Arial;
  216 + margin: 0 0 30px;
  217 + border-top: 1px dotted;
  218 + border-bottom: 1px dotted;
  219 +}
  220 +
  221 +.action-search-software_infos #group-categories label {
  222 + font-family:Arial;
  223 + font-size: 14px;
  224 +}
  225 +.action-search-software_infos #group-categories label span {
  226 + font-family:Arial;
  227 + font-size: 14px;
  228 +}
97 229
  230 +.action-search-software_infos #group-categories br {
  231 + display:inline;
  232 +}
  233 +
  234 +.project-software span{
  235 + margin-left: 5px;
  236 + color:transparent;
  237 +}
  238 +.project-software span:before {
  239 + content:"?";
  240 + border-radius: 50%;
  241 + font-size: 16px;
  242 + padding: 2px 6px;
  243 + background:#fff;
  244 + color: #3867b7;
  245 +}
  246 +
  247 +.action-search-software_infos #search-results {
  248 + border-top: 1px solid #d7d7d7;
98 } 249 }
99 -/*  
100 -.search-enterprise-item {  
101 - border-bottom: 1px solid #eee;  
102 -}*/  
103 250
104 .controller-search .action-search-software_infos .search-field .formfield { 251 .controller-search .action-search-software_infos .search-field .formfield {
105 - width: 80%; 252 + width: 100%;
  253 + margin: 0;
  254 + padding: 0;
106 } 255 }
107 256
108 -.action-search-software_infos .only-one-result-box .search-enterprise-item {  
109 - padding-top:35px !important;  
110 - padding-bottom: 35px !important; 257 +.action-search-software_infos .only-one-result-box .search-software-item {
  258 + padding: 29px 0 31px 0 !important;
111 background: #ffffff; 259 background: #ffffff;
112 - /*padding: 50px 0 !important;*/ 260 + border-bottom: 1px solid #d7d7d7;
113 } 261 }
114 262
115 .action-search-software_infos .search-results-innerbox { 263 .action-search-software_infos .search-results-innerbox {
@@ -130,30 +278,22 @@ @@ -130,30 +278,22 @@
130 float:left; 278 float:left;
131 } 279 }
132 280
133 -/*  
134 -.common-profile-list-block .profile-image {  
135 - padding:0px 200px;  
136 -}  
137 -*/  
138 -  
139 -.action-search-software_infos .search-enterprise-item-column-left{  
140 - border-right: 1px solid #ccc;  
141 - width: 143px; 281 +.action-search-software_infos .search-software-item-column-left{
  282 + border-right: 1px dotted #ccc;
  283 + width: 130px;
142 height: 130px; 284 height: 130px;
143 - /*padding: 0px 60px 0px 10px; /*50 no lugar coloquei 70*/  
144 - /*margin:none;*/  
145 - /*position:absolute;*/ 285 + float: left;
146 } 286 }
147 287
148 -.action-search-software_infos .search-enterprise-item-column-right{ 288 +.action-search-software_infos .search-software-item-column-right{
149 width:60%; /*440px;*/ 289 width:60%; /*440px;*/
150 float:left; 290 float:left;
151 margin-left: 130px; 291 margin-left: 130px;
152 - /*text-align: justify;*/  
153 } 292 }
154 293
155 #content .search-results-box .vcard { 294 #content .search-results-box .vcard {
156 display: table; 295 display: table;
  296 + margin: 0;
157 } 297 }
158 298
159 #content .vcard a:hover{ 299 #content .vcard a:hover{
@@ -164,19 +304,10 @@ @@ -164,19 +304,10 @@
164 border: none; 304 border: none;
165 } 305 }
166 306
167 -.action-search-software_infos .org {  
168 - display:none !important;  
169 -}  
170 -  
171 -.action-search-software_infos .search-enterprise-item-column-left .vcard img { 307 +.action-search-software_infos .search-software-item-column-left .vcard img {
172 max-width: 90px; 308 max-width: 90px;
173 height: auto; 309 height: auto;
174 - /*margin-left: 15px;  
175 - margin-right: 15px;*/  
176 - /*max-height: 130px; /*90px;*/  
177 - /*margin-left: 60%; /*30%;90px;  
178 - position: absolute;  
179 - float: left;*/ 310 + margin-left:170px;
180 } 311 }
181 312
182 .action-search-software_infos .common-profile-list-block img{ 313 .action-search-software_infos .common-profile-list-block img{
@@ -184,9 +315,8 @@ @@ -184,9 +315,8 @@
184 } 315 }
185 316
186 .action-search-software_infos .common-profile-list-block .profile-image{ 317 .action-search-software_infos .common-profile-list-block .profile-image{
187 - /*padding:20px 40px;*/  
188 - margin-left: 140px; /*85px; TESTANDO*/  
189 - /*margin-top: 10px;*/ 318 + margin-left: 130px;
  319 + margin-top: 35px;
190 width: 130px; 320 width: 130px;
191 height: 130px; 321 height: 130px;
192 } 322 }
@@ -195,64 +325,57 @@ @@ -195,64 +325,57 @@
195 font-size: 13px; 325 font-size: 13px;
196 font-family: Arial; 326 font-family: Arial;
197 opacity: inherit; 327 opacity: inherit;
198 - width:135px; 328 + width:130px;
199 padding-right:20px; 329 padding-right:20px;
200 text-align: left; 330 text-align: left;
201 position:absolute; 331 position:absolute;
202 top:0px; 332 top:0px;
203 - /* margin-bottom:130px;*/ /*verificar melhor forma de fazer, tamanho da barra laterial*/  
204 - 333 + color: #21376c;
205 } 334 }
206 .action-search-software_infos .common-profile-list-block .extra_info::before{ 335 .action-search-software_infos .common-profile-list-block .extra_info::before{
207 content: url("images/ic-calendar.png"); 336 content: url("images/ic-calendar.png");
208 - line-height: 20px;  
209 margin-right:10px; 337 margin-right:10px;
210 margin-top:6px; 338 margin-top:6px;
211 float: left; 339 float: left;
212 - /*padding-top: 10px;*/  
213 - /* position: static; */  
214 - /* overflow: auto; */  
215 } 340 }
216 341
217 -.action-search-software_infos .search-enterprise-item .search-enterprise-item-column-right { 342 +.action-search-software_infos .search-software-item .search-software-item-column-right {
218 font-size: 15px; 343 font-size: 15px;
219 - padding-top: 0px; 344 + padding: 0 0 0 8px;
220 font-family: Arial; 345 font-family: Arial;
221 } 346 }
222 347
223 -.action-search-software_infos .search-enterprise-item-column-right .search-community-content-block h4 a { 348 +.action-search-software_infos .search-software-item-column-right .search-software-content-block {
  349 +}
  350 +.action-search-software_infos .search-software-item-column-right .search-software-content-block h4 a {
224 color:#172938 !important; 351 color:#172938 !important;
225 font-size:19px !important; 352 font-size:19px !important;
226 } 353 }
227 -.action-search-software_infos .search-enterprise-item-column-right span b{ 354 +.action-search-software_infos .search-software-item-column-right span b{
228 font-weight: normal; 355 font-weight: normal;
  356 + font-size: 13px;
229 } 357 }
230 358
231 -.action-search-software_infos .search-enterprise-item-column-right span b:last-child { 359 +.action-search-software_infos .search-software-item-column-right span b:last-child {
232 float: left; 360 float: left;
233 - margin-right: 10px;  
234 - /*font-size: 13px;*/ /*font deve ser aplicada as categorias*/  
235 -}  
236 -/* Verificar a melhor maneira de fazer  
237 -.action-search-software_infos .search-enterprise-item-column-right span b:nth-last-child(2){  
238 - display: none;  
239 } 361 }
240 362
241 -.action-search-software_infos .search-enterprise-item-column-right span a:nth-last-child(1){  
242 - display: none;  
243 -}*/  
244 -  
245 -.action-search-software_infos .search-community-content-block #categories-list{  
246 - margin-top:35px; 363 +.action-search-software_infos .search-software-content-block #categories-list{
  364 + margin-top:30px;
247 margin-bottom: 10px; 365 margin-bottom: 10px;
248 } 366 }
249 -.action-search-software_infos .search-community-content-block #categories-list li{ 367 +
  368 +.action-search-software_infos .search-software-content-block #categories-list li a{
  369 + color:#2B65cd;
  370 +}
  371 +
  372 +.action-search-software_infos .search-software-content-block #categories-list li{
250 text-decoration: underline; 373 text-decoration: underline;
251 font-size: 13px; 374 font-size: 13px;
252 color:#2B65cd; 375 color:#2B65cd;
253 - display:block !important;  
254 float:left; 376 float:left;
255 - margin-right: 10px !important; 377 + line-height:18px;
  378 + margin-left: 7px !important;
256 width: auto !important; 379 width: auto !important;
257 } 380 }
258 381
pagina-artigos.css
@@ -7,6 +7,8 @@ @@ -7,6 +7,8 @@
7 font-size: 34px !important; 7 font-size: 34px !important;
8 line-height: 37px !important; 8 line-height: 37px !important;
9 margin-bottom: 10px !important; 9 margin-bottom: 10px !important;
  10 + border-bottom: 1px solid #D3D6DE !important;
  11 + padding-bottom: 10px !important;
10 } 12 }
11 13
12 #content .main-block .article-body { 14 #content .main-block .article-body {
@@ -107,8 +109,31 @@ @@ -107,8 +109,31 @@
107 color: #2C66CE; 109 color: #2C66CE;
108 } 110 }
109 111
110 -#content .main-block #article-cat {  
111 - font-size: 21px !important; 112 +#content .main-block #article-cat a{
  113 + float: left;
  114 + font-size: 12px !important;
  115 + margin: 10px 10px 10px 0;
  116 + text-decoration: initial;
  117 +}
  118 +#content .main-block #article-cat h4{
  119 + float: left;
  120 + font-size: 12px !important;
  121 + margin: 13px 10px 10px 0;
  122 + text-decoration: initial;
  123 +}
  124 +
  125 +#content .main-block #article-cat a{
  126 + border: 1px solid #D3D6DE;
  127 + border-radius: 3px;
  128 + padding: 3px 10px;
  129 + color: #3E67B1;
  130 + background-color: #ECEDF1;
  131 +}
  132 +
  133 +#article-tags{
  134 + float: left;
  135 + margin-top: 11px;
  136 + display: none;
112 } 137 }
113 138
114 .page-comment-form { 139 .page-comment-form {
@@ -449,3 +474,51 @@ color: #F91461; @@ -449,3 +474,51 @@ color: #F91461;
449 font-family: Arial; 474 font-family: Arial;
450 line-height: 22px; 475 line-height: 22px;
451 } 476 }
  477 +
  478 +#article-actions:last-child{
  479 + border-top: 4px solid #2C4B6B;
  480 + padding-top: 10px;
  481 +}
  482 +
  483 +#article-header .preview{
  484 + display: none;
  485 +}
  486 +
  487 +#article-header .title{
  488 + border-bottom: 1px solid #D3D6DE !important;
  489 + color: red ;
  490 +}
  491 +
  492 +#article-header .publishing-info span{
  493 + font-size: 12px;
  494 + color: black;
  495 +}
  496 +
  497 +#sitemap{
  498 + overflow: auto;
  499 +}
  500 +
  501 +#sitemap a{
  502 + text-decoration: initial !important;
  503 +}
  504 +
  505 +#sitemap ul{
  506 + padding-top: 20px;
  507 + font-weight: 700;
  508 +}
  509 +
  510 +#sitemap li{
  511 + padding-left: 10px;
  512 + font-weight: 500;
  513 +}
  514 +
  515 +#sitemap #first-half{
  516 + float: left;
  517 + width: 40%;
  518 +}
  519 +
  520 +#sitemap #second-half{
  521 + float: left;
  522 + padding-top: 50px;
  523 + width: 40%;
  524 +}
@@ -43,6 +43,8 @@ @@ -43,6 +43,8 @@
43 /****************** Font awesome ******************/ 43 /****************** Font awesome ******************/
44 @import url(font-awesome.min.css); 44 @import url(font-awesome.min.css);
45 45
  46 +@import url(news.css);
  47 +
46 /* - css/main.css - */ 48 /* - css/main.css - */
47 @media screen { 49 @media screen {
48 /* http://www.secom.gov.br/portal_css/css/main.css?original=1 */ 50 /* http://www.secom.gov.br/portal_css/css/main.css?original=1 */
@@ -1167,18 +1169,16 @@ div#article-parent { @@ -1167,18 +1169,16 @@ div#article-parent {
1167 1169
1168 #article-tags a:link { 1170 #article-tags a:link {
1169 clear: both; 1171 clear: both;
1170 - display: inline-block; 1172 + float: left;
  1173 + display: block;
  1174 + font-size: 12px;
1171 margin-bottom: 1.5em; 1175 margin-bottom: 1.5em;
1172 - color: white;  
1173 - padding: 3px 5px;  
1174 -}  
1175 -  
1176 -#article-tags a:hover {  
1177 - background-color: #000;  
1178 - color: white; 1176 + color: #3E67B1;
  1177 + background-color: #ECEDF1;
  1178 + border: 1px solid #D3D6DE;
  1179 + padding: 3px 10px;
1179 } 1180 }
1180 1181
1181 -  
1182 /* fim Content*/ 1182 /* fim Content*/
1183 1183
1184 /*busca*/ 1184 /*busca*/
@@ -1200,6 +1200,11 @@ div#article-parent { @@ -1200,6 +1200,11 @@ div#article-parent {
1200 1200
1201 #content .pagination a { 1201 #content .pagination a {
1202 text-decoration: none; 1202 text-decoration: none;
  1203 + font-family: "open_sansregular", Arial, Helvetica, sans-serif;
  1204 +}
  1205 +
  1206 +#content .pagination a,
  1207 +#content .pagination em{
1203 padding: 7px 11px 7px 11px; 1208 padding: 7px 11px 7px 11px;
1204 border-radius: 4px; 1209 border-radius: 4px;
1205 margin-right: 4px; 1210 margin-right: 4px;
@@ -1208,16 +1213,17 @@ div#article-parent { @@ -1208,16 +1213,17 @@ div#article-parent {
1208 border: 1px solid #D3D6DE; 1213 border: 1px solid #D3D6DE;
1209 color: #172738; 1214 color: #172738;
1210 font-weight: 700; 1215 font-weight: 700;
  1216 + text-decoration: none;
1211 } 1217 }
1212 1218
1213 .pagination .current { 1219 .pagination .current {
1214 background-color: #ECEDF1; 1220 background-color: #ECEDF1;
1215 - padding: 7px 11px 7px 11px; 1221 + /*padding: 7px 11px 7px 11px;
1216 border-radius: 4px; 1222 border-radius: 4px;
1217 margin-right: 4px; 1223 margin-right: 4px;
1218 font-weight: 700; 1224 font-weight: 700;
1219 font-size: 15px; 1225 font-size: 15px;
1220 - border: 1px solid #D3D6DE; 1226 + border: 1px solid #D3D6DE;*/
1221 font-style: normal; 1227 font-style: normal;
1222 } 1228 }
1223 1229
@@ -1242,16 +1248,16 @@ div#article-parent { @@ -1242,16 +1248,16 @@ div#article-parent {
1242 padding: 7px 11px 7px 30px; 1248 padding: 7px 11px 7px 30px;
1243 } 1249 }
1244 1250
1245 -#content .pagination .next_page.disabled,  
1246 -#content .pagination .previous_page.disabled{  
1247 - opacity: 0.5;  
1248 -}  
1249 -  
1250 #content .pagination .next_page{ 1251 #content .pagination .next_page{
1251 float: right; 1252 float: right;
1252 padding: 7px 30px 7px 11px; 1253 padding: 7px 30px 7px 11px;
1253 } 1254 }
1254 1255
  1256 +#content .pagination .next_page.disabled,
  1257 +#content .pagination .previous_page.disabled{
  1258 + opacity: 0.5;
  1259 +}
  1260 +
1255 #content .pagination .previous_page.disabled::before, 1261 #content .pagination .previous_page.disabled::before,
1256 #content .pagination a.previous_page::before { 1262 #content .pagination a.previous_page::before {
1257 display: none; 1263 display: none;
@@ -2931,20 +2937,16 @@ div.software-step-info div.current-step h3 { @@ -2931,20 +2937,16 @@ div.software-step-info div.current-step h3 {
2931 } 2937 }
2932 2938
2933 #content .blog-post h1.title { 2939 #content .blog-post h1.title {
2934 - padding-top: 0 !important;  
2935 - border-top: none !important;  
2936 - margin-top: 0px !important;  
2937 - margin-bottom: 0px !important; 2940 + margin-top: 0 !important;
2938 } 2941 }
2939 2942
2940 #content .blog-post .publishing-info{ 2943 #content .blog-post .publishing-info{
2941 - /*border-top: 1px solid #D7D7D7;*/  
2942 - padding-top: 0px;  
2943 - margin-top: 0px; 2944 + border-top: 1px solid #D7D7D7;
  2945 + padding-top: 25px;
  2946 + margin-top: 25px;
2944 font-size: 12px; 2947 font-size: 12px;
2945 - color: #172838; 2948 + color: #2C66CE;
2946 font-family: arial; 2949 font-family: arial;
2947 - margin-bottom: 0px;  
2948 } 2950 }
2949 2951
2950 #content .main-block .publishing-info a{ 2952 #content .main-block .publishing-info a{
@@ -2969,9 +2971,6 @@ div.software-step-info div.current-step h3 { @@ -2969,9 +2971,6 @@ div.software-step-info div.current-step h3 {
2969 2971
2970 #content .main-block #article p{ 2972 #content .main-block #article p{
2971 text-align: justify; 2973 text-align: justify;
2972 - max-height: 65px;  
2973 - text-overflow: ellipsis;  
2974 - overflow: hidden;  
2975 } 2974 }
2976 2975
2977 #content .main-block #article .folder-content .item-info { 2976 #content .main-block #article .folder-content .item-info {
@@ -2997,7 +2996,7 @@ div.software-step-info div.current-step h3 { @@ -2997,7 +2996,7 @@ div.software-step-info div.current-step h3 {
2997 font-family: Arial; 2996 font-family: Arial;
2998 font-weight: 700; 2997 font-weight: 700;
2999 color: #172938; 2998 color: #172938;
3000 - letter-spacing: -0.1px; 2999 + /* letter-spacing: -0.1px; */
3001 } 3000 }
3002 3001
3003 #content .main-block #article .folder-content .item-description { 3002 #content .main-block #article .folder-content .item-description {
@@ -3028,95 +3027,126 @@ li.folder-item:first-child { @@ -3028,95 +3027,126 @@ li.folder-item:first-child {
3028 border-top: 1px solid #ccc; 3027 border-top: 1px solid #ccc;
3029 } 3028 }
3030 3029
3031 -/******************** New layout of blog. ********************/ 3030 +/***** Estilização do aviso de campos obrigatórios na página de edição da página de ajuda *****/
3032 3031
3033 -/***** Default behavior to blog posts *****/ 3032 +.text-editor-sidebar {
  3033 + top: 0px;
  3034 + margin-top: 30px;
  3035 + margin-left: 650px;
  3036 + max-height: 45px;
  3037 + overflow: hidden;
  3038 +}
3034 3039
3035 -.blog-post .author {  
3036 - display: none; 3040 +#content .main-content form p .required-field .pseudoformlabel {
  3041 + color: #FF0366;
  3042 + font-weight: 500;
3037 } 3043 }
3038 3044
3039 -.blog-post h1.title {  
3040 - padding-left: 25px;  
3041 - margin-bottom: 0px; 3045 +#content .main-content form p .required-field {
  3046 + max-width: 520px;
  3047 + padding: 15px 20px;
  3048 + margin: 20px 0 30px 0;
  3049 + border: 1px dotted #ccc;
  3050 + border-left: 5px solid #FF0366;
  3051 + border-radius: 3px;
  3052 + display: block;
  3053 + background: #fff;
  3054 + line-height: 20px;
  3055 + font-size: 13px;
3042 } 3056 }
3043 3057
3044 -.blog-post .title a {  
3045 - font-size: 16px;  
3046 - font-family: arial; 3058 +.main-block form {
  3059 + font-family: 'Open Sans', Arial, Helvetica, sans-serif;
  3060 + font-size: 14px;
3047 } 3061 }
3048 3062
3049 -.blog-post .post-pic {  
3050 - border-radius: 8px;  
3051 - width: 150px;  
3052 - height: 100px;  
3053 - float: left;  
3054 - margin-right: 10px; 3063 +#content .main-content form label.formlabel,
  3064 +#content .main-content form .article-translation-field {
  3065 + font-size: 14px;
3055 margin-bottom: 5px; 3066 margin-bottom: 5px;
3056 - background-size: 100% 100%; 3067 + color: #231f20;
3057 } 3068 }
3058 3069
3059 -.blog-post .short-post {  
3060 - text-align: justify;  
3061 - max-height: 25px;  
3062 - text-overflow: ellipsis;  
3063 - overflow: hidden; 3070 +#content .main-content form .article-translation-field {
  3071 + margin-top: 25px;
  3072 + margin-bottom: 15px;
3064 } 3073 }
3065 3074
3066 -.blog-post .short-post p {  
3067 - margin-bottom: -5px; 3075 +#content .main-content form .required-field .formlabel:after {
  3076 + color: #FF0366;
  3077 + font-weight: 500;
3068 } 3078 }
3069 3079
3070 -/***** Behavior to special posts *****/ 3080 +#content .article-translation-field #article_language {
  3081 + margin-top: 10px;
  3082 +}
3071 3083
3072 -/* Featured post */ 3084 +#content #article_image_builder_uploaded_data {
  3085 + text-indent: 2px;
  3086 +}
3073 3087
3074 -.page-1 .position-1 .post-pic {  
3075 - width: 100%;  
3076 - height: 315px;  
3077 - max-height: 315px; 3088 +#content #edit-article-options div div {
  3089 + margin-top: 13px;
  3090 + margin-bottom: 13px;
3078 } 3091 }
3079 3092
3080 -.page-1 .position-1 .title a {  
3081 - font-size: 32px; 3093 +#content .formfield input,
  3094 +#content #edit-article-options .token-input-list li {
  3095 + border: 1px solid #ccc;
  3096 + border-radius: 4px;
  3097 + height: 19px;
  3098 + padding: 6px;
3082 } 3099 }
3083 3100
3084 -/* Secondary posts */ 3101 +#content #edit-article-options .token-input-list {
  3102 + border: none;
  3103 + margin-top: 10px;
  3104 +}
3085 3105
3086 -.page-1 .position-2 .short-post,  
3087 -.page-1 .position-3 .short-post,  
3088 -.page-1 .position-4 .short-post {  
3089 - text-align: justify;  
3090 - max-height: 45px;  
3091 - text-overflow: ellipsis;  
3092 - overflow: hidden; 3106 +#content #edit-article-options .token-input-list li input:first-child {
  3107 + height: 10px;
  3108 + padding-right: 0px;
3093 } 3109 }
3094 3110
3095 -.page-1 .position-2 .post-pic,  
3096 -.page-1 .position-3 .post-pic,  
3097 -.page-1 .position-4 .post-pic {  
3098 - width: 100%;  
3099 - top: 10px;  
3100 - margin-top: 5px; 3111 +#content #content-inner #boxes #fetch-external-feed {
  3112 + padding-left: 20px;
3101 } 3113 }
3102 3114
3103 -.page-1 .position-2 {  
3104 - display: table-cell;  
3105 - width: 222px;  
3106 - padding-left: 0px;  
3107 - padding-right: 20px; 3115 +#content #content-inner #boxes #fetch-external-feed > input {
  3116 + height: 13px;
  3117 + margin: 8px 8px 8px 0px;
  3118 + vertical-align: middle;
  3119 + width: 13px;
3108 } 3120 }
3109 3121
3110 -.page-1 .position-3 {  
3111 - display: table-cell;  
3112 - width: 232px;  
3113 - padding-left: 10px;  
3114 - padding-right: 10px; 3122 +#boxes #fetch-external-feed #external-feed-options #external-feed-options-only-once input {
  3123 + margin-right: 3px;
  3124 + width: 13px;
  3125 + vertical-align: middle;
3115 } 3126 }
3116 3127
3117 -.page-1 .position-4 {  
3118 - display: table-cell;  
3119 - width: 222px;  
3120 - padding-left: 20px;  
3121 - padding-right: 0px; 3128 +#boxes #fetch-external-feed #external-feed-options #external-feed-options-only-once label {
  3129 + margin-right: 250px;
  3130 +}
  3131 +
  3132 +#content #article-formitem #article_slug {
  3133 + width: 20%;
  3134 +}
  3135 +
  3136 +.main-content form small {
  3137 + padding-left: 5px;
  3138 +}
  3139 +
  3140 +input[type=checkbox] {
  3141 + margin-left: 0px;
  3142 +}
  3143 +
  3144 +#content #content-inner a.lead-button {
  3145 + border: 1px solid #CCCCCC;
  3146 + background-image: url(/assets/designs/icons/tango/Tango/16x16/actions/add.png);
  3147 + color: #555;
  3148 +}
  3149 +
  3150 +#content #content-inner a.lead-button:hover {
  3151 + background-color: #fff;
3122 } 3152 }
@@ -134,10 +134,35 @@ $(&#39;#link-buscar&#39;).click(function(e) { @@ -134,10 +134,35 @@ $(&#39;#link-buscar&#39;).click(function(e) {
134 134
135 } 135 }
136 136
  137 + /* Finds all uploaded files from manuals page and sets its names on the right format */
  138 + function set_uploaded_files_names() {
  139 + var article = document.getElementById('article');
  140 + if(article != null){
  141 + var folderList = article.getElementsByClassName('folder-content')[0];
  142 + if(folderList != null){
  143 + var folderItens = folderList.getElementsByClassName('item-description');
  144 + for(var i = 0; i < folderItens.length; i++) {
  145 + split_file_extension(folderItens[i].getElementsByTagName('a')[0]);
  146 + }
  147 + }
  148 + }
  149 + }
  150 +
  151 + /* Splits a file name from its extension. Example: example.pdf becomes example - PDF */
  152 + function split_file_extension(element) {
  153 + var tokens = element.innerHTML.split('.');
  154 + if(tokens.length == 2) {
  155 + var fileName = tokens[0];
  156 + var fileExtension = tokens[1].toUpperCase();
  157 + element.innerHTML = fileName + " - " + fileExtension;
  158 + }
  159 + }
  160 +
137 $(document).ready(function(){ 161 $(document).ready(function(){
138 set_events(); 162 set_events();
139 move_article_buttons(); 163 move_article_buttons();
140 add_link_to_article_div(); 164 add_link_to_article_div();
141 insert_notice_div(); 165 insert_notice_div();
  166 + set_uploaded_files_names();
142 }); 167 });
143 })(jQuery); 168 })(jQuery);