Download as
Browse Code »

Commit bff681574efecf3002071b8ff87834cbc7fb55db

Authored by Juliana
2 parents 415e1013 6e6a2a4a
Exists in master and in 12 other branches adding_css_from_plugin, comments-opacity, design_template, fix_catalog_classes, fix_javascript, fix_text_display_content, format_highlight_block_#85, news_page_css, page_catalog, restructuring_css, stable, tooltips

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

Showing 2 changed files with 68 additions and 38 deletions   Show diff stats
page-inicial.css
  Diff comments   View file @bff6815
... ... @@ -18,10 +18,10 @@
18 18  
19 19 #search-Gadget {
20 20 width:95%;
21   - padding:5px;
  21 + padding:8px;
22 22 margin:5px;
23 23 border-radius:4px;
24   -
  24 + border: none;
25 25 }
26 26 .searchButton-catalog{
27 27 background-color: #1A397D; /*#193A7D;*/
... ... @@ -38,32 +38,30 @@
38 38 background-color:#192758; /*#172857;*/
39 39 color:#FFFFFF;
40 40 border-top:1px solid;
41   - padding:2px;
42 41 border-bottom-left-radius:4px;
43 42 border-bottom-right-radius:4px;
44 43 }
45 44  
46   -#search-catalog-footer p{
47   - margin:5px;
  45 +#search-catalog-footer p {
48 46 text-align:right;
49 47 text-transform: uppercase;
50   - margin-right: 32px;
51 48 }
52 49  
53 50 #bt_catalog-search::after {
54   -content:'>';
55   -position: absolute;
56   -padding-left: 2px;
57   -/*margin-top: -2px;*/
58   -right: 10px;
59   -width: 18px;
60   -height: 20px;
61   -color: #172857;
62   -background: #eee;
63   -border-radius: 4px;
64   -font-size: 16px;
65   -line-height: 20px;
66   -text-align: center;
  51 + content:'>';
  52 + padding-left: 8px;
  53 + padding-right: 5px;
  54 + /*margin-top: -2px;*/
  55 + right: 10px;
  56 + width: 18px;
  57 + height: 20px;
  58 + color: #172857;
  59 + background: #eee;
  60 + border-radius: 4px;
  61 + font-size: 16px;
  62 + line-height: 20px;
  63 + text-align: center;
  64 + margin-left: 5px;
67 65 }
68 66  
69 67 /**********************************************************/
... ... @@ -299,7 +297,6 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
299 297 margin-top: 35px;
300 298 border: 0px solid #c0c1c1;
301 299 border-radius: 8px;
302   - text-align: center;
303 300 }
304 301  
305 302 .block.display-content-block .image img {
... ... @@ -317,7 +314,7 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
317 314 .block.display-content-block .title {
318 315 padding-left: 160px;
319 316 padding-right: 0px;
320   - max-height: 40px;
  317 + max-height: 33px;
321 318 overflow: hidden;
322 319 }
323 320  
... ...
style.css
  Diff comments   View file @bff6815
... ... @@ -423,6 +423,12 @@ p {
423 423 width: 490px;
424 424 }
425 425  
  426 +
  427 +#content .box .article-block .short-post {
  428 + padding-top: 10px;
  429 +}
  430 +
  431 +
426 432 /* padrao do box */
427 433 #content .box .block-title {
428 434 font-size: 12px;
... ... @@ -439,7 +445,6 @@ p {
439 445 font-size: 10px;
440 446 text-align: right;
441 447 border-bottom: none;
442   - padding: 10px 8px 8px 8px;
443 448 text-transform: uppercase;
444 449 font-family: "open_sans", Arial, Helvetica, sans-serif;
445 450 font-variant: normal;
... ... @@ -447,7 +452,12 @@ p {
447 452  
448 453 #content .read-more a {
449 454 line-height: 20px;
450   - margin-left: 15px;
  455 + padding: 8px;
  456 + display: block
  457 +}
  458 +
  459 +#content .read-more a:hover {
  460 + background: #dedede;
451 461 }
452 462  
453 463 #content .box .read-more a::after {
... ... @@ -475,7 +485,28 @@ p {
475 485 padding: 0 1em 0 0;
476 486 }
477 487  
  488 +/* Bloco de busca pagina inicial*/
  489 +#content .search-catalog-block h1 {
  490 + padding: 10px 10px 0 10px;
  491 +}
  492 +
  493 +#content .search-catalog-block form {
  494 + padding: 0 10px 10px 10px;
  495 +}
  496 +
  497 +#content .search-catalog-block #search-catalog-footer a {
  498 + display: block;
  499 + color: #FFF;
  500 + padding: 8px;
  501 +}
  502 +
  503 +#content .search-catalog-block #search-catalog-footer p {
  504 + margin: 0px;
  505 +}
478 506  
  507 +#content .search-catalog-block #search-catalog-footer a:hover {
  508 + background-color: #101A38
  509 +}
479 510  
480 511 /**/
481 512  
... ... @@ -713,7 +744,7 @@ p {
713 744  
714 745 #content .display-content-block .title a {
715 746 background-color: transparent;
716   - font-size: 20px;
  747 + font-size: 16px;
717 748 font-style: normal;
718 749 font-weight: bold;
719 750 line-height: 1em;
... ... @@ -733,6 +764,22 @@ p {
733 764 line-height:21px;
734 765 font-family: Arial, Helvetica, sans-serif;
735 766 }
  767 +
  768 +/* Numeracao dentro de artigos */
  769 +.article-body ul {
  770 + list-style-position: inside;
  771 + list-style-type: disc;
  772 +}
  773 +
  774 +.article-body ol {
  775 + list-style-position: inside;
  776 + list-style-type: decimal;
  777 +}
  778 +
  779 +.article-body li {
  780 + list-style: inherit;
  781 +}
  782 +
736 783 /* fim tamanho da fonte dentro dos artigos*/
737 784  
738 785  
... ... @@ -2784,17 +2831,3 @@ body.action-embed-index {
2784 2831 padding-right: 150px;
2785 2832 }
2786 2833  
2787   -
2788   -.article-body ul {
2789   - list-style-position: inside;
2790   - list-style-type: disc;
2791   -}
2792   -
2793   -.article-body ol {
2794   - list-style-position: inside;
2795   - list-style-type: decimal;
2796   -}
2797   -
2798   -.article-body li {
2799   - list-style: inherit;
2800   -}
... ...