Download as
Browse Code »

Commit 430119e884da19e2f8031167130d6551d2b36d3e

Authored by Gustavo Cruz
2 parents c7047dc2 b27be2d0
Exists in master and in 5 other branches fix_forms_for_create_and_edit_contents, fix_people_elements, fix_search_pages, production, staging

Merge branch 'master' of github.com:SerproLivre/participa-theme

Showing 16 changed files with 52 additions and 30 deletions   Show diff stats
cabecalho-amarelo-theme.css
  Diff comments   View file @430119e
... ... @@ -333,24 +333,32 @@ background-size: 100% 100%;
333 333 margin-left: 4px;
334 334 }
335 335  
336   -#social-icons a:hover {
337   - opacity: 0.6;
338   -}
339   -
340 336 #social-icons #sb_face {
341   -background-image: url(images/icone-facebook-escuro.png);
  337 +background-image: url(images/icone-verde-facebook.png);
  338 +}
  339 +#social-icons #sb_face:hover {
  340 +background: url(images/icone-verde-facebook.png) 0 20px;
342 341 }
343 342  
344 343 #social-icons #sb_tweet {
345   -background-image: url(images/icone-twitter-escuro.png);
  344 +background-image: url(images/icone-verde-twitter.png);
  345 +}
  346 +#social-icons #sb_tweet:hover {
  347 +background: url(images/icone-verde-twitter.png) 0 20px;
346 348 }
347 349  
348 350 #social-icons #sb_youtb {
349   -background-image: url(images/icone-youtube-escuro.png);
  351 +background-image: url(images/icone-verde-youtube.png);
  352 +}
  353 +#social-icons #sb_youtb:hover {
  354 +background: url(images/icone-verde-youtube.png) 0 20px;
350 355 }
351 356  
352 357 #social-icons #sb_flickr {
353   -background-image: url(images/icone-flickr-escuro.png);
  358 +background-image: url(images/icone-verde-flickr.png);
  359 +}
  360 +#social-icons #sb_flickr:hover {
  361 +background: url(images/icone-verde-flickr.png) 0 20px;
354 362 }
355 363  
356 364 #social-icons span { display: none; }
... ...
header.rhtml
  Diff comments   View file @430119e
... ... @@ -57,6 +57,9 @@
57 57 <div id="social-icons">
58 58 <ul>
59 59 <li>
  60 + <a id="sb_flickr" title="Flickr" href="#"><span>Flickr</span></a>
  61 + </li>
  62 + <li>
60 63 <a id="sb_face" title="Facebook" href="http://facebook.com/participabr"><span>Facebook</span></a>
61 64 </li>
62 65 <li>
... ... @@ -65,12 +68,6 @@
65 68 <li>
66 69 <a id="sb_tweet" title="Twitter" href="http://twitter.com/participabr"><span>Twitter</span></a>
67 70 </li>
68   - <li>
69   - <a id="sb_flickr" title="Flickr" href="#"><span>Flickr</span></a>
70   - </li>
71   - <li>
72   - <a id="sb_inst" title="Instagram" href="http://instagram.com/participabr"><span>Instagram</span></a>
73   - </li>
74 71 </ul>
75 72 </div>
76 73 </div>
... ...
images/buttons.png
View file @c7047dc

3.42 KB
images/icone-branco-facebook.png 0 → 100644
View file @430119e

1.05 KB
images/icone-branco-flickr.png 0 → 100644
View file @430119e

1.09 KB
images/icone-branco-twitter.png 0 → 100644
View file @430119e

1.14 KB
images/icone-branco-youtube.png 0 → 100644
View file @430119e

1.3 KB
images/icone-facebook-escuro.png
View file @c7047dc

3.03 KB
images/icone-flickr-escuro.png
View file @c7047dc

2.98 KB
images/icone-twitter-escuro.png
View file @c7047dc

3.09 KB
images/icone-verde-facebook.png 0 → 100644
View file @430119e

1.26 KB
images/icone-verde-flickr.png 0 → 100644
View file @430119e

1.29 KB
images/icone-verde-twitter.png 0 → 100644
View file @430119e

1.4 KB
images/icone-verde-youtube.png 0 → 100644
View file @430119e

1.75 KB
images/icone-youtube-escuro.png
View file @c7047dc

3.51 KB
style.css
  Diff comments   View file @430119e
... ... @@ -1001,8 +1001,8 @@ input.button.with-text {
1001 1001 border: 0px solid #DDDDDD;
1002 1002 display: inline-block;
1003 1003 float: left;
1004   - clear: right;
1005   - margin: 0 9px 9px;
  1004 + clear: right;
  1005 + margin: 12px 9px 9px;
1006 1006 max-width: 214px;
1007 1007 height: 426px;
1008 1008 padding: 0;
... ... @@ -1054,6 +1054,16 @@ input.button.with-text {
1054 1054 overflow: hidden;
1055 1055 margin: 8px;
1056 1056 background-color: #FFF;
  1057 + position: relative;
  1058 +}
  1059 +
  1060 +.track_list .image img {
  1061 + position: absolute;
  1062 + top: 0;
  1063 + bottom: 0;
  1064 + margin: auto;
  1065 + left: 0;
  1066 + right: 0;
1057 1067 }
1058 1068  
1059 1069 #content .track_list .item_card .track_content .name {
... ... @@ -1480,7 +1490,7 @@ input.button.with-text {
1480 1490 border-top: 0 none;
1481 1491 left: -20px;
1482 1492 margin-bottom: 0;
1483   - margin-top: -47px;
  1493 + margin-top: -44px;
1484 1494 position: relative;
1485 1495 }
1486 1496  
... ... @@ -1511,7 +1521,7 @@ input.button.with-text {
1511 1521 color: white;
1512 1522 font-size: 18px;
1513 1523 font-variant: normal;
1514   - padding: 0.5em 1em;
  1524 + padding: 6px 1em;
1515 1525 text-align: left;
1516 1526 }
1517 1527  
... ... @@ -1519,10 +1529,6 @@ input.button.with-text {
1519 1529 .action-environment_design-index #content .display-content-block:first-of-type .block-title span {
1520 1530 background-color: #f7b905;
1521 1531 color: #0a4d06;
1522   - font-size: 18px;
1523   - font-variant: normal;
1524   - padding: 0.5em 1em;
1525   - text-align: left;
1526 1532 }
1527 1533  
1528 1534 .action-home-index .block .block-inner-2,
... ... @@ -1959,21 +1965,32 @@ body.contraste #portal-siteactions {
1959 1965 }
1960 1966  
1961 1967 body.contraste #social-icons #sb_face {
1962   - background-image: url("images/icone-facebook.png");
  1968 + background-image: url("images/icone-branco-facebook.png");
  1969 +}
  1970 +body.contraste #social-icons #sb_face:hover {
  1971 + background: url("images/icone-branco-facebook.png") 0 20px;
1963 1972 }
  1973 +
1964 1974 body.contraste #social-icons #sb_youtb {
1965   - background-image: url("images/icone-youtube.png");
  1975 + background-image: url("images/icone-branco-youtube.png");
  1976 +}
  1977 +body.contraste #social-icons #sb_youtb:hover {
  1978 + background: url("images/icone-branco-youtube.png") 0 20px;
1966 1979 }
  1980 +
1967 1981 body.contraste #social-icons #sb_tweet {
1968   - background-image: url("images/icone-twitter-branco.png");
  1982 + background-image: url("images/icone-branco-twitter.png");
1969 1983 }
1970   -body.contraste #social-icons #sb_flickr {
1971   - background-image: url("images/icone-flickr.png");
  1984 +body.contraste #social-icons #sb_tweet:hover {
  1985 + background: url("images/icone-branco-twitter.png") 0 20px;
1972 1986 }
1973   -/*body.contraste #social-icons #sb_inst {
1974   - background-image: url("images/icone-instagram.png");
1975   -}*/
1976 1987  
  1988 +body.contraste #social-icons #sb_flickr {
  1989 + background-image: url("images/icone-branco-flickr.png");
  1990 +}
  1991 +body.contraste #social-icons #sb_flickr:hover {
  1992 + background: url("images/icone-branco-flickr.png") 0 20px;
  1993 +}
1977 1994  
1978 1995  
1979 1996 /* Plugin para curtir artigos e comentários */
... ...