Merge pull request jupyter#176 from cameronoelsen/nav-fixes

Fixes and tweaks to navbar

Author: minrk

_includes/header.html

@@ -10,7 +10,7 @@
                     <span class="icon-bar"></span>
                 </button>
                 <a class="navbar-brand" href="{{site.baseurl}}/index.html">
-                    <img src="{{site.baseurl}}/assets/nav_logo.svg" style="height:45px;" alt="Jupyter logo">
+                    <img class="navbar-logo" src="{{site.baseurl}}/assets/nav_logo.svg" alt="Jupyter logo">
                 </a>
             </div>
             <!-- Collect the nav links, forms, and other content for toggling -->
@@ -19,18 +19,18 @@
                     {% for nav in site.data.nav.head %}
                       {% if nav.url %}
                            <li>
-                             <a href="{{site.baseurl}}{{nav.url}}" class="tab" target="_blank">{{nav.title | upcase}}</a>
+                             <a href="{{site.baseurl}}{{nav.url}}" class="tab" target="_blank">{{nav.title}}</a>
                            </li>
                       {% else %}
                         {% for targetpage in site.pages %}
                            {% if nav contains targetpage.title%}
                               {% if page.title == targetpage.title %}
                                <li>
-                                   <a href  class="tab navbar-active">{{targetpage.title| upcase}}</a>
+                                   <a href  class="tab navbar-active">{{targetpage.title}}</a>
                                </li>
                                {% else %}
                                <li>
-                                   <a href="{{site.baseurl}}{{targetpage.url}}" class="tab">{{targetpage.title| upcase}}</a>
+                                   <a href="{{site.baseurl}}{{targetpage.url}}" class="tab">{{targetpage.title}}</a>
                                </li>
                                {% endif %}
                            {% endif %}

css/logo-nav.css

@@ -20,13 +20,12 @@ body {
     color: black;
 }
 .navbar-fixed-top .navbar-brand {
-    margin-top: 5px;
     padding: 0 15px;
 }
 .navbar-header .icon-bar {
     background-color: black;
 }
-.navbar-active {
+.navbar-nav > li > .navbar-active {
     color: #E46E2E;
 }
 .navbar-scroll {
@@ -36,8 +35,12 @@ body {
     -webkit-box-shadow: 1px 1px 1px #999;
     box-shadow: 1px 1px 1px #999;
 }
+.navbar-logo {
+    height: 45px;
+}
 .nav > li > a {
-    padding: 15px 13px 10px;
+    font-size: 16px;
+    padding: 12px 16px 10px;
 }
 .nav > li > a:hover {
     background-color: transparent;
@@ -736,6 +739,10 @@ body {
     .navbar-toggle {
         padding-top: 10px;
     }
+    .navbar-logo {
+        height: 40px;
+        margin-top: 6px;
+    }
     .companies li {
         width: 30%;
     }