Commit 8b93b50ac9d7bf542f69e32e19a7714834bd2d2c

Authored by Juliana
2 parents e87f7cb4 6815b97d

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

Showing 2 changed files with 110 additions and 18 deletions   Show diff stats
page-inicial.css
@@ -427,6 +427,18 @@ margin: -10px 0px 10px 20px; /*-20px 20px; @@ -427,6 +427,18 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
427 427
428 /* Tela de Noticias Antigas */ 428 /* Tela de Noticias Antigas */
429 429
  430 +#content .block.display-last-news-block {
  431 + font-family: open_sansregular, Arial, Helvetica, sans-serif;
  432 + padding-right: 14px;
  433 +}
  434 +
  435 +#content .block.display-last-news-block .title_top {
  436 + border-bottom: 1px solid #eee;
  437 + padding-bottom: 9px;
  438 + margin-bottom: 26px;
  439 + text-transform: none;
  440 +}
  441 +
430 #content .block.display-last-news-block .block-title { 442 #content .block.display-last-news-block .block-title {
431 border-top: 4px solid #643C67; 443 border-top: 4px solid #643C67;
432 background: #eee; 444 background: #eee;
@@ -434,13 +446,15 @@ margin: -10px 0px 10px 20px; /*-20px 20px; @@ -434,13 +446,15 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
434 } 446 }
435 447
436 .block.display-last-news-block li { 448 .block.display-last-news-block li {
437 - min-height: 88px; 449 + min-height: 92px;
438 border-top: 1px solid #eee; 450 border-top: 1px solid #eee;
439 - padding-top: 24px; 451 + padding-top: 20px;
  452 + list-style: none;
440 } 453 }
441 454
442 .block.display-last-news-block li:first-child { 455 .block.display-last-news-block li:first-child {
443 border-top: 0px solid #eee; 456 border-top: 0px solid #eee;
  457 + padding-top: 0px;
444 } 458 }
445 459
446 .block.display-last-news-block .image { 460 .block.display-last-news-block .image {
@@ -450,7 +464,7 @@ margin: -10px 0px 10px 20px; /*-20px 20px; @@ -450,7 +464,7 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
450 float:left; 464 float:left;
451 border: 0px solid #c0c1c1; 465 border: 0px solid #c0c1c1;
452 border-radius: 8px; 466 border-radius: 8px;
453 - margin: 2px 20px 25px 0; 467 + margin: 2px 19px 25px 0;
454 } 468 }
455 469
456 .block.display-last-news-block .image img { 470 .block.display-last-news-block .image img {
@@ -461,20 +475,22 @@ margin: -10px 0px 10px 20px; /*-20px 20px; @@ -461,20 +475,22 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
461 } 475 }
462 476
463 .block.display-last-news-block .published-at { 477 .block.display-last-news-block .published-at {
464 - padding-bottom: 10px; 478 + padding-bottom: 8px;
465 color: #172738; 479 color: #172738;
  480 + font-size: 13px;
466 } 481 }
467 482
468 .block.display-last-news-block .title { 483 .block.display-last-news-block .title {
469 padding-left: 0px; 484 padding-left: 0px;
470 padding-right: 0px; 485 padding-right: 0px;
471 - max-height: 40px; 486 + max-height: 44px;
472 overflow: hidden; 487 overflow: hidden;
473 color: #172738; 488 color: #172738;
474 } 489 }
475 490
476 #content .block.display-last-news-block .title { 491 #content .block.display-last-news-block .title {
477 padding-right: 0px; 492 padding-right: 0px;
  493 + margin-bottom: 1px;
478 } 494 }
479 495
480 .block.display-last-news-block .title a { 496 .block.display-last-news-block .title a {
@@ -482,8 +498,8 @@ margin: -10px 0px 10px 20px; /*-20px 20px; @@ -482,8 +498,8 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
482 font-family: Arial, Helvetica, sans-serif; 498 font-family: Arial, Helvetica, sans-serif;
483 font-style: normal; 499 font-style: normal;
484 font-weight: bold; 500 font-weight: bold;
485 - line-height: 1.3em;  
486 - color: #172738 501 + line-height: 1.4em;
  502 + color: #172738;
487 padding: 0; 503 padding: 0;
488 } 504 }
489 505
@@ -506,8 +522,21 @@ margin: -10px 0px 10px 20px; /*-20px 20px; @@ -506,8 +522,21 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
506 display: none; 522 display: none;
507 } 523 }
508 524
509 -.block.display-last-news-block a:visited, #content .block.display-last-news-block a:visited, .block.display-last-news-block dl.portlet a:visited { 525 +.block.display-last-news-block a:visited,
  526 +.block.display-last-news-block a:link,
  527 +.block.display-last-news-block a:hover,
  528 +.block.display-last-news-block a,
  529 +.block.display-last-news-block dl.portlet a:visited {
  530 + color: #172738;
  531 + text-decoration: none;
  532 +}
  533 +
  534 +#content .block.display-last-news-block a:visited,
  535 +#content .block.display-last-news-block a:link,
  536 +#content .block.display-last-news-block a:hover,
  537 +#content .block.display-last-news-block a {
510 color: #172738; 538 color: #172738;
  539 + text-decoration: none;
511 } 540 }
512 541
513 /* 542 /*
pagina-artigos.css
@@ -191,10 +191,15 @@ ol li { @@ -191,10 +191,15 @@ ol li {
191 } 191 }
192 192
193 #content .main-block .article-body P { 193 #content .main-block .article-body P {
194 - margin-bottom: 20px; 194 + margin-bottom: 22px;
195 font-family: arial; 195 font-family: arial;
196 } 196 }
197 197
  198 +#content .main-block .article-body P strong {
  199 + font-size: 16px;
  200 +}
  201 +
  202 +
198 #content .main-block .article-body .zoomable-image { 203 #content .main-block .article-body .zoomable-image {
199 overflow: auto; 204 overflow: auto;
200 display: block; 205 display: block;
@@ -246,22 +251,31 @@ ol li { @@ -246,22 +251,31 @@ ol li {
246 .title_top { 251 .title_top {
247 color: #F91461; 252 color: #F91461;
248 text-transform: uppercase; 253 text-transform: uppercase;
249 - font-size: 15px; 254 + font-size: 16px;
250 padding-bottom: 25px; 255 padding-bottom: 25px;
  256 + padding-left: 1px;
  257 + font-family:"open_sansregular", Arial;
  258 +
251 } 259 }
252 260
253 .news_principal_block { 261 .news_principal_block {
254 padding-bottom: 5px; 262 padding-bottom: 5px;
255 } 263 }
256 264
  265 +.news_principal_block hr {
  266 + margin: 23px 0 23px 0;
  267 +}
  268 +
257 .news_principal_date { 269 .news_principal_date {
258 padding-bottom: 5px; 270 padding-bottom: 5px;
259 } 271 }
260 272
261 .news_principal_title { 273 .news_principal_title {
262 - font-size: 32px; 274 + font-size: 33px;
263 font-weight: bold; 275 font-weight: bold;
264 - padding-bottom: 15px; 276 + padding-bottom: 14px;
  277 + line-height: 39px;
  278 + font-family: Arial, Helvetica, sans-serif;
265 } 279 }
266 280
267 .news_principal_image { 281 .news_principal_image {
@@ -269,7 +283,7 @@ ol li { @@ -269,7 +283,7 @@ ol li {
269 } 283 }
270 284
271 .news_principal_image img { 285 .news_principal_image img {
272 - width: 750px; 286 + /*width: 750px;*/
273 max-width: 750px; 287 max-width: 750px;
274 max-height: 320px; 288 max-height: 320px;
275 border: 0px solid #c0c1c1; 289 border: 0px solid #c0c1c1;
@@ -277,8 +291,10 @@ ol li { @@ -277,8 +291,10 @@ ol li {
277 } 291 }
278 292
279 .news_principal_text { 293 .news_principal_text {
280 - font-size: 15px;  
281 - /* padding-bottom: 30px; */ 294 + font-size: 14px;
  295 + line-height: 21px;
  296 + font-family: "open_sansregular", Arial, Helvetica, sans-serif;
  297 + padding-bottom: 3px;
282 } 298 }
283 .news_small_block { 299 .news_small_block {
284 /*height: 300px;*/ 300 /*height: 300px;*/
@@ -298,14 +314,13 @@ ol li { @@ -298,14 +314,13 @@ ol li {
298 } 314 }
299 315
300 .news_small_image { 316 .news_small_image {
301 - padding-bottom: 15px; 317 + padding-bottom: 13px;
302 } 318 }
303 319
304 320
305 .news_small_image img { 321 .news_small_image img {
306 - width: 230px;  
307 max-width: 230px; 322 max-width: 230px;
308 - max-height: 136px; 323 + height: 136px;
309 border: 0px solid #c0c1c1; 324 border: 0px solid #c0c1c1;
310 border-radius: 5px; 325 border-radius: 5px;
311 } 326 }
@@ -330,3 +345,51 @@ background: transparent; @@ -330,3 +345,51 @@ background: transparent;
330 color: #F91461; 345 color: #F91461;
331 } 346 }
332 347
  348 +
  349 +/* Pagina de visualizar noticia */
  350 +
  351 +#content .view_news {
  352 + margin-right: 36px;
  353 + margin-left: 0px;
  354 +}
  355 +
  356 +#content .view_news .published-at {
  357 + font-family: open_sansregular, Arial, Helvetica, sans-serif;
  358 + font-size: 12px;
  359 + margin-bottom: 22px;
  360 +}
  361 +
  362 +#content .view_news hr {
  363 + margin: 25px 0 15px 0;
  364 +}
  365 +
  366 +#content .view_news .image {
  367 + float: left;
  368 + height: 194px;
  369 + width: 230px;
  370 + margin: 3px 29px 0 0;
  371 +}
  372 +
  373 +#content .view_news .image img {
  374 + max-width: 230px;
  375 +}
  376 +
  377 +#content .main-block .article-body .view_news .zoomable-image {
  378 + overflow: hidden;
  379 + margin-bottom: 5px;
  380 +}
  381 +
  382 +#content .main-block .article-body .view_news P {
  383 + line-height: 22px;
  384 + margin-left: 2px;
  385 +}
  386 +
  387 +#content .main-block .article-body .view_news .img-credit {
  388 + margin: 0 0 0 2px;
  389 +}
  390 +
  391 +#content .main-block .view_news .txt-credit a {
  392 + font-size: 12px;
  393 + color: #172938;
  394 + text-decoration: none;
  395 +}