Download as
Browse Code »

Commit 25c4caa66c529970d1e59b3a02f7589112fb26ac

Authored by Melissa Wen
Committed by Macartur Sousa
1 parent 95d53ac4
Exists in spb-release/3.0 and in 2 other branches fix_cache_count_spb, layout-fix

Redefine footer's structure to remove horizontal scroll

Showing 2 changed files with 39 additions and 35 deletions   Show diff stats
colab/static/css/footer.css
  Diff comments   View file @25c4caa
1 1 /*Footer*/
2 2  
3 3  
4   -.footer-content{
  4 +#footer-content{
5 5 background: rgb(213,213,213);
6 6 padding: 50px 0;
7 7 font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
... ... @@ -37,54 +37,51 @@
37 37 padding-bottom: 3px
38 38 }
39 39  
40   -.footer-gov{
  40 +#footer-gov{
41 41 background: #0042b2;
42 42 }
43 43  
44   -.footer-gov > .container{
  44 +#footer-gov > .container{
45 45 padding: 2em 0;
46 46 }
47 47  
48   -.footer-gov .institucionais a{
  48 +#footer-gov .institucionais a{
49 49 display:table-cell;
50 50 vertical-align: middle;
51   - float: right;
52 51 }
53 52  
54   -.footer-gov a:hover{
  53 +#footer-gov a:hover{
55 54 text-decoration: none;
56 55 }
57 56  
58   -.footer-gov span{
  57 +#footer-gov span{
59 58 display: none;
60 59 }
61 60  
62   -.footer-gov .logo-sgpr img, .logo-acesso img{
63   - padding-top: 10px;
  61 +#logo-sgpr img, #logo-acesso img{
64 62 padding-right: 15%;
65   - padding-bottom: 10px;
66 63 }
67 64  
68   -.footer-gov .logo-brasil img{
  65 +#logo-brasil img{
69 66 padding-right: 0;
70 67 }
71 68  
72   -.go-top{
  69 +#go-top{
73 70 font-size: 13px;
74 71 height: 2em;
75 72 }
76 73  
77   -.go-top a{
  74 +#go-top a{
78 75 color: #717782;
79 76 line-height: 2em;
80 77 }
81 78  
82   -.go-top .icon-chevron-up{
  79 +#go-top .icon-chevron-up{
83 80 padding-right: 10px;
84 81 text-decoration: none;
85 82 }
86 83  
87   -.spb-definitions{
  84 +#spb-definitions{
88 85 font-size: 10px;
89 86 padding: 10px 0;
90 87 }
... ...
colab/templates/footer.html
  Diff comments   View file @25c4caa
... ... @@ -2,13 +2,10 @@
2 2 {% load static from staticfiles %}
3 3  
4 4 <footer>
5   -<div class="row">
6   - <div class="container">
7   - <div class="pull-right go-top">
8   - <a id="link-top" href="#link-rodape"><i class="icon-chevron-up"></i>{% trans "Back to top" %}</a>
9   - </div>
10   - </div><!-- end go-top -->
11   - <div class="col-lg-12 footer-content">
  5 + <div id="go-top" class="container">
  6 + <a class="pull-right" href="#header"><i class="icon-chevron-up"></i>Voltar ao topo</a>
  7 + </div><!-- end of go-top -->
  8 + <div id="footer-content">
12 9 <div class="container">
13 10 <div class="row">
14 11 <dl class="col-md-3 footer-links">
... ... @@ -41,23 +38,33 @@
41 38 </dl>
42 39 </div>
43 40 </div>
44   - </div><!-- end footer-content -->
45   - <div class="row footer-gov">
  41 + </div><!-- end of footer-links -->
  42 + <div id="footer-gov">
46 43 <div class="container">
47   - <div class="col-md-7">
48   - <a class="logo-acesso" href="http://www.acessoainformacao.gov.br/" target="_blank"><img class="img-responsive pull-left" src="{% static 'img/acesso-a-informacao.png' %}" ><span>{% trans "Information access" %}</span></a>
49   - </div>
50   - <div class="col-md-5 institucionais">
51   - <a class="logo-brasil" href="http://www.brasil.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/brasil.png' %}" ><span>{% trans "Brazil - Federal Government" %}</span></a>
52   - <a class="logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank"><img class="img-responsive" src="{% static 'img/sgpr.png' %}" ><span>{% trans "Republic Presidency General Secretary" %}</span></a>
  44 + <div class="row">
  45 + <div class="col-md-7">
  46 + <a id="logo-acesso" href="http://www.acessoainformacao.gov.br/" target="_blank"><img class="img-responsive pull-left" src="../img/acesso-a-informacao.png" ><span>Acesso a Informação</span></a>
  47 + </div>
  48 + <div class="col-md-5 institucionais">
  49 + <div class="pull-right">
  50 + <a id="logo-sgpr" href="http://www.secretariageral.gov.br/" target="_blank">
  51 + <img class="img-responsive" src="../img/sgpr.png" >
  52 + <span>{% trans "Republic Presidency General Secretary" %}</span>
  53 + </a>
  54 + <a id="logo-brasil" href="http://www.brasil.gov.br/" target="_blank">
  55 + <img class="img-responsive" src="../img/brasil.png" >
  56 + <span>{% trans "Brazil - Federal Government" %}</span>
  57 + </a>
  58 + </div>
  59 + </div>
53 60 </div>
54 61 </div>
55   - </div><!-- end footer-gov -->
56   - <div class="row spb-definitions">
  62 + </div><!-- end of footer-gov -->
  63 + <div id="spb-definitions">
57 64 <div class="container">
58 65 <div id="about-pspb">{% trans "This is a BETA version and it's hosted at University of Brasilia" %}</div>
59   - <div id="about-noosfero">{% trans "This site makes use of the social network platform" %} <a href="http://noosfero.org/">Noosfero</a>, {% trans "licensed under" %} <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> {% trans "version 3 or above" %}.
60   - </div>
  66 + <div id="about-noosfero">{% trans "This site makes use of the social network platform" %} <a href="http://noosfero.org/">Noosfero</a>, {% trans "licensed under" %}<a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> {% trans "version 3 or above" %}.
  67 + </div><!-- end id="about-noosfero" -->
61 68 </div>
62   - </div><!-- end spb-definitions -->
  69 + </div><!-- end of spb-definitions -->
63 70 </footer>
... ...