Download as
Browse Code »

Commit a494f1c33c67fec55769c5b08a443568c6a41323

Authored by Pedro de Lyra Pereira
2 parents d0a0ba95 df242613
Exists in master and in 54 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Merge branch 'master' of https://gitlab.com/softwarepublico/noosfero-spb-theme 

Conflicts:
	style.css
Showing 5 changed files with 269 additions and 65 deletions   Show diff stats
cabecalho-cinza-theme.css
  Diff comments   View file @a494f1c
... ... @@ -24,7 +24,7 @@ tr:hover td {
24 24  
25 25 #theme-header{}
26 26  
27   -#header {
  27 +#theme-header #header {
28 28 padding: 15px 0 0 0; /*13px 0 0 0;*/
29 29 color: #000;
30 30 background-color:#f0f2f1; /*rgb(236,237,241);*/
... ... @@ -32,19 +32,19 @@ tr:hover td {
32 32 background-image: -webkit-radial-gradient(center, ellipse cover, #f0f2f1 1%, #ecedf1 100%)
33 33 }
34 34  
35   -#header>div {
  35 +#theme-header #header>div {
36 36 max-width: 960px;
37 37 min-width: 960px;
38 38 margin: 0 auto;
39 39 }
40 40  
41   -.header-content * {
  41 +#theme-header .header-content * {
42 42 margin: 0;
43 43 padding: 0;
44 44 list-style: none;
45 45 vertical-align: baseline;
46 46 }
47   -.header-content li { display: inline; }
  47 +#theme-header .header-content li { display: inline; }
48 48  
49 49 #brasilgov {
50 50 background: #00510f;
... ... @@ -53,7 +53,7 @@ tr:hover td {
53 53 color: #03316f;
54 54 }
55 55  
56   -#accessibility {
  56 +#theme-header #accessibility {
57 57 display: block !important;
58 58 float: left;
59 59 font-family: arial;
... ... @@ -61,15 +61,15 @@ tr:hover td {
61 61 width: 50%;
62 62 }
63 63  
64   -#accessibility a {
  64 +#theme-header #accessibility a {
65 65 /*color:# ;rgb(96,96,96);*//*#FFF; */
66 66 margin-right: 8px;
67 67 }
68   -#accessibility a:hover {
  68 +#theme-header #accessibility a:hover {
69 69 /*color:/*#969696;*/ /*#d0d9ff;*/
70 70 }
71 71  
72   -#accessibility span {
  72 +#theme-header #accessibility span {
73 73 background: none repeat scroll 0 0 #2c66ce; /*rgb(96,96,96);*/
74 74 color: #FFFFFF;
75 75 padding: 0 3px;
... ... @@ -87,28 +87,28 @@ background-repeat: no-repeat;
87 87 }*/
88 88  
89 89 /* logo */
90   -#logo {
  90 +#theme-header #logo {
91 91 padding: 0;
92 92 float: left;
93 93 width: 50%; /*70%;*/
94 94 }
95 95  
96   -#logo span {
  96 +#theme-header #logo span {
97 97 display: block;
98 98 }
99 99  
100   -#logo a {
  100 +#theme-header #logo a {
101 101 display: block;
102 102 width: 100%;
103 103 color: #03316f !important;
104 104 margin: 1em 0px;
105 105 }
106 106  
107   -#logo a, #logo #portal-title {
  107 +#theme-header #logo a, #theme-header #logo #portal-title {
108 108 color: #03316f;
109 109 }
110 110  
111   -#logo #portal-title {
  111 +#theme-header #logo #portal-title {
112 112 background-image: url("images/logotipo_spb_beta.svg");
113 113 background-repeat: no-repeat;
114 114 background-size: 370px; /*374px 56px;*/
... ... @@ -124,19 +124,19 @@ background-repeat: no-repeat;
124 124 letter-spacing: -0.05em;*/
125 125 }
126 126  
127   -#logo .luongo {
  127 +#theme-header #logo .luongo {
128 128 font-size: 3em !important;
129 129 line-height: 1.1em;
130 130 margin-bottom: 0.2em;
131 131 }
132 132  
133   -#logo #portal-description {
  133 +#theme-header #logo #portal-description {
134 134 font-size: 1.2em;
135 135 text-transform: uppercase;
136 136 }
137 137  
138 138 /* Site Actions */
139   -#portal-siteactions {
  139 +#theme-header #portal-siteactions {
140 140 display: block;
141 141 float: right;
142 142 clear: left;
... ... @@ -146,7 +146,7 @@ background-repeat: no-repeat;
146 146 text-align: center;
147 147 }
148 148  
149   -#portal-siteactions a {
  149 +#theme-header #portal-siteactions a {
150 150 color:#2c66ce; /*rgb(96,96,96);*/ /*#FFF;*/
151 151 text-decoration: none;
152 152 padding: 4px 0 4px 10px;
... ... @@ -154,11 +154,11 @@ background-repeat: no-repeat;
154 154 font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
155 155 }
156 156  
157   -#portal-siteactions a:hover {
  157 +#theme-header #portal-siteactions a:hover {
158 158 color: #03316f;
159 159 }
160 160  
161   -#portal-siteactions li {
  161 +#theme-header #portal-siteactions li {
162 162 display: inline;
163 163 margin: 0 5px 0 0;
164 164 border-bottom: 1px dotted #2c66ce;; /*#d0d9ff;*/
... ... @@ -167,7 +167,7 @@ background-repeat: no-repeat;
167 167 #portal-siteactions li a:hover {
168 168 color: #969696; /*#d0d9ff;
169 169 }*/
170   -#portal-siteactions li a {
  170 +#theme-header #portal-siteactions li a {
171 171 padding: 4px 0px;
172 172 }
173 173  
... ... @@ -218,7 +218,7 @@ li#siteaction-mapadosite {
218 218 /* */
219 219  
220 220 /* Sobre o brasil */
221   -#sobre, #navbar {
  221 +#theme-header #sobre, #theme-header #navbar {
222 222 clear: both;
223 223 max-width: 100% !important;
224 224 margin: 0;
... ... @@ -227,38 +227,38 @@ li#siteaction-mapadosite {
227 227 padding: 5px 0;
228 228 }
229 229  
230   -#sobre,#navbar ul {
  230 +#theme-header #sobre, #theme-header #navbar ul {
231 231 max-width: 960px;
232 232 margin: 0px auto;
233 233 text-align: right;
234 234 padding:10px;
235 235 }
236 236  
237   -#sobre a {
  237 +#theme-header #sobre a {
238 238 color: #2c66ce; /*rgb(96,96,96);*/
239 239 font-family: 'Open Sans', Arial, Helvetica, sans-serif;
240 240 }
241   -#navbar a{
  241 +#theme-header #navbar a{
242 242 color: rgb(96,96,96);
243 243 font-family: 'Open Sans', Arial, Helvetica, sans-serif;
244 244 }
245 245  
246   -#sobre, #navbar .portalservicos-item a {
  246 +#theme-header #sobre, #theme-header #navbar .portalservicos-item a {
247 247 padding: 0 10px;
248 248 border-right: 1px solid #03316f;
249 249 }
250 250  
251   -#sobre, #navbar .last-item a {
  251 +#theme-header #sobre, #theme-header #navbar .last-item a {
252 252 padding: 0 0 0 10px;
253 253 border-right: none;
254 254 }
255 255  
256   -#navbar:houver{
  256 +#theme-header #navbar:houver{
257 257 color:#000000;
258 258  
259 259 }
260 260  
261   -#links-rapidos{
  261 +#theme-header #links-rapidos{
262 262 width: 960px;
263 263 margin: 0 auto;
264 264 font-color:#fff;
... ... @@ -273,11 +273,11 @@ li#siteaction-mapadosite {
273 273 border: none;
274 274 }
275 275  
276   -input.searchField {
  276 +#theme-header input.searchField {
277 277 -moz-appearance: none;
278 278 }
279 279  
280   -#portal-searchbox {
  280 +#theme-header #portal-searchbox {
281 281 clear: right;
282 282 float: right;
283 283 font-size: 80%;
... ... @@ -292,26 +292,26 @@ input.searchField {
292 292 padding: 2px;
293 293 }
294 294  
295   -#portal-searchbox .searchField {
  295 +#theme-header #portal-searchbox .searchField {
296 296 padding: 0.45em;
297 297 border-right: none;
298 298 border: none;
299 299 width: 171px; /*210px;170px;*/
300 300 }
301 301  
302   -#portal-searchbox form {
  302 +#theme-header #portal-searchbox form {
303 303 white-space: nowrap;
304 304 }
305 305  
306   -#portal-searchbox label {
  306 +#theme-header #portal-searchbox label {
307 307 font-weight: normal;
308 308 }
309 309  
310   -#searchGadget {
  310 +#theme-header #searchGadget {
311 311 width: 13em;
312 312 }
313 313  
314   -#header input.searchButton {
  314 +#theme-header #header input.searchButton {
315 315 padding: 0.3em;
316 316 background: transparent;
317 317 text-indent: -2000px;
... ... @@ -328,7 +328,7 @@ input.searchField {
328 328 -moz-appearance: searchfield;
329 329 }*/
330 330  
331   -#header input.searchButton {
  331 +#theme-header #header input.searchButton {
332 332 background-image: url("images/search-button.png");
333 333 background-position: 8px 2px;
334 334 background-repeat: no-repeat;
... ... @@ -342,7 +342,7 @@ input.searchField {
342 342  
343 343  
344 344 /* Search Button */
345   -#search-button a {
  345 +#theme-header #search-button a {
346 346 display: inline-block;
347 347 width: 29px;
348 348 height: 25px;
... ... @@ -350,16 +350,16 @@ input.searchField {
350 350 margin-top: 10px;
351 351 }
352 352  
353   -#search-button a:hover {
  353 +#theme-header #search-button a:hover {
354 354 opacity: 0.6;
355 355 }
356 356  
357   -#search-button #sb_search {
  357 +#theme-header #search-button #sb_search {
358 358 background-image: url(images/search.png);
359 359 background-size: 100% 100%;
360 360 }
361 361  
362   -#search-button span { display: none; }
  362 +#theme-header #search-button span { display: none; }
363 363  
364 364  
365 365 /* */
... ...
html-cms/notifications_bar.html 0 → 100644
  Diff comments   View file @a494f1c
... ... @@ -0,0 +1,57 @@
  1 +<html>
  2 +
  3 +<body>
  4 +<meta charset="UTF-8">
  5 +
  6 +
  7 +<head>
  8 +<title>Barra de avisos</title>
  9 +
  10 +<!--<style>
  11 +
  12 +.info-bar {
  13 + color: #8A6C39;
  14 + background: #FCF8E3;
  15 + border: 1px solid #FAEBCC;
  16 + padding: 15px;
  17 + margin-bottom: 20px;
  18 + border-radius: 4px;
  19 + font-family: arial, helvetica;
  20 + font-size: 14px;
  21 + line-height: 20px;
  22 +}
  23 +
  24 +.info-bar span {
  25 + text-transform: uppercase;
  26 + font-size: 13px;
  27 + font-weight: 600;
  28 +}
  29 +
  30 +.info-bar a {
  31 + text-decoration: none;
  32 + border-bottom: 1px dotted #8A6C39;
  33 + padding-bottom: 1px;
  34 + color: #8A6C39;
  35 +}
  36 +
  37 +.info-bar a:hover {
  38 + border-bottom: 0;
  39 +}
  40 +
  41 +</style>-->
  42 +
  43 +
  44 +</head>
  45 +
  46 +
  47 +<!-- Barra de notificações -->
  48 +<div class="info-bar" style="color: #8A6C39; background: #FCF8E3; border: 1px solid #FAEBCC; padding: 15px; margin-bottom: 20px; border-radius: 4px; font-family: arial, helvetica; font-size: 14px; line-height: 20px;">
  49 + <span style="text-transform: uppercase; font-size: 13px; font-weight: 600;">Versão anterior:</span>
  50 + Acesse a versão anterior do
  51 + <a href="http://www.softwarepublico.gov.br/paginicial" target="_blank" style="text-decoration: none; border-bottom: 1px dotted #8A6C39; padding-bottom: 1px; color: #8A6C39;"><strong>Portal do Software Púbico Brasileiro</strong></a>
  52 +</div>
  53 +
  54 +
  55 +</body>
  56 +
  57 +</html>
0 58 \ No newline at end of file
... ...
html-cms/sitemap.html 0 → 100644
  Diff comments   View file @a494f1c
... ... @@ -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 82 \ No newline at end of file
... ...
pagina-artigos.css
  Diff comments   View file @a494f1c
... ... @@ -7,6 +7,8 @@
7 7 font-size: 34px !important;
8 8 line-height: 37px !important;
9 9 margin-bottom: 10px !important;
  10 + border-bottom: 1px solid #D3D6DE !important;
  11 + padding-bottom: 10px !important;
10 12 }
11 13  
12 14 #content .main-block .article-body {
... ... @@ -107,8 +109,31 @@
107 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 139 .page-comment-form {
... ... @@ -449,3 +474,51 @@ color: #F91461;
449 474 font-family: Arial;
450 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 +}
... ...
style.css
  Diff comments   View file @a494f1c
... ... @@ -1166,18 +1166,16 @@ div#article-parent {
1166 1166  
1167 1167 #article-tags a:link {
1168 1168 clear: both;
1169   - display: inline-block;
  1169 + float: left;
  1170 + display: block;
  1171 + font-size: 12px;
1170 1172 margin-bottom: 1.5em;
1171   - color: white;
1172   - padding: 3px 5px;
1173   -}
1174   -
1175   -#article-tags a:hover {
1176   - background-color: #000;
1177   - color: white;
  1173 + color: #3E67B1;
  1174 + background-color: #ECEDF1;
  1175 + border: 1px solid #D3D6DE;
  1176 + padding: 3px 10px;
1178 1177 }
1179 1178  
1180   -
1181 1179 /* fim Content*/
1182 1180  
1183 1181 /*busca*/
... ... @@ -1194,11 +1192,11 @@ div#article-parent {
1194 1192 margin-bottom: 30px;
1195 1193 border-top: 0 none;
1196 1194 margin-top: 48px;
1197   - font-family: Arial;
  1195 + font-family: "open_sansregular", Arial, Helvetica, sans-serif;
1198 1196 }
1199 1197  
1200   -#content .pagination a {
1201   - text-decoration: none;
  1198 +#content .pagination a,
  1199 +#content .pagination em{
1202 1200 padding: 7px 11px 7px 11px;
1203 1201 border-radius: 4px;
1204 1202 margin-right: 4px;
... ... @@ -1207,16 +1205,11 @@ div#article-parent {
1207 1205 border: 1px solid #D3D6DE;
1208 1206 color: #172738;
1209 1207 font-weight: 700;
  1208 + text-decoration: none;
1210 1209 }
1211 1210  
1212 1211 .pagination .current {
1213 1212 background-color: #ECEDF1;
1214   - padding: 7px 11px 7px 11px;
1215   - border-radius: 4px;
1216   - margin-right: 4px;
1217   - font-weight: 700;
1218   - font-size: 15px;
1219   - border: 1px solid #D3D6DE;
1220 1213 font-style: normal;
1221 1214 }
1222 1215  
... ... @@ -1241,16 +1234,16 @@ div#article-parent {
1241 1234 padding: 7px 11px 7px 30px;
1242 1235 }
1243 1236  
1244   -#content .pagination .next_page.disabled,
1245   -#content .pagination .previous_page.disabled{
1246   - opacity: 0.5;
1247   -}
1248   -
1249 1237 #content .pagination .next_page{
1250 1238 float: right;
1251 1239 padding: 7px 30px 7px 11px;
1252 1240 }
1253 1241  
  1242 +#content .pagination .next_page.disabled,
  1243 +#content .pagination .previous_page.disabled{
  1244 + opacity: 0.5;
  1245 +}
  1246 +
1254 1247 #content .pagination .previous_page.disabled::before,
1255 1248 #content .pagination a.previous_page::before {
1256 1249 display: none;
... ...