sync navbar name

4 years ago · 01a3479ba4
parent ecd1c282e8
commit 01a3479ba4
5 changed files with 13 additions and 29 deletions
--- 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,
--- a/assets/scss/components/_site-navigation.scss
+++ b/assets/scss/components/_site-navigation.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;
--- 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";

--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@ -1,11 +1,13 @@
 <!DOCTYPE html>
 <html>
-  {{ partial "head.html" . }}
-  <body>
-    {{ partial "header.html" . }}
-    <div id="content">
-      {{ block "main" . }}{{ end }}
-    </div>
-    {{ partial "footer.html" . }}
-  </body>
+{{ partial "head.html" . }}
+
+<body>
+  {{ partial "navbar.html" . }}
+  <div id="content">
+    {{ block "main" . }}{{ end }}
+  </div>
+  {{ partial "footer.html" . }}
+</body>
+
 </html>
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html