Move subnav to base header

static/styles/app.scss

@@ -10,21 +10,32 @@
 }
 
 .masthead {
-//  border-bottom: 1px solid #D6E1E5;
   padding: 10px;
-    h1 {
-			font-size: 22px;
-      margin: 10px;
-    }
+  .nav {
+    margin-top: 65px;
+  }
+  .navbar-brand {
+    color: $headings-color;
+    font-size: 24px;
     img {
       margin-right: $navbar-padding-horizontal;
     }
+    small {
+      color: #93A4AA;
+      font-size: 75%;
+      line-height: 25px;
+    }
+  }
 }
 
 .navbar {
   margin-bottom: 0;
 }
 
+.navbar-brand {
+  padding: 0px;
+}
+
 // TODO: ajust all the hx sizes from drunken parrot
 h1,
 .h1 {

templates/base.html

@@ -114,13 +114,18 @@
       {% block main_header %}
       <header class="masthead">
         <div class="container">
-          <img src="{% if logotipo %}{{ MEDIA_URL }}{{ logotipo }}{% else %}{% static 'img/logo.png' %}{% endif %}"
-               alt="Logo" class="img-responsive visible-lg-inline-block vcenter" >
-          <h1 class="vcenter">
-            {# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #}
-            {{ parliament_type }} {% trans 'de' %} {{ city }} - {{ state }}
-            <br/><small>{% trans 'Sistema de Apoio ao Processo Legislativo' %}</small>
-          </h1>
+					<div class="navbar-header">
+						<a class="navbar-brand" href="#">
+							<img src="{% if logotipo %}{{ MEDIA_URL }}{{ logotipo }}{% else %}{% static 'img/logo.png' %}{% endif %}"
+							alt="Logo" class="img-responsive visible-lg-inline-block vcenter" >
+							<span class="vcenter">
+								{# XXX Make better use of translation tags in html blocks ie. actually use the proper blocktrans tag efficiently #}
+								{{ parliament_type }} {% trans 'de' %} {{ city }} - {{ state }}
+								<br/><small>{% trans 'Sistema de Apoio ao Processo Legislativo' %}</small>
+							</span>
+						</a>
+					</div>
+					{% block sections_nav %}{% endblock %}
         </div>
       </header>
       {% endblock main_header %}
@@ -158,8 +163,6 @@
               </div>
             {% endblock base_header %}
 
-            {% block sections_nav %}{% endblock %}
-
             {# Content per se #}
             {% block base_content %}{% endblock %}
 

templates/sessao/sessaoplenaria_detail.html

@@ -3,7 +3,7 @@
 {% block actions %} {% endblock %}
 {% block sections_nav %}
 
-<ul class="nav nav-pills">
+<ul class="nav nav-pills navbar-right">
 
   <li class="dropdown">
     <a class="dropdown-toggle" data-toggle="dropdown" href="#fakeLink">