From 01a3479ba41c112c5a9bd453d681c021167ef78b Mon Sep 17 00:00:00 2001 From: "Aaron N. Brock" Date: Fri, 2 Oct 2020 19:19:17 -0400 Subject: [PATCH] sync navbar name --- assets/js/script.js | 4 +--- .../{_site-navigation.scss => _navbar.scss} | 16 --------------- assets/scss/style.scss | 2 +- layouts/_default/baseof.html | 20 ++++++++++--------- layouts/partials/{header.html => navbar.html} | 0 5 files changed, 13 insertions(+), 29 deletions(-) rename assets/scss/components/{_site-navigation.scss => _navbar.scss} (80%) rename layouts/partials/{header.html => navbar.html} (100%) diff --git a/assets/js/script.js b/assets/js/script.js index 13a52af..9a94362 100644 --- a/assets/js/script.js +++ b/assets/js/script.js @@ -110,7 +110,6 @@ $(document).ready(function () { }); // skill count - $(".skill__progress").waypoint( function () { $(".progress-value span").each(function () { @@ -174,8 +173,7 @@ $(document).ready(function () { // columnWidth: 200, }); - // blob animation - + // blob animation var tl = new TimelineMax({ yoyo: true, repeat: -1, diff --git a/assets/scss/components/_site-navigation.scss b/assets/scss/components/_navbar.scss similarity index 80% rename from assets/scss/components/_site-navigation.scss rename to assets/scss/components/_navbar.scss index 1df8a3c..91c809a 100644 --- a/assets/scss/components/_site-navigation.scss +++ b/assets/scss/components/_navbar.scss @@ -17,22 +17,6 @@ } } } - // .main-navigation{ - // // margin: 0 auto; - // // .nav-item{ - // // .nav-link{ - // // // @include desktop{ - // // // text-align: center; - // // // padding: 15px 0; - // // // cursor: pointer; - // // // } - // // } - // // .active{ - // // color: $primary_color; - // // } - // // } - // } - &.nav__color__change{ background: $white; padding: 20px 0; diff --git a/assets/scss/style.scss b/assets/scss/style.scss index 98e7b40..80866fc 100644 --- a/assets/scss/style.scss +++ b/assets/scss/style.scss @@ -18,7 +18,7 @@ VERSION: 1.0.0 @import "components/preloder"; -@import "components/site-navigation"; +@import "components/navbar"; @import "components/hero-section"; diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index c9d8f11..2655796 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,11 +1,13 @@ - {{ partial "head.html" . }} - - {{ partial "header.html" . }} -
- {{ block "main" . }}{{ end }} -
- {{ partial "footer.html" . }} - - +{{ partial "head.html" . }} + + + {{ partial "navbar.html" . }} +
+ {{ block "main" . }}{{ end }} +
+ {{ partial "footer.html" . }} + + + \ No newline at end of file diff --git a/layouts/partials/header.html b/layouts/partials/navbar.html similarity index 100% rename from layouts/partials/header.html rename to layouts/partials/navbar.html