jumbo-jekyll-theme 2.5.0 → 3.0.0

data/_sass/core/universal-nav.scss

@@ -9,6 +9,7 @@ nav#universal-nav {
     z-index:9999;
 }
 
+
 #universal-nav.navbar-default .navbar-nav>li>a{
     color: #fefefe;
     font-size: 12px;
@@ -49,10 +50,11 @@ nav#universal-nav {
     padding-right:5px;
 }
 
-#universal-nav div#navbar-collapse {
+#universal-nav .navbar-collapse {
     margin-top:0px;
     top:0px;
-    background-color:white;
+    height:auto;
+    max-height:none;
 }
 
 
@@ -136,16 +138,21 @@ a.dropdown-toggle {}
 
 // Mobile Styles
 @media(max-width:$screen-sm-min - 1){
+    #universal-nav .navbar-collapse {
+        margin-top:0px;
+        top:0px;
+        height:auto;
+        max-height:none;
+        background-color:black;
+    }
     #universal-nav div#navbar {
-        background-color: white;
-        color: black;
-        z-index:9999999;
+        background-color: black;
+        color: white;
+        z-index: 9999999;
         position: absolute;
-        top:31px;
-        width:100%;
-    }
-    #universal-nav.navbar-default .navbar-nav>li>a{
-        color: #000000;
+        top: 36px;
+        overflow-y: scroll;
+        width: 100%;
     }
     #universal-nav.navbar-default .navbar-nav>li>a:hover{
         color: black;

data/_sass/home.scss

@@ -3,4 +3,3 @@
 @import "core/animations";
 @import "core/carousel-styles";
 @import 'core/homepage';
-@import "core/twitter-feed";

data/assets/css/{main-404.scss → main-error.scss}

@@ -3,16 +3,12 @@
 @charset "UTF-8";
 // App Overrides - Sass variables
 @import "app/overrides";
-
 //Boostrap Includes
 @import 'bootstrap';
 @import 'bootstrap/variables';
-
 // Core Theme
 @import 'core';
-
 //Additional Core includes
-@import "core/404";
-
+@import "core/error";
 // App Includes
 @import "app/custom";

data/assets/js/app/facebook.js

@@ -5,4 +5,4 @@
   js = d.createElement(s); js.id = id;
   js.src = "//connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v2.9&appId=155006367915796";
   fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));</script> -->
+}(document, 'script', 'facebook-jssdk'));</script> -->

data/assets/js/app/main.js

@@ -1,20 +1,8 @@
-$(document).mouseup(function(e) 
-{
-    var search_container = $("div#search_bar");    
-    // if the target of the click isn't the container nor a descendant of the container
-    if (!search_container.is(e.target) && search_container.has(e.target).length === 0) 
-    {
-        search_container.hide();
-    }
-});
-
 // Hide all navigation sub menus on window click
 $(window).click(function() {
     $(".dropdown-submenu.sub-menu > .dropdown-menu.sub-menu").hide();
 });
-
 $(document).ready(function () {
-    
     // Toggle the sub menu when clicked.
     $('.dropdown-submenu.sub-menu a').on("click", function(e){
         if($(this).hasClass("active")){
@@ -29,56 +17,46 @@ $(document).ready(function () {
         }
         e.stopPropagation();
     });
-    
-    // Sticky Nav for the universal/main navigation bars
-    if($("#universal-nav")){
-        var stickyOffset = $('#main-navigation').offset().top;
+    // Navigation bar setup
+    var wrapper = $('#wrapper');
+    var universalNav = false;
+    var universalNavHeight = 0;
+    if("#universal-nav".length>0){
         var universalNav = $('#universal-nav');
-        var wrapper = $('#wrapper');
-
-        $(window).scroll(function(){
-            
-            var sticky = $('#main-navigation'),
-            scroll = $(window).scrollTop();
+        var universalNavHeight = $("#universal-nav").height();
+    }
+    var stickyOffset = $('#main-navigation').offset().top;
+    var wrapper = $('#wrapper');
+    function navbar(){
+        var sticky = $('#main-navigation'),
+        scroll = $(window).scrollTop();
 
-            if (scroll >= stickyOffset) 
-            {
-              sticky.removeClass('navbar-static');
-              wrapper.css('margin-top', $('#main-navigation').height() + universalNav.height());
-              universalNav.hide();
-              sticky.addClass('navbar-fixed-top');
-            }   
-            else 
-            {
-                sticky.removeClass('navbar-fixed-top');
-                wrapper.css('margin-top', '0px');
+        if (scroll >= stickyOffset) 
+        {
+            sticky.removeClass('navbar-static');
+            wrapper.css('margin-top', $('#main-navigation').height() + universalNavHeight);
+            if(universalNav){
+            universalNav.hide();
+            }
+            sticky.addClass('navbar-fixed-top');
+        }   
+        else 
+        {
+            sticky.removeClass('navbar-fixed-top');
+            wrapper.css('margin-top', '0px');
+            if(universalNav){
                 universalNav.slideDown("fast");
-                sticky.addClass('navbar-static');
             }
-            
-        });
+            sticky.addClass('navbar-static');
+        }
     }
-
-    
-    $('.dropdown-toggle').dropdown();
-    var search_bar = $("div#search_bar");
-    var search_icon = $("a#search_icon");
-    var search_close = $("button#search_close");
-    var search_search = $("button#search_search");
-    var search_form = $("form#search_form");
-    var search_hidden_input = $("div#search_bar input[type='hidden']");
-    
-    var nav_light = $('nav.nav-light');
-    
-    $("a#search_icon").click(function() {
-        search_bar.css('display','block');
-    });
-    
-    $("button#search_close").click(function() {
-        search_form.trigger('reset');
-        search_bar.css('display','none');
+    navbar();
+    $(window).scroll(function(){
+        navbar();
     });
-    
+    // Initialise dropdowns
+    $('.dropdown-toggle').dropdown();
+
     //Reset form when bootstrap modal closes.
     $('.modal').on('hidden.bs.modal', function(){
         $(this).find('form')[0].reset();
@@ -92,12 +70,10 @@ $(document).ready(function () {
     $('#stacked-nav-bar').on('hidden.bs.collapse', function() {
         $('.nav-pills').removeClass('nav-stacked');
     });
-    
-    
     $("a.dev-services").click(function(){
         $("#developer-services-contact-modal").modal('show');
     });
-    
+
     //Scrolling sticking on IOS7
     if (navigator.userAgent.match(/.*CPU.*OS 7_\d/i)){$('html').addClass('ios7');}
     
@@ -116,7 +92,6 @@ $(document).ready(function () {
         }
         menu.css({ left:newpos });
     });
-    
     // Remove any zoom class added to body 
     $('body').css('zoom', '');
     
@@ -129,7 +104,6 @@ $(document).ready(function () {
            }
        }
     });
-    
     // Enabled permalinks to specific Bootstrap tabs
     var hash = document.location.hash;
     if (hash) {
@@ -139,5 +113,51 @@ $(document).ready(function () {
     $('.nav-tabs a').on('shown', function (e) {
         window.location.hash = e.target.hash.replace("#", "#" + prefix);
     });
-    
+    var cHeight = 0;
+
+    $('#header-carousel').on('slide.bs.carousel', function (e) {
+        var $nextImage = null;
+
+        $activeItem = $('.item.active', this);
+
+        if (e.direction == 'left'){
+            $nextImage = $activeItem.next('.item');
+        } else {
+            if ($activeItem.index() == 0){
+                $nextImage = $('div:last', $activeItem.parent());
+            } else {
+                $nextImage = $activeItem.prev('.item');
+            }
+        }
+
+        // prevents the slide decrease in height
+        if (cHeight == 0) {
+            cHeight = $(this).height();
+            $activeItem.next('.item').height(cHeight);
+        }
+
+        // prevents the loaded image if it is already loaded
+        var src = $nextImage.attr('data-src');
+        console.log(src);
+
+        if (typeof src !== "undefined" && src != "") {
+        $nextImage.css('background-image', 'url(' + src + ')');
+        $nextImage.data('data-src', '');
+        }
+    });
+    // Cookie Consent Setup
+    window.addEventListener("load", function(){
+    window.cookieconsent.initialise({
+        "palette": {
+        "popup": {
+            "background": "#000000",
+            "text": "#fff"
+        },
+        "button": {
+            "background": "transparent",
+            "text": "#ffffff",
+            "border": "#25cfb0"
+        }
+        }
+    })});
 });

data/assets/js/app/search.js

@@ -0,0 +1,29 @@
+// JS file for main search bar
+$(document).ready(function(){
+    var search_bar = $("div#search_bar");
+    var search_icon = $("a#search_icon");
+    var search_close = $("button#search_close");
+    var search_search = $("button#search_search");
+    var search_form = $("form#search_form");
+    var search_hidden_input = $("div#search_bar input[type='hidden']");
+    
+    var nav_light = $('nav.nav-light');
+    
+    $("a#search_icon").click(function() {
+        search_bar.css('display','block');
+    });
+    
+    $("button#search_close").click(function() {
+        search_form.trigger('reset');
+        search_bar.css('display','none');
+    });
+});
+$(document).mouseup(function(e) 
+{
+    var search_container = $("div#search_bar");    
+    // if the target of the click isn't the container nor a descendant of the container
+    if (!search_container.is(e.target) && search_container.has(e.target).length === 0) 
+    {
+        search_container.hide();
+    }
+});

data/assets/js/app/sticky-tab-bar.js

@@ -5,7 +5,11 @@ $(document).ready(function(){
 
     if(menu.length){
 
+        
         var origOffsetY = menu.offset().top;
+        if($("#universal-nav").length > 0){
+            origOffsetY = origOffsetY - 20;
+        }
         var navHeight = $("nav#main-navigation").height;
 
         var text = $('#tabbed-nav-bar ul.nav-tabs li.active a').text();
@@ -15,25 +19,28 @@ $(document).ready(function(){
             var text = $('#tabbed-nav-bar ul.nav-tabs li.active a').text();
             $('#sub-navigation-header').text(text);
             $('#sub-navigation-header').hide();
+            $('#content-container').css('padding-top','20px');
+            $('#wrapper').css('padding-top','0px');
 
-
-            if ( $(window).scrollTop() > origOffsetY) {
+            console.log($(window).scrollTop(),origOffsetY);
+            if ( $(window).scrollTop() >= origOffsetY) {
                 $('#tabbed-nav-bar').removeClass('non-sticky-nav');
                 $('#tabbed-nav-bar').addClass('sticky-nav');
                 $("nav#main-navigation").hide();
-                $('#wrapper').css('margin-top','67px');
-                if ($(window).width() < 1000) {
+                $('#wrapper').css('top','166px');
+                $('#wrapper').css('margin-top','0px');
+                $('#wrapper').css('position','relative');
+                $('#content-container').css('padding-top','45px');
+                console.log($(window).width());
+                if ($(window).width() < 768) {
                     $('#tabbed-nav-bar nav').removeClass('navbar-default');
                     $('#tabbed-nav-bar nav').addClass('navbar-inverse');
-
-
                     $('#tabbed-nav-bar ul.nav-tabs').addClass('nav-stacked');
                     $('#sub-navigation-header').show();
                 }
                 else {
                     $('#tabbed-nav-bar nav').addClass('navbar-default');
                     $('#tabbed-nav-bar nav').removeClass('navbar-inverse');
-
                     $('#tabbed-nav-bar ul.nav-tabs').removeClass('nav-stacked');
                     $('#sub-navigation-header').hide();
                 }
@@ -41,17 +48,11 @@ $(document).ready(function(){
             else {
                 $('#tabbed-nav-bar').removeClass('sticky-nav');
                 $('#tabbed-nav-bar').addClass('non-sticky-nav');
-                if(light_nav.length){
-                    $('#wrapper').css('margin-top','0px');
-                }else{
-                    $('#wrapper').css('margin-top',light_nav.height + 'px');
-                }
                 $("nav#main-navigation").show();
-
+                $('#wrapper').css('position','static');
                 $('#tabbed-nav-bar nav').addClass('navbar-default');
                 $('#tabbed-nav-bar nav').removeClass('navbar-inverse');
-
-                if ($(window).width() < 1000) {
+                if ($(window).width() < 768) {
                     $('#tabbed-nav-bar ul.nav-tabs').addClass('nav-stacked');
                     $('#sub-navigation-header').show();
                 }
@@ -59,8 +60,6 @@ $(document).ready(function(){
                     $('#tabbed-nav-bar ul.nav-tabs').removeClass('nav-stacked');
                     $('#sub-navigation-header').hide();
                 }
-
-
             }
         }
         scroll();

data/assets/js/package-blog.js

@@ -4,7 +4,8 @@
 //= require vendor/cookieconsent
 //= require vendor/lazysizes
 
-//= require vendor/lightbox
+//= require vendor/featherlight
 //= require app/main
+//= require app/search
 //= require app/tables
 //= require app/custom

data/assets/js/package-extended.js

@@ -5,10 +5,12 @@
 //= require vendor/owl.carousel
 //= require vendor/lazysizes
 //= require vendor/ls.unveilhooks
-//= require vendor/lightbox
+//= require vendor/featherlight
 //= require app/sticky-tab-bar
 
+
 //= require app/main
 //= require app/scroll-to-anchors
+//= require app/search
 //= require app/tables
 //= require app/custom

data/assets/js/package-home.js

@@ -5,8 +5,10 @@
 //= require vendor/lazysizes
 //= require vendor/owl.carousel
 
+
 //= require app/main
-//= require app/sticky-tab-bar
-//= require app/home
 //= require app/tables
+//= require app/search
+//= require app/sticky-tab-bar
 //= require app/custom
+//= require app/home

data/assets/js/package-main.js

@@ -4,7 +4,9 @@
 //= require vendor/cookieconsent
 //= require vendor/lazysizes
 
+
 //= require app/main
 //= require app/tables
+//= require app/search
 //= require app/sticky-tab-bar
 //= require app/custom

data/assets/js/package-search.js

@@ -4,5 +4,7 @@
 //= require vendor/cookieconsent
 //= require vendor/lazysizes
 
+
 //= require app/main
+//= require app/search
 //= require app/custom