Fixed bugs associated with navbar, refined jumbotron design

Author: cameronoelsen

_includes/header.html

@@ -1,18 +1,19 @@
-<nav class="navbar navbar-fixed-top {% if page.navbar_gray %}navbar-gray{%endif%} {% if page.url == '/' | page.url == '/index.html' %}jupytercon-navbar{% endif %}" role="navigation" id="navbar" >
+<nav class="navbar navbar-fixed-top {% if page.navbar_gray %}navbar-gray{%endif%} {% if page.url == '/' || page.url == '/index.html' %}jupytercon-navbar{% endif %}" role="navigation" id="navbar" >
         <div class="navbar-inner">
         <div class="container">
             <!-- Brand and toggle get grouped for better mobile display -->
             <div class="navbar-header">
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
                     <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
+                    <span class="icon-bar {% if page.url == '/' || page.url == '/index.html' %}white-icon-bar{% endif %}"></span>
+                    <span class="icon-bar {% if page.url == '/' || page.url == '/index.html' %}white-icon-bar{% endif %}"></span>
+                    <span class="icon-bar {% if page.url == '/' || page.url == '/index.html' %}white-icon-bar{% endif %}"></span>
                 </button>
                 <a class="navbar-brand" href="{{site.baseurl}}/index.html">
-                    <img class="navbar-logo" src="{% if page.url == '/' | page.url == '/index.html' %}{{site.baseurl}}/assets/white_nav_logo.svg{% else %}{{site.baseurl}}/assets/nav_logo.svg{%endif%}" alt="Jupyter logo">
+                    <img id="jupyter-nav-logo" class="navbar-logo" src="{% if page.url == '/' | page.url == '/index.html' %}{{site.baseurl}}/assets/white_nav_logo.svg{% else %}{{site.baseurl}}/assets/nav_logo.svg{%endif%}" alt="Jupyter logo">
                 </a>
             </div>
+            <div class="blur"></div>
             <!-- Collect the nav links, forms, and other content for toggling -->
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav navbar-right {% if page.url == '/' | page.url == '/index.html' %}jupytercon-nav{% endif %}">

css/logo-nav.css

@@ -35,6 +35,9 @@ body {
     -webkit-box-shadow: 1px 1px 1px #999;
     box-shadow: 1px 1px 1px #999;
 }
+.jupytercon-nav > li > .black-tab {
+    color: black;
+}
 .navbar-logo {
     height: 45px;
 }
@@ -554,12 +557,13 @@ body {
     margin-top: 0px;
     position: relative;
     top: -70px;
+    margin-bottom: -70px;
 }
 #jupytercon-logo {
     display: block;
     margin: 0 auto;
     width: 500px;
-    margin-top: 48px;
+    margin-top: 60px;
 }
 .jupytercon-header, .jupytercon-subheader  {
     color: white;
@@ -576,6 +580,10 @@ body {
     display: block;
     text-align: center;
     margin-top: 60px;
+    margin-bottom: 20px;
+}
+.navbar-toggle > .white-icon-bar {
+    background-color: white;
 }
 
 /* Bootstrap Breakpoint Media Queries */
@@ -794,7 +802,6 @@ body {
     }
     .jupytercon-jumbotron {
         margin-right: 0px;
-        margin-bottom: 0px;
     }
 }
 /* Extra small devices (these are mostly fixes to make sure elements act correctly to look good) */

js/scroll.js

@@ -1,20 +1,51 @@
-$(window).on("scroll", function () {
-    if ($(this).scrollTop() > 200) {
-        $(".navbar").addClass("transparent");
-        // $(".navbar").stop().animate({opacity: 0});
-    }
-    else {
-        $(".navbar").removeClass("transparent");
-        // $(".navbar").stop().animate({opacity: 1});
-    }
-});
-$(window).on("scroll", function () {
-    if ($(this).scrollTop() > 0) {
-        $(".navbar").addClass("navbar-scroll");
-        // $(".navbar").stop().animate({opacity: 0});
-    }
-    else {
-        $(".navbar").removeClass("navbar-scroll");
-        // $(".navbar").stop().animate({opacity: 1});
-    }
+$(document).ready(function() {
+    $(window).bind('resize', function() {
+        if (window.location.pathname == '/' || window.location.pathname == '/index.html') {
+            if (window.outerWidth < 768) {
+                $('.navbar').removeClass('jupytercon-navbar');
+                $('.tab').addClass('black-tab');
+                document.getElementById('jupyter-nav-logo').src = '/assets/nav_logo.svg';
+                $('.icon-bar').removeClass('white-icon-bar');
+            }
+            else {
+                console.log(window.location.pathname);
+                $('.navbar').addClass('jupytercon-navbar');
+                $('.tab').removeClass('black-tab');
+                document.getElementById('jupyter-nav-logo').src = '/assets/white_nav_logo.svg';
+                $('.icon-bar').addClass('white-icon-bar');   
+            }
+        }  
+    });
+    $(window).on("scroll", function () {
+        if ($(this).scrollTop() > 0) {
+            $(".navbar").addClass("navbar-scroll");
+            // $(".navbar").stop().animate({opacity: 0});
+        
+            // For JupyterCon Custom Navbar
+            if (window.location.pathname == '/' || window.location.pathname == '/index.html') {
+                $('.navbar').removeClass('jupytercon-navbar');
+                $('.tab').addClass('black-tab');
+                document.getElementById('jupyter-nav-logo').src = '/assets/nav_logo.svg';
+                $('.icon-bar').removeClass('white-icon-bar');
+            }
+        }
+        else {
+            $(".navbar").removeClass("navbar-scroll");
+            // $(".navbar").stop().animate({opacity: 1});
+        
+            // For JupyterCon Custom Navbar
+            if (window.location.pathname == '/' || window.location.pathname == '/index.html') {
+                if (window.outerWidth < 768) {
+                    $('.navbar').removeClass('jupytercon-navbar');
+                }
+                else {
+                    console.log(window.location.pathname);
+                    $('.navbar').addClass('jupytercon-navbar');
+                    $('.tab').removeClass('black-tab');
+                    document.getElementById('jupyter-nav-logo').src = '/assets/white_nav_logo.svg';
+                    $('.icon-bar').addClass('white-icon-bar');   
+                }
+            }
+        }
+    }); 
 });