diff --git a/assets/images/.DS_Store b/assets/images/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/assets/images/.DS_Store differ diff --git a/assets/images/dummy-logo.png b/assets/images/dummy-logo.png new file mode 100644 index 00000000..e4c7c942 Binary files /dev/null and b/assets/images/dummy-logo.png differ diff --git a/config.toml b/config.toml index 0ba44c53..dc24ae35 100644 --- a/config.toml +++ b/config.toml @@ -54,7 +54,7 @@ font_scale = "1.2" font_secondary = "Rubik:wght@400;500;600" font_secondary_type = "sans-serif" font_size = "16px" -header_bar_bg = "#eaeaeadb" +header_bar_bg = "#f7f7f7" icon_font = "Font Awesome 5 Free" light = "#fdfdfd" nav_menu_text = "#464b4b" diff --git a/content/english/open-source/contributed-open-source.md b/content/english/open-source/contributed-open-source.md index a80766c2..6612865f 100644 --- a/content/english/open-source/contributed-open-source.md +++ b/content/english/open-source/contributed-open-source.md @@ -5,6 +5,28 @@ description: "It’s been a bloody long ride, but Cinderblock has officially lau url: contributed-open-source draft: false +navigation: + logo: "images/dummy-logo.png" + logo_text: "Capten" + + menu: + - name: "Test 1" + url: "/" + - name: "Another 2" + url: "/" + - name: "Test 3" + url: "/" + + navigation_button: + enable: true + icon: "far fa-user" + label: "Log In" + link: "#!" + navigation_button_two: + enable: true + label: "Book Demo" + link: "#!" + banner: bg_color: "#77cda2" subtitle: "We Are Delta" @@ -63,10 +85,4 @@ image_and_content_block: call_to_action: enable: true - -footer: - footer_light: true - bg_color: "#1e384c" - bg_image: "images/bg-banner-page.jpg" - bg_image_overlay_color: "rgba(0,0,0,.65)" --- \ No newline at end of file diff --git a/content/english/open-source/our-open-source.md b/content/english/open-source/our-open-source.md index 7cc9dc33..5817252e 100644 --- a/content/english/open-source/our-open-source.md +++ b/content/english/open-source/our-open-source.md @@ -5,6 +5,28 @@ description: "It’s been a bloody long ride, but Cinderblock has officially lau url: our-open-source draft: false +navigation: + logo: "images/dummy-logo.png" + logo_text: "Capten" + + menu: + - name: "Test 1" + url: "/" + - name: "Another 2" + url: "/" + - name: "Test 3" + url: "/" + + navigation_button: + enable: true + icon: "far fa-user" + label: "Log In" + link: "#!" + navigation_button_two: + enable: true + label: "Book Demo" + link: "#!" + banner: bg_color: "#fa9e26" subtitle: "We Are Delta" diff --git a/content/english/platform/capten.md b/content/english/platform/capten.md index 91a501fb..83537fa5 100644 --- a/content/english/platform/capten.md +++ b/content/english/platform/capten.md @@ -5,6 +5,28 @@ description: "It’s been a bloody long ride, but Cinderblock has officially lau url: capten draft: false +navigation: + logo: "images/dummy-logo.png" + logo_text: "Capten" + + menu: + - name: "Test 1" + url: "/" + - name: "Another 2" + url: "/" + - name: "Test 3" + url: "/" + + navigation_button: + enable: true + icon: "far fa-user" + label: "Log In" + link: "#!" + navigation_button_two: + enable: true + label: "Book Demo" + link: "#!" + banner: bg_color: "#fa9e26" subtitle: "We Are Delta" diff --git a/content/english/platform/compage.md b/content/english/platform/compage.md index 04dfc527..855eac1c 100644 --- a/content/english/platform/compage.md +++ b/content/english/platform/compage.md @@ -5,6 +5,28 @@ description: "It’s been a bloody long ride, but Cinderblock has officially lau url: compage draft: false +navigation: + logo: "images/dummy-logo.png" + logo_text: "Compage" + + menu: + - name: "Test 1" + url: "/" + - name: "Another 2" + url: "/" + - name: "Test 3" + url: "/" + + navigation_button: + enable: true + icon: "far fa-user" + label: "Log In" + link: "#!" + navigation_button_two: + enable: true + label: "Book Demo" + link: "#!" + banner: bg_color: "#77cda2" subtitle: "We Are Delta" @@ -63,10 +85,4 @@ image_and_content_block: call_to_action: enable: true - -footer: - footer_light: true - bg_color: "#1e384c" - bg_image: "images/bg-banner-page.jpg" - bg_image_overlay_color: "rgba(0,0,0,.65)" --- \ No newline at end of file diff --git a/content/english/platform/opty.md b/content/english/platform/opty.md index 9539310f..9309bf9c 100644 --- a/content/english/platform/opty.md +++ b/content/english/platform/opty.md @@ -5,6 +5,28 @@ description: "It’s been a bloody long ride, but Cinderblock has officially lau url: opty draft: false +navigation: + logo: "images/dummy-logo.png" + logo_text: "Capten" + + menu: + - name: "Test 1" + url: "/" + - name: "Another 2" + url: "/" + - name: "Test 3" + url: "/" + + navigation_button: + enable: true + icon: "far fa-user" + label: "Log In" + link: "#!" + navigation_button_two: + enable: true + label: "Book Demo" + link: "#!" + banner: bg_color: "#fa9e26" subtitle: "We Are Delta" diff --git a/themes/delta/assets/js/script.js b/themes/delta/assets/js/script.js index e6e815af..36215893 100644 --- a/themes/delta/assets/js/script.js +++ b/themes/delta/assets/js/script.js @@ -314,7 +314,7 @@ $(window).on("load", function () { } }); -// $("#main-header").hover( +// $(".navigation-alt").hover( // function () { // $("#secondary-header").addClass("header-sec"); // }, @@ -323,52 +323,60 @@ $(window).on("load", function () { // } // ); -var navigationBottom = $(".navigation-bottom"); -if (navigationBottom) { - $(window).on("scroll", function () { - if ($(window).scrollTop() > 70) { - navigationBottom.removeClass("d-none"); - navigationBottom.css("background", "rgba(234, 234, 234, .95)"); - $("#main-header").addClass("d-none"); - } else { - navigationBottom.addClass("d-none"); - navigationBottom.css("background", "rgba(234, 234, 234, .95)"); - $("#main-header").removeClass("d-none"); - } - }); -} +if ($(".navigation-alt").length !== 0) { + let navigationAlt = $(".navigation-alt"); + let navigationBottom = $(".navigation-bottom"); -//header on scroll changes -$(window).on("scroll", function () { - var list, darkLogo, lightLogo; - list = document.querySelectorAll("#nav-menu"); - darkLogo = document.querySelector("#logo-img-dark").getAttribute("src"); - lightLogo = document.querySelector("#logo-img-light").getAttribute("src"); - if ($(window).scrollTop() > 70) { - //Add light section on down - $("#main-header").removeClass("dark-bar"); - $("#main-header").addClass("light-bar"); - for (var i = 0; i < list.length; ++i) { - list[i].classList.remove("nav-menu-text"); - } - //add dark logo on down - document.getElementById("logo-img").src = darkLogo; - //show second header button and hide main - $("#secondary-button").show(); - $("#main-button").hide(); - $("#main-navbar").addClass("no-bottom"); - } else { - //Add dark section on up - $("#main-header").removeClass("light-bar"); - $("#main-header").addClass("dark-bar"); - for (var i = 0; i < list.length; ++i) { - list[i].classList.add("nav-menu-text"); - } - //add light logo on up - document.getElementById("logo-img").src = lightLogo; - //show main header button and hide second - $("#secondary-button").hide(); - $("#main-button").show(); - $("#main-navbar").removeClass("no-bottom"); + let navigationAltHeight = navigationAlt.outerHeight(); + let navigationBottomHeight = navigationBottom.outerHeight(); + + if (navigationBottom) { + $(window).on("scroll", function () { + if ( + $(window).scrollTop() > + (navigationAltHeight + navigationBottomHeight) * 2 + ) { + navigationBottom.addClass("sticky"); + navigationBottom.css("top", 0 - navigationAltHeight + "px"); + } else { + navigationBottom.removeClass("sticky"); + navigationBottom.css("top", "unset"); + } + }); } -}); + + //header on scroll changes + // $(window).on("scroll", function () { + // var list, darkLogo, lightLogo; + // list = document.querySelectorAll("#nav-menu"); + // darkLogo = document.querySelector("#logo-img-dark").getAttribute("src"); + // lightLogo = document.querySelector("#logo-img-light").getAttribute("src"); + // if ($(window).scrollTop() > 70) { + // //Add light section on down + // $(".navigation-alt").removeClass("dark-bar"); + // $(".navigation-alt").addClass("light-bar"); + // for (var i = 0; i < list.length; ++i) { + // list[i].classList.remove("nav-menu-text"); + // } + // //add dark logo on down + // document.getElementById("logo-img").src = darkLogo; + // //show second header button and hide main + // $("#secondary-button").show(); + // $("#main-button").hide(); + // $("#main-navbar").addClass("no-bottom"); + // } else { + // //Add dark section on up + // $(".navigation-alt").removeClass("light-bar"); + // $(".navigation-alt").addClass("dark-bar"); + // for (var i = 0; i < list.length; ++i) { + // list[i].classList.add("nav-menu-text"); + // } + // //add light logo on up + // document.getElementById("logo-img").src = lightLogo; + // //show main header button and hide second + // $("#secondary-button").hide(); + // $("#main-button").show(); + // $("#main-navbar").removeClass("no-bottom"); + // } + // }); +} diff --git a/themes/delta/assets/scss/_common.scss b/themes/delta/assets/scss/_common.scss index d1befb2c..112737b8 100644 --- a/themes/delta/assets/scss/_common.scss +++ b/themes/delta/assets/scss/_common.scss @@ -168,6 +168,19 @@ a:hover { padding: 0 10px; } } +.container-delta-lg { + max-width: 1600px; + padding: 0 55px; + @media (min-width: 575px) { + padding: 0 40px; + } + @include mobile { + padding: 0 17px; + } + @include mobile-xs { + padding: 0 10px; + } +} // default-pagination and social-links .social-links, diff --git a/themes/delta/assets/scss/templates/_navigation.scss b/themes/delta/assets/scss/templates/_navigation.scss index a2a65254..f9c5101a 100644 --- a/themes/delta/assets/scss/templates/_navigation.scss +++ b/themes/delta/assets/scss/templates/_navigation.scss @@ -110,7 +110,35 @@ transition: 0s; } } + &.navigation-bottom { + z-index: 300; + transition: 0s; + &.sticky { + position: sticky; + transform: translateY(100%); + transition: 0.3s; + .navbar-brand { + display: block !important; + } + } + } + &.navigation-bottom { + .navbar-brand { + img { + max-height: 30px; + } + } + .navbar-brand.d-none { + margin-right: 13px; + img { + padding-right: 10px; + border-right: 1px solid #ddd; + } + } + } + &.navigation-bottom, &.navigation-alt { + position: relative; .nav-item { .nav-link { color: $nav-menu-text !important; diff --git a/themes/delta/layouts/partials/header-alt.html b/themes/delta/layouts/partials/header-alt.html index e1e31acd..d2f912c0 100644 --- a/themes/delta/layouts/partials/header-alt.html +++ b/themes/delta/layouts/partials/header-alt.html @@ -1,11 +1,10 @@ -{{ $headerWhite := or (eq .Section "platform") (eq .Section "open-source") }} -
+