Download as
Browse Code »

Commit 09fa243f13ebbe59f44581e4775b3df01ca4449d

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

Fix left and right alignments between header's rows

Showing 2 changed files with 41 additions and 39 deletions   Show diff stats
colab/static/css/header.css
  Diff comments   View file @09fa243
... ... @@ -146,6 +146,10 @@
146 146 font-family: 'Open Sans', Arial, Helvetica, sans-serif;
147 147 }
148 148  
  149 +#menu-spb.collapse{
  150 + padding-left: 0;
  151 +}
  152 +
149 153 #menu-spb > li > a{
150 154 padding: 5px 15px 5px 5px;
151 155 }
... ... @@ -169,8 +173,8 @@
169 173 background: none;
170 174 }
171 175  
172   -#quick-links{
173   - padding-right: 30px
  176 +.navbar-header.nav-spb .navbar-toggle{
  177 + padding: 7px 10px;
174 178 }
175 179  
176 180 #quick-links > li > a{
... ... @@ -195,7 +199,7 @@
195 199 margin: auto;
196 200 }
197 201  
198   -.navbar-header.logo .navbar-toggle{
  202 +.navbar-header.nav-spb .navbar-toggle{
199 203 float: left;
200 204 margin: 0;
201 205 }
... ...
colab/templates/header.html
  Diff comments   View file @09fa243
... ... @@ -3,12 +3,12 @@
3 3  
4 4 <header>
5 5 <div class="navbar navbar-static-top">
6   -<!-- begin of 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; ">{% trans "Brazilian Government Portal" %}</a>
9   -</div>
10   -<script src="http://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
11   -<!-- end of barra-brasil -->
  6 + <!-- begin 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; ">{% trans "Brazilian Government Portal" %}</a>
  9 + </div>
  10 + <script src="http://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
  11 + <!-- end of barra-brasil -->
12 12 <div id="first-nav">
13 13 <div class="container">
14 14 <div class="row">
... ... @@ -110,37 +110,35 @@
110 110 </div><!-- end of first-nav -->
111 111 <div id="second-nav">
112 112 <div class="container">
113   - <div class="row">
114   - <ul id="quick-links-sm" class="hidden-md hidden-lg">
115   - <li id="link-faq">
116   - <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
117   - </li>
118   - <li id="link-contact">
119   - <a href="/social/spb/contato">{% trans "Contact" %}</a>
120   - </li>
121   - </ul>
122   - <div class="navbar-header logo">
123   - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
124   - <span class="icon-bar"></span>
125   - <span class="icon-bar"></span>
126   - <span class="icon-bar"></span>
127   - </button>
128   - </div>
129   - <ul id="menu-spb" class="nav navbar-nav navbar-collapse collapse ">
130   - <li>
131   - <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
132   - </li>
133   - {% proxy_menu %}
134   - </ul>
135   - <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
136   - <li id="link-faq">
137   - <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
138   - </li>
139   - <li id="link-contact">
140   - <a href="/social/spb/contato">{% trans "Contact" %}</a>
141   - </li>
142   - </ul>
  113 + <ul id="quick-links-sm" class="hidden-md hidden-lg">
  114 + <li id="link-faq">
  115 + <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
  116 + </li>
  117 + <li id="link-contact">
  118 + <a href="/social/spb/contato">{% trans "Contact" %}</a>
  119 + </li>
  120 + </ul>
  121 + <div class="navbar-header nav-spb">
  122 + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
  123 + <span class="icon-bar"></span>
  124 + <span class="icon-bar"></span>
  125 + <span class="icon-bar"></span>
  126 + </button>
143 127 </div>
  128 + <ul id="menu-spb" class="nav navbar-nav navbar-collapse collapse ">
  129 + <li>
  130 + <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
  131 + </li>
  132 + {% proxy_menu %}
  133 + </ul>
  134 + <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
  135 + <li id="link-faq">
  136 + <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
  137 + </li>
  138 + <li id="link-contact">
  139 + <a href="/social/spb/contato">{% trans "Contact" %}</a>
  140 + </li>
  141 + </ul>
144 142 </div>
145 143 </div>
146 144 </div>
... ...