From 09fa243f13ebbe59f44581e4775b3df01ca4449d Mon Sep 17 00:00:00 2001
From: Melissa Wen <melissa.srw@gmail.com>
Date: Sat, 6 Jun 2015 09:02:49 -0300
Subject: [PATCH] Fix left and right alignments between header's rows

---
 colab/static/css/header.css | 10 +++++++---
 colab/templates/header.html | 70 ++++++++++++++++++++++++++++++++++------------------------------------
 2 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/colab/static/css/header.css b/colab/static/css/header.css
index 0f77780..7d3c505 100644
--- a/colab/static/css/header.css
+++ b/colab/static/css/header.css
@@ -146,6 +146,10 @@
   font-family: 'Open Sans', Arial, Helvetica, sans-serif;
 }
 
+#menu-spb.collapse{
+  padding-left: 0;
+}
+
 #menu-spb > li > a{
   padding: 5px 15px 5px 5px;
 }
@@ -169,8 +173,8 @@
   background: none;
 }
 
-#quick-links{
-  padding-right: 30px
+.navbar-header.nav-spb .navbar-toggle{
+  padding: 7px 10px;
 }
 
 #quick-links > li > a{
@@ -195,7 +199,7 @@
   margin: auto;
 }
 
-.navbar-header.logo .navbar-toggle{
+.navbar-header.nav-spb .navbar-toggle{
   float: left;
   margin: 0;
 }
diff --git a/colab/templates/header.html b/colab/templates/header.html
index 3ac06d2..72fa9d7 100644
--- a/colab/templates/header.html
+++ b/colab/templates/header.html
@@ -3,12 +3,12 @@
 
 <header>
 <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; ">{% trans "Brazilian Government Portal" %}</a>
-</div>
-<script src="http://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
-<!-- end of barra-brasil -->
+  <!-- begin 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; ">{% trans "Brazilian Government Portal" %}</a>
+  </div>
+  <script src="http://barra.brasil.gov.br/barra.js" type="text/javascript" defer async></script>
+  <!-- end of barra-brasil -->
   <div id="first-nav">
     <div class="container">
       <div class="row">
@@ -110,37 +110,35 @@
   </div><!-- end of first-nav -->
   <div id="second-nav">
     <div class="container">
-      <div class="row">
-        <ul id="quick-links-sm" class="hidden-md hidden-lg">
-          <li id="link-faq">
-            <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
-          </li>
-          <li id="link-contact">
-            <a href="/social/spb/contato">{% trans "Contact" %}</a>
-          </li>
-        </ul>
-        <div class="navbar-header logo">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-        </div>
-        <ul id="menu-spb" class="nav navbar-nav navbar-collapse collapse ">
-          <li>
-            <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
-          </li>
-          {% proxy_menu %}
-        </ul>
-        <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
-          <li id="link-faq">
-            <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
-          </li>
-          <li id="link-contact">
-            <a href="/social/spb/contato">{% trans "Contact" %}</a>
-          </li>
-        </ul>
+      <ul id="quick-links-sm" class="hidden-md hidden-lg">
+        <li id="link-faq">
+          <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
+        </li>
+        <li id="link-contact">
+          <a href="/social/spb/contato">{% trans "Contact" %}</a>
+        </li>
+      </ul>
+      <div class="navbar-header nav-spb">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
       </div>
+      <ul id="menu-spb" class="nav navbar-nav navbar-collapse collapse ">
+        <li>
+          <a href="{% url 'thread_list' %}">{% trans "Groups" %}</a>
+        </li>
+        {% proxy_menu %}
+      </ul>
+      <ul id="quick-links" class="nav navbar-nav navbar-right hidden-xs hidden-sm">
+        <li id="link-faq">
+          <a href="/social/spb/ajuda">{% trans "Frequently Asked Questions" %}</a>
+        </li>
+        <li id="link-contact">
+          <a href="/social/spb/contato">{% trans "Contact" %}</a>
+        </li>
+      </ul>
     </div>
   </div>
 </div>
--
libgit2 0.21.2