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

Gustavo Cruz
2 parents c7047dc2 b27be2d0
Showing 16 changed files with 52 additions and 30 deletions Show diff stats
cabecalho-amarelo-theme.css
header.rhtml
images/buttons.png
images/icone-branco-facebook.png
images/icone-branco-flickr.png
images/icone-branco-twitter.png
images/icone-branco-youtube.png
images/icone-facebook-escuro.png
images/icone-flickr-escuro.png
images/icone-twitter-escuro.png
images/icone-verde-facebook.png
images/icone-verde-flickr.png
images/icone-verde-twitter.png
images/icone-verde-youtube.png
images/icone-youtube-escuro.png
style.css
@@ -333,24 +333,32 @@ background-size: 100% 100%;
     margin-left: 4px;
 }
-#social-icons a:hover {
-    opacity: 0.6;
-}
-
 #social-icons #sb_face {
-background-image: url(images/icone-facebook-escuro.png);
+background-image: url(images/icone-verde-facebook.png);
+}
+#social-icons #sb_face:hover {
+background: url(images/icone-verde-facebook.png) 0 20px;
 }
 #social-icons #sb_tweet {
-background-image: url(images/icone-twitter-escuro.png);
+background-image: url(images/icone-verde-twitter.png);
+}
+#social-icons #sb_tweet:hover {
+background: url(images/icone-verde-twitter.png) 0 20px;
 }
 #social-icons #sb_youtb {
-background-image: url(images/icone-youtube-escuro.png);
+background-image: url(images/icone-verde-youtube.png);
+}
+#social-icons #sb_youtb:hover {
+background: url(images/icone-verde-youtube.png) 0 20px;
 }
 #social-icons #sb_flickr {
-background-image: url(images/icone-flickr-escuro.png);
+background-image: url(images/icone-verde-flickr.png);
+}
+#social-icons #sb_flickr:hover {
+background: url(images/icone-verde-flickr.png) 0 20px;
 }
 #social-icons span { display: none; }
@@ -57,6 +57,9 @@
       <div id="social-icons">
         <ul>
           <li>
+            <a id="sb_flickr" title="Flickr" href="#"><span>Flickr</span></a>
+          </li>
+          <li>
             <a id="sb_face" title="Facebook" href="http://facebook.com/participabr"><span>Facebook</span></a>
           </li>
           <li>
@@ -65,12 +68,6 @@
           <li>
             <a id="sb_tweet" title="Twitter" href="http://twitter.com/participabr"><span>Twitter</span></a>
           </li>
-          <li>
-            <a id="sb_flickr" title="Flickr" href="#"><span>Flickr</span></a>
-          </li>
-          <li>
-            <a id="sb_inst" title="Instagram" href="http://instagram.com/participabr"><span>Instagram</span></a>
-          </li>
         </ul>
       </div>
     </div>
@@ -1001,8 +1001,8 @@ input.button.with-text {
     border: 0px solid #DDDDDD;
     display: inline-block;
     float: left;
-	 clear: right;
-    margin: 0 9px 9px;
+    clear: right;
+    margin: 12px 9px 9px;
     max-width: 214px;
     height: 426px;
     padding: 0;
@@ -1054,6 +1054,16 @@ input.button.with-text {
 	overflow: hidden;
 	margin: 8px;
 	background-color: #FFF;
+  position: relative;
+}
+
+.track_list .image img {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  left: 0;
+  right: 0;
 }
 #content .track_list .item_card .track_content .name {
@@ -1480,7 +1490,7 @@ input.button.with-text {
     border-top: 0 none;
     left: -20px;
     margin-bottom: 0;
-    margin-top: -47px;
+    margin-top: -44px;
     position: relative;
 }
@@ -1511,7 +1521,7 @@ input.button.with-text {
     color: white;
     font-size: 18px;
     font-variant: normal;
-    padding: 0.5em 1em;
+    padding: 6px 1em;
     text-align: left;
 }
@@ -1519,10 +1529,6 @@ input.button.with-text {
 .action-environment_design-index #content .display-content-block:first-of-type .block-title span {
     background-color: #f7b905;
     color: #0a4d06;
-    font-size: 18px;
-    font-variant: normal;
-    padding: 0.5em 1em;
-    text-align: left;
 }
 .action-home-index .block .block-inner-2,
@@ -1959,21 +1965,32 @@ body.contraste #portal-siteactions {
 }
 body.contraste #social-icons #sb_face {
-    background-image: url("images/icone-facebook.png");
+    background-image: url("images/icone-branco-facebook.png");
+}
+body.contraste #social-icons #sb_face:hover {
+    background: url("images/icone-branco-facebook.png") 0 20px;
 }
+
 body.contraste #social-icons #sb_youtb {
-    background-image: url("images/icone-youtube.png");
+    background-image: url("images/icone-branco-youtube.png");
+}
+body.contraste #social-icons #sb_youtb:hover {
+    background: url("images/icone-branco-youtube.png") 0 20px;
 }
+
 body.contraste #social-icons #sb_tweet {
-    background-image: url("images/icone-twitter-branco.png");
+    background-image: url("images/icone-branco-twitter.png");
 }
-body.contraste #social-icons #sb_flickr {
-    background-image: url("images/icone-flickr.png");
+body.contraste #social-icons #sb_tweet:hover {
+    background: url("images/icone-branco-twitter.png") 0 20px;
 }
-/*body.contraste #social-icons #sb_inst {
-    background-image: url("images/icone-instagram.png");
-}*/
+body.contraste #social-icons #sb_flickr {
+    background-image: url("images/icone-branco-flickr.png");
+}
+body.contraste #social-icons #sb_flickr:hover {
+    background: url("images/icone-branco-flickr.png") 0 20px;
+}
 /* Plugin para curtir artigos e comentários */