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

Juliana
2 parents 08bce909 f16980d1
Showing 3 changed files with 76 additions and 14 deletions Show diff stats
cabecalho-cinza-theme.css
footer.html.erb
style.css
@@ -89,7 +89,7 @@ background-repeat: no-repeat;
 #logo #portal-title {
     background-image: url("images/logotipo_spb_beta.svg");
 	background-repeat: no-repeat;
-	background-size: 374px 78px;
+	background-size: 374px 56px;
 	height: 78px;
 	width: 374px;
   	margin: 20px 0px 10px 0px;
@@ -397,6 +397,71 @@ opacity: 1;
 filter: alpha(opacity=100);
 }
+
+
+/* */
+
+/* Social Box */
+
+#social-box {
+    border-top: 4px solid #2c66ce;
+}
+
+
+#social-buttons a {
+    width: 18px;
+    height: 20px;
+    margin-right: 3px;
+    margin-top: 10px;
+}
+
+#social-box li a {
+    width: 20px;
+    height: 20px;
+    padding: 0px;
+    display: inline-block;
+    opacity: .85;
+    background-repeat: no-repeat;
+    margin-right: 8px;
+}
+
+#social-box li {
+    float: left;
+    margin: 8px;
+    padding-top: 10px;
+    vertical-align: middle;
+}
+
+#sb_face,
+#sb_tweet,
+#sb_youtb,
+#sb_flickr {
+  background: url(images/icones_home_branco.jpg) 0px;
+
+}
+
+#social-box span { display: none; }
+
+#sb_flickr {
+background-position: -100px;
+}
+
+#sb_face {
+background-position: -12px;
+}
+#sb_tweet {
+background-position: -42px;
+}
+#sb_youtb {
+  background-position: -71px;
+}
+
+#social-box a:focus, 
+#social-box a:hover {
+opacity: 1;
+filter: alpha(opacity=100);
+}
+
 /*
 #social-icons #sb_face {
@@ -738,9 +803,11 @@ text-decoration:underline
 footer .container-menus {
 /*padding:46px 0 0 0*/
 }
+
 footer .row {
-margin-bottom: 46px; /*13px*/
+	margin-bottom: 20px;
 }
+
 footer nav {
 border-left:1px dotted #2c66ce; /*#555;*/ /*#dbdbc8;*/
 padding:0 5px 0 10px
@@ -751,7 +818,7 @@ font-weight:bold;
 color: #2c66ce; /*#3b3f44;*/
 line-height:1.3em;
 padding: 0px; /*30px 0 0px 0;*/
-margin: 0 0 18px 0;
+margin: 0 0 8px 0;
 }
 footer nav ul {
@@ -82,17 +82,9 @@
                <span class="hide">Fim da navegação de rodapé</span>
              </div>
              <!-- fim .row -->
-         <!-- </div>
+		  </div>
           <!-- fim .container2 -->
-         <div class="footer-logos">
-         <!--   <div class="container2">
-   <a href="http://www.acessoainformacao.gov.br/" class="logo-acesso pull-left"><img src="{{ STATIC_URL }}img/acesso-a-informacao.png" alt="Acesso a Informação"></a> -->
-   <!-- separador para fins de acessibilidade -->
-   <span class="hide">&nbsp;</span>
-   <!-- fim separador para fins de acessibilidade -->
-          <!--     <a href="http://www.brasil.gov.br/" class="brasil pull-right"><img src="{{ STATIC_URL }}img/brasil.png" alt="Brasil - Governo Federal"></a> -->
-            </div>
-         </div>
+
           <div class="footer-atalhos visible-phone">
              <div class="container2">
@@ -1112,7 +1112,9 @@ div#article-parent {
 .pagination .prev_page{margin-right: 0.5em; font-weight: bold;}
 .pagination .next_page{margin-left: 0.5em; font-weight: bold;}
-
+#profile-header {
+	position: absolute; /* Corrige link de login  */
+}
 #public-profile-search, #profile-search-results form, .profile-search-block form {
  background-color: transparent;
@@ -1121,6 +1123,7 @@ div#article-parent {
 #public-profile-search .search-field .formfield {
     float: left;
 }
+
 #public-profile-search .search-field .formfield input {
     margin-top: 0px;
 }
	@@ -89,7 +89,7 @@ background-repeat: no-repeat;		@@ -89,7 +89,7 @@ background-repeat: no-repeat;
89	#logo #portal-title {	89	#logo #portal-title {
90	background-image: url("images/logotipo_spb_beta.svg");	90	background-image: url("images/logotipo_spb_beta.svg");
91	background-repeat: no-repeat;	91	background-repeat: no-repeat;
92	- background-size: 374px 78px;	92	+ background-size: 374px 56px;
93	height: 78px;	93	height: 78px;
94	width: 374px;	94	width: 374px;
95	margin: 20px 0px 10px 0px;	95	margin: 20px 0px 10px 0px;
	@@ -397,6 +397,71 @@ opacity: 1;		@@ -397,6 +397,71 @@ opacity: 1;
397	filter: alpha(opacity=100);	397	filter: alpha(opacity=100);
398	}	398	}
399		399
		400	+
		401	+
		402	+/* */
		403	+
		404	+/* Social Box */
		405	+
		406	+#social-box {
		407	+ border-top: 4px solid #2c66ce;
		408	+}
		409	+
		410	+
		411	+#social-buttons a {
		412	+ width: 18px;
		413	+ height: 20px;
		414	+ margin-right: 3px;
		415	+ margin-top: 10px;
		416	+}
		417	+
		418	+#social-box li a {
		419	+ width: 20px;
		420	+ height: 20px;
		421	+ padding: 0px;
		422	+ display: inline-block;
		423	+ opacity: .85;
		424	+ background-repeat: no-repeat;
		425	+ margin-right: 8px;
		426	+}
		427	+
		428	+#social-box li {
		429	+ float: left;
		430	+ margin: 8px;
		431	+ padding-top: 10px;
		432	+ vertical-align: middle;
		433	+}
		434	+
		435	+#sb_face,
		436	+#sb_tweet,
		437	+#sb_youtb,
		438	+#sb_flickr {
		439	+ background: url(images/icones_home_branco.jpg) 0px;
		440	+
		441	+}
		442	+
		443	+#social-box span { display: none; }
		444	+
		445	+#sb_flickr {
		446	+background-position: -100px;
		447	+}
		448	+
		449	+#sb_face {
		450	+background-position: -12px;
		451	+}
		452	+#sb_tweet {
		453	+background-position: -42px;
		454	+}
		455	+#sb_youtb {
		456	+ background-position: -71px;
		457	+}
		458	+
		459	+#social-box a:focus,
		460	+#social-box a:hover {
		461	+opacity: 1;
		462	+filter: alpha(opacity=100);
		463	+}
		464	+
400	/*	465	/*
401		466
402	#social-icons #sb_face {	467	#social-icons #sb_face {
	@@ -738,9 +803,11 @@ text-decoration:underline		@@ -738,9 +803,11 @@ text-decoration:underline
738	footer .container-menus {	803	footer .container-menus {
739	/padding:46px 0 0 0/	804	/padding:46px 0 0 0/
740	}	805	}
		806	+
741	footer .row {	807	footer .row {
742	-margin-bottom: 46px; /13px/	808	+ margin-bottom: 20px;
743	}	809	}
		810	+
744	footer nav {	811	footer nav {
745	border-left:1px dotted #2c66ce; /#555;/ /#dbdbc8;/	812	border-left:1px dotted #2c66ce; /#555;/ /#dbdbc8;/
746	padding:0 5px 0 10px	813	padding:0 5px 0 10px
	@@ -751,7 +818,7 @@ font-weight:bold;		@@ -751,7 +818,7 @@ font-weight:bold;
751	color: #2c66ce; /#3b3f44;/	818	color: #2c66ce; /#3b3f44;/
752	line-height:1.3em;	819	line-height:1.3em;
753	padding: 0px; /30px 0 0px 0;/	820	padding: 0px; /30px 0 0px 0;/
754	-margin: 0 0 18px 0;	821	+margin: 0 0 8px 0;
755	}	822	}
756		823
757	footer nav ul {	824	footer nav ul {