From 139deaf6b80b74ca4220bcc25f399fc4ec78a622 Mon Sep 17 00:00:00 2001
From: Audrey Roy Greenfeld <aroy@alum.mit.edu>
Date: Sun, 30 Aug 2015 15:41:46 -0700
Subject: [PATCH] Put <nav> into a div with a nicer-displaying bottom margin.

---
 .../static/css/project.css                    |  5 ++
 .../static/sass/project.scss                  |  5 ++
 .../templates/base.html                       | 50 ++++++++++---------
 3 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css
index 4162d5de..40432d7e 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/css/project.css
@@ -32,3 +32,8 @@
   background-color: #f2dede;
   border-color: #eed3d7;
 }
+
+/* line 36, ../sass/project.scss */
+.navbar-header {
+  margin-bottom: 3rem;
+}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/sass/project.scss b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/sass/project.scss
index 99554ec2..29a69638 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/sass/project.scss
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/static/sass/project.scss
@@ -31,3 +31,8 @@
   background-color: #f2dede;
   border-color: #eed3d7;
 }
+
+// Give header a nice bottom margin
+.navbar-header {
+  margin-bottom: 3rem;
+}
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html
index e15f51ba..3a15a4c3 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/base.html
@@ -30,33 +30,35 @@
   </head>
 
   <body>
-
-    <nav class="navbar navbar-dark navbar-static-top bg-inverse">
-      <div class="container">
-        <a class="navbar-brand" href="/">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a>
-        <button type="button" class="navbar-toggler hidden-sm-up pull-right" data-toggle="collapse" data-target="#bs-navbar-collapse-1">
-          &#9776;
-        </button>
+    
+    <div class="navbar-header">
+      <nav class="navbar navbar-dark navbar-static-top bg-inverse">
+        <div class="container">
+          <a class="navbar-brand" href="/">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a>
+          <button type="button" class="navbar-toggler hidden-sm-up pull-right" data-toggle="collapse" data-target="#bs-navbar-collapse-1">
+            &#9776;
+          </button>
           
-        <!-- Collect the nav links, forms, and other content for toggling -->
-        <div class="collapse navbar-toggleable-xs" id="bs-navbar-collapse-1">
-          <ul class="nav navbar-nav">
-            <li class="nav-item"><a class="nav-link" href="{% url 'home' %}">Home</a></li>
-            <li class="nav-item"><a class="nav-link" href="{% url 'about' %}">About</a></li>
-          </ul>
+          <!-- Collect the nav links, forms, and other content for toggling -->
+          <div class="collapse navbar-toggleable-xs" id="bs-navbar-collapse-1">
+            <ul class="nav navbar-nav">
+              <li class="nav-item"><a class="nav-link" href="{% url 'home' %}">Home</a></li>
+              <li class="nav-item"><a class="nav-link" href="{% url 'about' %}">About</a></li>
+            </ul>
         
-          <ul class="nav navbar-nav pull-right">
-            {% if request.user.is_authenticated %}
-              <li class="nav-item"><a class="nav-link" href="{% url 'users:detail' request.user.username  %}">{% trans "My Profile" %}</a></li>
-              <li class="nav-item"><a class="nav-link" href="{% url 'account_logout' %}">{% trans "Logout" %}</a></li>
-            {% else %}
-              <li class="nav-item"><a class="nav-link" href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a></li>
-              <li class="nav-item"><a class="nav-link" href="{% url 'account_login' %}">{% trans "Log In" %}</a></li>
-            {% endif %}
-          </ul>
+            <ul class="nav navbar-nav pull-right">
+              {% if request.user.is_authenticated %}
+                <li class="nav-item"><a class="nav-link" href="{% url 'users:detail' request.user.username  %}">{% trans "My Profile" %}</a></li>
+                <li class="nav-item"><a class="nav-link" href="{% url 'account_logout' %}">{% trans "Logout" %}</a></li>
+              {% else %}
+                <li class="nav-item"><a class="nav-link" href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a></li>
+                <li class="nav-item"><a class="nav-link" href="{% url 'account_login' %}">{% trans "Log In" %}</a></li>
+              {% endif %}
+            </ul>
+          </div>
         </div>
-      </div>
-    </nav>
+      </nav>
+    </div>
 
     <div class="container">
 
