From c6db14c708f7a2cc29dce7b1f97f01826e6df112 Mon Sep 17 00:00:00 2001
From: Macartur Sousa <macartur.sc@gmail.com>
Date: Tue, 16 Jun 2015 18:04:26 -0300
Subject: [PATCH] Change header.html and header.css

---
 colab/proxy/noosfero/diazo.xml                                     |  1 -
 colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css |  4 ----
 colab/static/css/header.css                                        | 12 ++++++------
 colab/templates/header.html                                        | 12 ++++++------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/colab/proxy/noosfero/diazo.xml b/colab/proxy/noosfero/diazo.xml
index 2d07b24..bd1d770 100644
--- a/colab/proxy/noosfero/diazo.xml
+++ b/colab/proxy/noosfero/diazo.xml
@@ -10,7 +10,6 @@
 
     <drop css:theme="link[href^='/static/third-party/bootstrap/css/bootstrap.min']" />
     <drop css:theme="link[href^='/static/third-party/font-awesome/css/font-awesome.min']" />
-    <drop css:theme="link[href^='/static/css/screen']" />
     <drop theme="/html/head/script" />
     <drop css:content="#barra-brasil" />
     <drop css:content="#user" />
diff --git a/colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css b/colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css
index c8cef10..18877f2 100644
--- a/colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css
+++ b/colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css
@@ -672,10 +672,6 @@
 .colab-style .container:after {
   clear: both;
 }
-.colab-style .row {
-  margin-right: -15px;
-  margin-left: -15px;
-}
 .colab-style .row:before,
 .colab-style .row:after {
   display: table;
diff --git a/colab/static/css/header.css b/colab/static/css/header.css
index d72e985..1e015b5 100644
--- a/colab/static/css/header.css
+++ b/colab/static/css/header.css
@@ -25,16 +25,16 @@
   background-color: #2c66ce;
 }
 
-#portal-siteactions{
+#colab-portal-siteactions{
   font-size: 10px;
   text-align: center;
 }
 
-#portal-siteactions li{
+#colab-portal-siteactions li{
   display: inline-block;
 }
 
-#portal-siteactions a {
+#colab-portal-siteactions a {
   color:#2c66ce;
   text-decoration: none;
   text-transform: uppercase;
@@ -43,15 +43,15 @@
   padding-left: 10px;
 }
 
-#portal-siteactions #siteaction-mapadosite a{
+#colab-portal-siteactions #colab-siteaction-mapadosite a{
   padding-right: 0;
 }
 
-#portal-siteactions a:hover {
+#colab-portal-siteactions a:hover {
   color: #03316f;
 }
 
-#portal-siteactions span {
+#colab-portal-siteactions span {
   border-bottom: 1px dotted #2c66ce;
 }
 
diff --git a/colab/templates/header.html b/colab/templates/header.html
index 01c6a16..ad446f2 100644
--- a/colab/templates/header.html
+++ b/colab/templates/header.html
@@ -5,9 +5,9 @@
 <div class="navbar navbar-static-top">
 <!-- begin of barra-brasil -->
 <div id="barra-brasil">
-  <a href="http://brasil.gov.br" style="background:#7F7F7F; height: 20px; padding:4px 0 4px 10px; display: block; font-family:sans,sans-serif; text-decoration:none; color:white; ">Portal do Governo Brasileiro</a>
+  <a href="https://brasil.gov.br" style="background:#7F7F7F; height: 20px; padding:4px 0 4px 10px; display: block; font-family:sans,sans-serif; text-decoration:none; color:white; ">Portal do Governo Brasileiro</a>
 </div>
-<script src="http://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
+<script src="https://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
 <!-- end of barra-brasil -->
   <div id="first-nav">
     <div class="container">
@@ -26,14 +26,14 @@
               <a id="link-rodape" href="#link-top" accesskey="4">Ir para o rodapé <span class="label label-primary">4</span></a>
             </li>
           </ul> <!-- end of accesskeys -->
-          <ul id="portal-siteactions" class="nav navbar-nav navbar-right">
-            <li id="siteaction-accessibility">
+          <ul id="colab-portal-siteactions" class="nav navbar-nav navbar-right">
+            <li id="colab-siteaction-accessibility">
               <a href="/software-publico-brasileiro/acessibilidade"><span>Acessibilidade</span></a>
             </li>
-            <li id="siteaction-contraste">
+            <li id="colab-siteaction-contraste">
               <a href="#"><span>Alto Contraste</span></a>
             </li>
-            <li id="siteaction-mapadosite">
+            <li id="colab-siteaction-mapadosite">
               <a href="/social/spb/mapa-do-site"><span>Mapa do site</span></a>
             </li>
             <!-- begin of user-menu -->
--
libgit2 0.21.2