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

Sidney Ricardo
2 parents 12041e4f af8aac87
Showing 3 changed files with 45 additions and 17 deletions Show diff stats
cabecalho-cinza-theme.css
header.html.erb
style.css
@@ -3,7 +3,7 @@
 #theme-header{}
 #header {
-  padding: 13px 0 0 0;/*(azul-claro)*/
+  padding: 15px 0 0 0; /*13px 0 0 0;*/ 
   color: #000;
   background-color: rgb(236,237,241);
 }
@@ -42,7 +42,7 @@
   margin-right: 8px;
 }
 #accessibility a:hover {
-  color: #d0d9ff;
+  color: #969696; /*#d0d9ff;*/
 }
 #accessibility span {
@@ -58,9 +58,9 @@ background-repeat: no-repeat;
 /* Barra do Brasil */
-#barra-brasil, #wrapper-barra-brasil, #wrap-1 {
+/*#barra-brasil, #wrapper-barra-brasil, #wrap-1 {
 	min-width: 960px;
-}
+}*/
 /* logo */
 #logo {
@@ -116,7 +116,7 @@ background-repeat: no-repeat;
   display: block;
   float: right;
   clear: left;
-  border-bottom: 1px dotted #d0d9ff;
+  border-bottom: 1px dotted #969696; /*#d0d9ff;*/
   padding-bottom: 2px;
   margin-top: -15px;
   font-size: 10px;
@@ -141,7 +141,7 @@ background-repeat: no-repeat;
 }
 #portal-siteactions li a:hover {
-  color: #d0d9ff;
+  color: #969696; /*#d0d9ff;*/
 }
 #portal-siteactions li a {
   padding: 4px 0px;
@@ -150,7 +150,7 @@ background-repeat: no-repeat;
 #social-icons {
   float: right;
   clear: right;
-  margin: 0px;
+  margin: 0px 0px 17px;
 }
 #social-icons ul {
@@ -169,7 +169,7 @@ background-repeat: no-repeat;
 #siteaction-accessibility,
 #siteaction-contraste,
 li#siteaction-mapadosite {
-  margin: 0px 15px 0px 0px;
+  margin: 0px 48px 0px 0px; /*era 15*/
 }
 /* */
@@ -185,8 +185,9 @@ li#siteaction-mapadosite {
 }
 #theme-header #sobre {
-   line-height: 20px;
+   line-height: 30px;
    font-size: 12px;
+   height: 30px;
 }
@@ -197,6 +198,7 @@ li#siteaction-mapadosite {
   clear: both;
   max-width: 100% !important;
   margin: 0;
+  background-color: #999999;
   /*background: #0d4094;/*azul-mais-escuro*/
   padding: 5px 0;
 }
@@ -209,7 +211,7 @@ li#siteaction-mapadosite {
 }
 #sobre a {
-  color: rgb(96,96,96);
+  color: #ffffff; /*rgb(96,96,96);*/
   font-family: 'Open Sans', Arial, Helvetica, sans-serif;
 }
 #navbar a{
@@ -232,6 +234,14 @@ li#siteaction-mapadosite {
 }
+#links-rapidos{
+  width: 960px;
+  margin: 0 auto;
+  font-color:#fff;
+
+}
+
+
 /* Searchbox */
 .LSBox {
   margin: 0;
@@ -247,7 +257,7 @@ input.searchField {
   clear: right;
   float: right;
   font-size: 80%;
-  margin: 30px 0 14px;
+  margin: 30px 0 15px; /*30px 0 14px*/
   /*margin: 3.12em 0px 3px 0px;*/
   text-align: right;
   border-radius: 5px;
@@ -262,7 +272,7 @@ input.searchField {
   padding: 0.45em;
   border-right: none;
   border: none;
-  width: 210px; /*170px;*/
+  width: 171px; /*210px;170px;*/
 }
 #portal-searchbox form {
@@ -331,6 +341,8 @@ background-size: 100% 100%;
 /* */
 /* Social Buttons */
+
+
 #social-buttons a {
     width: 18px;
     height: 20px;
@@ -90,7 +90,7 @@
         </ul>
       </div>
-       <div id="sobre">	
+      <!-- <div id="sobre">	
 	<ul>
         <li id="link-faq">
           <a href="/ajuda/ajuda/duvidas-frequentes">Perguntas frequentes</a>
@@ -99,11 +99,23 @@
           <a href="/contact/portal/new">Contato</a>
         </li>
       </ul>
-    </div>
+    </div> 
-    </div>
+    </div> -->
   </div>
+
+  <div id="sobre"> 
+  <ul id="links-rapidos">
+        <li id="link-faq">
+          <a href="/ajuda/ajuda/duvidas-frequentes">Perguntas frequentes</a>
+        </li>
+        <li id="link-contact">
+          <a href="/contact/portal/new">Contato</a>
+        </li>
+      </ul>
+  </div>
+
 </div>
@@ -54,7 +54,7 @@
     margin: auto;
     width: 100%;
 }
-
+/*
 #barra-brasil {
     z-index: 99;
      width: 100%;
@@ -65,7 +65,7 @@ div#wrapper-barra-brasil {
     width: 960px;
     font-family: Arial, Helvetica, sans-serif !important;
 }
-
+*/
 /****************** Estilos basicos ******************/
@@ -1304,6 +1304,10 @@ input.button.with-text {
 }
 /*track list nos blocos laterais*/
+.box-2{
+  width:150px;
+}
+
 .box-2 .track_list .item_card,
 .box-3 .track_list .item_card {
     margin: 10px 0px;