Download as
Browse Code »

Commit c6db14c708f7a2cc29dce7b1f97f01826e6df112

Authored by Macartur Sousa
1 parent d2dee827
Exists in spb-release/3.0 and in 2 other branches fix_cache_count_spb, layout-fix

Change header.html and header.css 

Changed all http to https
Removed diazo drop css/screen
Changed classes siteactions from header
Showing 4 changed files with 12 additions and 17 deletions   Show diff stats
colab/proxy/noosfero/diazo.xml
  Diff comments   View file @c6db14c
@@ -10,7 +10,6 @@ @@ -10,7 +10,6 @@
10 10
11 <drop css:theme="link[href^='/static/third-party/bootstrap/css/bootstrap.min']" /> 11 <drop css:theme="link[href^='/static/third-party/bootstrap/css/bootstrap.min']" />
12 <drop css:theme="link[href^='/static/third-party/font-awesome/css/font-awesome.min']" /> 12 <drop css:theme="link[href^='/static/third-party/font-awesome/css/font-awesome.min']" />
13 - <drop css:theme="link[href^='/static/css/screen']" />  
14 <drop theme="/html/head/script" /> 13 <drop theme="/html/head/script" />
15 <drop css:content="#barra-brasil" /> 14 <drop css:content="#barra-brasil" />
16 <drop css:content="#user" /> 15 <drop css:content="#user" />
colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css
  Diff comments   View file @c6db14c
@@ -672,10 +672,6 @@ @@ -672,10 +672,6 @@
672 .colab-style .container:after { 672 .colab-style .container:after {
673 clear: both; 673 clear: both;
674 } 674 }
675 -.colab-style .row {  
676 - margin-right: -15px;  
677 - margin-left: -15px;  
678 -}  
679 .colab-style .row:before, 675 .colab-style .row:before,
680 .colab-style .row:after { 676 .colab-style .row:after {
681 display: table; 677 display: table;
colab/static/css/header.css
  Diff comments   View file @c6db14c
@@ -25,16 +25,16 @@ @@ -25,16 +25,16 @@
25 background-color: #2c66ce; 25 background-color: #2c66ce;
26 } 26 }
27 27
28 -#portal-siteactions{ 28 +#colab-portal-siteactions{
29 font-size: 10px; 29 font-size: 10px;
30 text-align: center; 30 text-align: center;
31 } 31 }
32 32
33 -#portal-siteactions li{ 33 +#colab-portal-siteactions li{
34 display: inline-block; 34 display: inline-block;
35 } 35 }
36 36
37 -#portal-siteactions a { 37 +#colab-portal-siteactions a {
38 color:#2c66ce; 38 color:#2c66ce;
39 text-decoration: none; 39 text-decoration: none;
40 text-transform: uppercase; 40 text-transform: uppercase;
@@ -43,15 +43,15 @@ @@ -43,15 +43,15 @@
43 padding-left: 10px; 43 padding-left: 10px;
44 } 44 }
45 45
46 -#portal-siteactions #siteaction-mapadosite a{ 46 +#colab-portal-siteactions #colab-siteaction-mapadosite a{
47 padding-right: 0; 47 padding-right: 0;
48 } 48 }
49 49
50 -#portal-siteactions a:hover { 50 +#colab-portal-siteactions a:hover {
51 color: #03316f; 51 color: #03316f;
52 } 52 }
53 53
54 -#portal-siteactions span { 54 +#colab-portal-siteactions span {
55 border-bottom: 1px dotted #2c66ce; 55 border-bottom: 1px dotted #2c66ce;
56 } 56 }
57 57
colab/templates/header.html
  Diff comments   View file @c6db14c
@@ -5,9 +5,9 @@ @@ -5,9 +5,9 @@
5 <div class="navbar navbar-static-top"> 5 <div class="navbar navbar-static-top">
6 <!-- begin of barra-brasil --> 6 <!-- begin of barra-brasil -->
7 <div id="barra-brasil"> 7 <div id="barra-brasil">
8 - <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> 8 + <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>
9 </div> 9 </div>
10 -<script src="http://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script> 10 +<script src="https://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
11 <!-- end of barra-brasil --> 11 <!-- end of barra-brasil -->
12 <div id="first-nav"> 12 <div id="first-nav">
13 <div class="container"> 13 <div class="container">
@@ -26,14 +26,14 @@ @@ -26,14 +26,14 @@
26 <a id="link-rodape" href="#link-top" accesskey="4">Ir para o rodapé <span class="label label-primary">4</span></a> 26 <a id="link-rodape" href="#link-top" accesskey="4">Ir para o rodapé <span class="label label-primary">4</span></a>
27 </li> 27 </li>
28 </ul> <!-- end of accesskeys --> 28 </ul> <!-- end of accesskeys -->
29 - <ul id="portal-siteactions" class="nav navbar-nav navbar-right">  
30 - <li id="siteaction-accessibility"> 29 + <ul id="colab-portal-siteactions" class="nav navbar-nav navbar-right">
  30 + <li id="colab-siteaction-accessibility">
31 <a href="/software-publico-brasileiro/acessibilidade"><span>Acessibilidade</span></a> 31 <a href="/software-publico-brasileiro/acessibilidade"><span>Acessibilidade</span></a>
32 </li> 32 </li>
33 - <li id="siteaction-contraste"> 33 + <li id="colab-siteaction-contraste">
34 <a href="#"><span>Alto Contraste</span></a> 34 <a href="#"><span>Alto Contraste</span></a>
35 </li> 35 </li>
36 - <li id="siteaction-mapadosite"> 36 + <li id="colab-siteaction-mapadosite">
37 <a href="/social/spb/mapa-do-site"><span>Mapa do site</span></a> 37 <a href="/social/spb/mapa-do-site"><span>Mapa do site</span></a>
38 </li> 38 </li>
39 <!-- begin of user-menu --> 39 <!-- begin of user-menu -->