Pulled upstream

author: Ros Cooking <roscooking2020@gmail.com> 2020-10-25 20:00:24 +0300
committer: Ros Cooking <roscooking2020@gmail.com> 2020-10-25 20:00:24 +0300
commit: e392592624f6782532bb14501ea6a0bcd9204e07 (patch)
tree: 225cd60d4e7db1655d5befd395a5e8c855d5df90
parent: f04a54b3c60f2ebda0298a8e266c52e3c394ffb8 (diff)
parent: df24e83ce3d2ac97f64500bb77538447815d9cc7 (diff)
18 files changed, 243 insertions, 60 deletions
diff --git a/README.md b/README.md
index a0a8a52..424a669 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ If your problem or idea is not addressed yet, [open a new issue](https://github.
 
 ## Technical Support or Questions (Paid)
 
-If you have questions or need help integrating the product please [contact us](mailto:themefisher@gmail.com) instead of opening an issue.
+If you have questions or need help integrating the product please [contact us](mailto:mehedi@themefisher.com) instead of opening an issue.
 
 ## Licensing
 
diff --git a/assets/js/script.js b/assets/js/script.js
index 7cf9365..4566db7 100644
--- a/assets/js/script.js
+++ b/assets/js/script.js
@@ -60,7 +60,7 @@
       get: 'user',
       resolution: 'low_resolution',
       accessToken: accessToken,
-      template: '<div class="instagram-post"><img class="img-fluid w-100" src="{{image}}" alt="instagram-image"><ul class="list-inline text-center"><li class="list-inline-item"><a href="{{link}}" target="_blank" class="text-white"><i class="ti-heart mr-2"></i>{{likes}}</a></li><li class="list-inline-item"><a href="{{link}}" target="_blank" class="text-white"><i class="ti-comments mr-2"></i>{{comments}}</a></li></ul></div>'
+      template: '<div class="instagram-post"><a href="{{link}}" target="_blank"><img class="img-fluid w-100" src="{{image}}" alt="instagram-image"></a></div>'
     });
     userFeed.run();
   }
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 4ca132a..3f3292a 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -1,5 +1,5 @@
 # default config
-baseURL = "https://examplesite.org"
+baseurl = "https://examplesite.org"
 languageCode = "en-us"
 title = "Parsa Hugo | Personal Blog Template"
 theme = "parsa-hugo"
@@ -44,13 +44,29 @@ link = "plugins/search/search.js"
 
 # navigation
 [[menu.main]]
+name = "Homepage"
+url = ""
+weight = 1
+hasChildren = true
+
+  [[menu.main]]
+  parent = "Homepage"
+  name = "Homepage 1"
+  url = "homepage/home-1"
+
+  [[menu.main]]
+  parent = "Homepage"
+  name = "Homepage 2"
+  url = "homepage/home-2"
+
+[[menu.main]]
 name = "About"
-URL = "about"
+url = "about"
 weight = 2
 
 [[menu.main]]
 name = "Contact"
-URL = "contact"
+url = "contact"
 weight = 3
 
 # deult parameter
@@ -66,7 +82,7 @@ preloader = true
 # search
 search = true
 # about author
-author = "Themefisher"
+author = "John Doe"
 author_image = "images/banner-img.png"
 bio = "I’m a Freelance Interactive Art Director based in France. Focusing across branding and identity, digital and print."
 # Contact info
@@ -85,19 +101,24 @@ copyright = "Copyright &copy; 2020 a theme by [themefisher.com](themefisher.com)
 enable = true
 access_token = "IGQVJYeUk4YWNIY1h4OWZANeS1wRHZARdjJ5QmdueXN2RFR6NF9iYUtfcGp1NmpxZA3RTbnU1MXpDNVBHTzZAMOFlxcGlkVHBKdjhqSnUybERhNWdQSE5hVmtXT013MEhOQVJJRGJBRURn"
 
+# cookies
+[params.cookies]
+enable = true
+expire_days = 2
+
 # social site
 [[params.social]]
 icon = "ti-facebook"
-URL = "#"
+url = "#"
 
 [[params.social]]
 icon = "ti-twitter-alt"
-URL = "#"
+url = "#"
 
 [[params.social]]
 icon = "ti-linkedin"
-URL = "#"
+url = "#"
 
 [[params.social]]
 icon = "ti-github"
-URL = "#"
-\ No newline at end of file
+url = "#"
+\ No newline at end of file
diff --git a/exampleSite/content/homepage/home-1.md b/exampleSite/content/homepage/home-1.md
new file mode 100644
index 0000000..43de444
--- /dev/null
+++ b/exampleSite/content/homepage/home-1.md
@@ -0,0 +1,4 @@
+---
+title: "Homepage 1"
+layout: "1"
+---
+\ No newline at end of file
diff --git a/exampleSite/content/homepage/home-2.md b/exampleSite/content/homepage/home-2.md
new file mode 100644
index 0000000..51c7df4
--- /dev/null
+++ b/exampleSite/content/homepage/home-2.md
@@ -0,0 +1,4 @@
+---
+title: "Homepage 2"
+layout: "2"
+---
+\ No newline at end of file
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 2a242c6..ef695c5 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}">
+<html lang="{{ with site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}">
     {{- partial "head.html" . -}}
     <body>
         {{- partial "preloader.html" . -}}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 1f3fafa..ffcdd83 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -18,7 +18,7 @@
     <div class="row">
       <div class="col-lg-8 mt-5">
         {{ $paginator := .Paginate .Data.Pages }}
-        {{ if eq .Site.Params.layout "1" }}
+        {{ if eq site.Params.layout "1" }}
         <div class="row masonry-container">
           {{ range $paginator.Pages }}
           <div class="col-sm-6 mb-5">
@@ -33,7 +33,7 @@
           {{ end }}
         </div>
 
-        {{ else if (eq .Site.Params.layout "2")}}
+        {{ else if (eq site.Params.layout "2")}}
 
         <div class="row">
           {{ range $i,$p := $paginator.Pages }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 7630d7e..fe8268b 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -18,7 +18,7 @@
     <div class="row">
       <div class="col-lg-8">
         <ul class="list-inline d-flex justify-content-between py-3">
-          <li class="list-inline-item"><i class="ti-user mr-2"></i>Post by {{.Site.Params.author}}</li>
+          <li class="list-inline-item"><i class="ti-user mr-2"></i>Post by {{site.Params.author}}</li>
           <li class="list-inline-item"><i class="ti-calendar mr-2"></i>{{ .PublishDate.Format "Jan 02, 2006" }}</li>
         </ul>
         <article class="content">
diff --git a/layouts/about/list.html b/layouts/about/list.html
index 795d6f7..179ad9c 100644
--- a/layouts/about/list.html
+++ b/layouts/about/list.html
@@ -5,8 +5,8 @@
     <div class="row">
       <div class="col-lg-12">
         <h2 class="mb-4">{{.Title }}</h2>
-        <img src="{{.Params.Image | absURL }}" alt="{{.Site.Params.author}}" class="img-fluid w-100 mb-4">
-        <h3 class="font-weight-light">Hello, I’m <span class="font-weight-bold">{{.Site.Params.author}}</span></h3>
+        <img src="{{.Params.Image | absURL }}" alt="{{site.Params.author}}" class="img-fluid w-100 mb-4">
+        <h3 class="font-weight-light">Hello, I’m <span class="font-weight-bold">{{site.Params.author}}</span></h3>
         {{ .Content }}
       </div>
     </div>
diff --git a/layouts/contact/list.html b/layouts/contact/list.html
index e6ce363..b329002 100644
--- a/layouts/contact/list.html
+++ b/layouts/contact/list.html
@@ -5,9 +5,9 @@
     <div class="row">
       <div class="col-lg-12">
         <h2 class="mb-4">{{.Title }}</h2>
-        <img src="{{.Params.Image | absURL }}" alt="{{.Site.Params.author}}" class="img-fluid w-100 mb-4">
+        <img src="{{.Params.Image | absURL }}" alt="{{site.Params.author}}" class="img-fluid w-100 mb-4">
         {{ .Content }}
-        <form action="{{ .Site.Params.contact_form_action }}" class="row mt-5">
+        <form action="{{ site.Params.contact_form_action }}" class="row mt-5">
           <div class="col-lg-6">
             <input type="text" class="form-control mb-4" name="name" id="name" placeholder="Name">
           </div>
diff --git a/layouts/homepage/single.html b/layouts/homepage/single.html
new file mode 100644
index 0000000..de4c7e7
--- /dev/null
+++ b/layouts/homepage/single.html
@@ -0,0 +1,108 @@
+{{ define "main" }}
+
+{{ if eq .Params.layout "1" }}
+<!-- featured post -->
+<section class="overflow-hidden">
+  <div class="container-fluid p-sm-0">
+    <div class="row featured-post-slider">
+      {{ range (where site.RegularPages "Type" "featured")}}
+      <div class="col-lg-3 col-sm-6 mb-2 mb-lg-0 px-1">
+        <article class="card bg-dark text-center text-white border-0 rounded-0">
+          <img class="card-img rounded-0 img-fluid w-100" src="{{.Params.Image | absURL}}" alt="post-thumb">
+          <div class="card-img-overlay">
+            <div class="card-content">
+              <p class="text-uppercase">{{range .Params.Categories}}{{. | humanize}}{{end}}</p>
+              <h4 class="card-title mb-4"><a class="text-white" href="{{.Permalink}}">{{.Title}}</a></h4>
+              <a class="btn btn-outline-light" href="{{.Permalink}}">read more</a>
+            </div>
+          </div>
+        </article>
+      </div>
+      {{ end }}
+    </div>
+  </div>
+</section>
+<!-- /featured post -->
+
+{{ else if (eq .Params.layout "2")}}
+
+<!-- hero area -->
+<section class="hero-section">
+  <div class="container">
+    <div class="row">
+      <div class="col-lg-6 align-self-end">
+        <h1 class="mb-0">Welcome</h1>
+        <h2 class="mb-100 title-border-lg">to <i>{{site.Params.author}} Blog</i></h2>
+        <p class="mb-80 mr-5">{{site.Params.bio | markdownify }}</p>
+        <span class="font-secondary text-dark mr-3 mr-sm-5">Follow me :</span>
+        <ul class="list-inline d-inline-block mb-5">
+          {{ range site.Params.social }}
+          <li class="list-inline-item mx-3"><a href="{{.URL}}" class="text-dark"><i class="{{.icon}}"></i></a></li>
+          {{ end }}
+        </ul>
+      </div>
+      <div class="col-lg-6 text-right">
+        <img class="img-fluid" src="{{site.Params.author_image | absURL}}" alt="banner-image">
+      </div>
+    </div>
+  </div>
+</section>
+<!-- /hero area -->
+
+{{ else }}
+<section class="section">
+  <div class="container text-center">
+    <h1>Please Enter A Valid Homepage Layout Number <br> (1 or 2)</h1>
+  </div>
+</section>
+{{ end }}
+
+<!-- blog post -->
+<section class="section">
+  <div class="container">
+    {{ if eq .Params.layout "1" }}
+    <div class="row masonry-container">
+      {{ range site.RegularPages }}
+      <div class="col-lg-4 col-sm-6 mb-5">
+        <article class="text-center">
+          <img class="img-fluid mb-4" src="{{.Params.Image | absURL }}" alt="post-thumb">
+          <p class="text-uppercase mb-2">{{range .Params.Categories}}{{. | humanize}}{{end}}</p>
+          <h4 class="title-border"><a class="text-dark" href="{{.Permalink}}">{{.Title}}</a></h4>
+          <p>{{.Summary}}</p>
+          <a href="{{.Permalink}}" class="btn btn-transparent">read more</a>
+        </article>
+      </div>
+      {{ end }}
+    </div>
+
+    {{ else if (eq .Params.layout "2")}}
+
+    <div class="row">
+      {{ range $i,$p := (where site.RegularPages "Type" "post") }}
+      <div class="col-12 mb-100">
+        <article data-file="{{.Permalink}}" data-target="article"
+          class="article-full-width {{if not (modBool $i 2)}} article-right {{ end }}">
+          <div class="post-image">
+            <img class="img-fluid" src="{{ .Params.Image | absURL }}" alt="post-thumb">
+          </div>
+          <div class="post-content">
+            <ul class="list-inline d-flex justify-content-between border-bottom post-meta pb-2 mb-4">
+              <li class="list-inline-item"><i class="ti-calendar mr-2"></i>{{ .PublishDate.Format "Jan 02, 2006" }}</li>
+              <li class="list-inline-item"><i class="ti-alarm-clock mr-2"></i><span class="eta"></span> read</li>
+            </ul>
+            <h4 class="mb-4"><a href="{{.Permalink}}" class="text-dark">{{ .Title }}</a></h4>
+            <p class="mb-0 post-summary">{{.Summary }}</p>
+            <a class="btn btn-transparent mb-4" href="{{.Permalink}}">Continue...</a>
+          </div>
+        </article>
+      </div>
+      {{ end }}
+    </div>
+    {{ end }}
+  </div>
+</section>
+<!-- /blog post -->
+
+{{partial "instafeed.html" . }}
+
+{{ end }}
+\ No newline at end of file
diff --git a/layouts/index.html b/layouts/index.html
index c7a6441..342fa8e 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,11 +1,11 @@
 {{ define "main" }}
 
-{{ if eq .Site.Params.layout "1" }}
+{{ if eq site.Params.layout "1" }}
 <!-- featured post -->
 <section class="overflow-hidden">
   <div class="container-fluid p-sm-0">
     <div class="row featured-post-slider">
-      {{ range (where .Site.RegularPages "Type" "featured")}}
+      {{ range (where site.RegularPages "Type" "featured")}}
       <div class="col-lg-3 col-sm-6 mb-2 mb-lg-0 px-1">
         <article class="card bg-dark text-center text-white border-0 rounded-0">
           <img class="card-img rounded-0 img-fluid w-100" src="{{.Params.Image | absURL}}" alt="post-thumb">
@@ -24,7 +24,7 @@
 </section>
 <!-- /featured post -->
 
-{{ else if (eq .Site.Params.layout "2")}}
+{{ else if (eq site.Params.layout "2")}}
 
 <!-- hero area -->
 <section class="hero-section">
@@ -32,17 +32,17 @@
     <div class="row">
       <div class="col-lg-6 align-self-end">
         <h1 class="mb-0">Welcome</h1>
-        <h2 class="mb-100 title-border-lg">to <i>{{.Site.Params.author}} Blog</i></h2>
-        <p class="mb-80 mr-5">{{.Site.Params.bio | markdownify }}</p>
+        <h2 class="mb-100 title-border-lg">to <i>{{site.Params.author}} Blog</i></h2>
+        <p class="mb-80 mr-5">{{site.Params.bio | markdownify }}</p>
         <span class="font-secondary text-dark mr-3 mr-sm-5">Follow me :</span>
         <ul class="list-inline d-inline-block mb-5">
-          {{ range .Site.Params.social }}
+          {{ range site.Params.social }}
           <li class="list-inline-item mx-3"><a href="{{.URL}}" class="text-dark"><i class="{{.icon}}"></i></a></li>
           {{ end }}
         </ul>
       </div>
       <div class="col-lg-6 text-right">
-        <img class="img-fluid" src="{{.Site.Params.author_image | absURL}}" alt="banner-image">
+        <img class="img-fluid" src="{{site.Params.author_image | absURL}}" alt="banner-image">
       </div>
     </div>
   </div>
@@ -60,8 +60,8 @@
 <!-- blog post -->
 <section class="section">
   <div class="container">
-    {{ $paginator := .Paginate (where .Site.RegularPages "Type" "post") }}
-    {{ if eq .Site.Params.layout "1" }}
+    {{ $paginator := .Paginate (where site.RegularPages "Type" "post") }}
+    {{ if eq site.Params.layout "1" }}
     <div class="row masonry-container">
       {{ range $paginator.Pages }}
       <div class="col-lg-4 col-sm-6 mb-5">
@@ -76,7 +76,7 @@
       {{ end }}
     </div>
 
-    {{ else if (eq .Site.Params.layout "2")}}
+    {{ else if (eq site.Params.layout "2")}}
 
     <div class="row">
       {{ range $i,$p := (where $paginator.Pages "Type" "post") }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 9bfe283..5b2c7f7 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -3,13 +3,13 @@
     <div class="container">
       <div class="row">
         <div class="col-md-3 col-sm-6 mb-4 mb-md-0">
-          <a href="{{.Site.BaseURL}}"><img src="{{.Site.Params.logo | absURL }}" alt="{{.Site.Title}}" class="img-fluid"></a>
+          <a href="{{site.BaseURL}}"><img src="{{site.Params.logo | absURL }}" alt="{{site.Title}}" class="img-fluid"></a>
         </div>
         <div class="col-md-3 col-sm-6 mb-4 mb-md-0">
           {{ if .Site.Params.address }}
           <h6>Address</h6>
           <ul class="list-unstyled">
-            <li class="font-secondary text-dark">{{.Site.Params.address | markdownify }}</li>
+            <li class="font-secondary text-dark">{{site.Params.address | markdownify }}</li>
           </ul>
           {{ end }}
         </div>
@@ -17,19 +17,24 @@
           {{ if or  .Site.Params.mobile  .Site.Params.email }}         
           <h6>Contact Info</h6>
           <ul class="list-unstyled">
+<<<<<<< HEAD
             {{ if .Site.Params.mobile }}
             <li class="font-secondary text-dark">Tel : {{ .Site.Params.mobile | markdownify }}</li>
             {{ end }}
             {{ if .Site.Params.email }}           
             <li class="font-secondary text-dark">Email : {{ .Site.Params.email | markdownify }}</li>
             {{ end }}
+=======
+            <li class="font-secondary text-dark">Tel : {{ site.Params.mobile | markdownify }}</li>
+            <li class="font-secondary text-dark">Email : {{ site.Params.email | markdownify }}</li>
+>>>>>>> df24e83ce3d2ac97f64500bb77538447815d9cc7
           </ul>
           {{ end }}
         </div>
         <div class="col-md-3 col-sm-6 mb-4 mb-md-0">
           <h6>Follow</h6>
           <ul class="list-inline d-inline-block">
-            {{ range .Site.Params.social }}
+            {{ range site.Params.social }}
             <li class="list-inline-item"><a href="{{ .URL }}" class="text-dark"><i class="{{ .icon }}"></i></a></li>
             {{ end }}
           </ul>
@@ -38,19 +43,19 @@
     </div>
   </div>
   <div class="text-center pb-3">
-    <p class="mb-0">{{ .Site.Params.copyright | markdownify }}</p>
+    <p class="mb-0">{{ site.Params.copyright | markdownify }}</p>
   </div>
 </footer>
 
 
-{{ if .Site.Params.search }}
+{{ if site.Params.search }}
 <script>
   var indexURL = {{ "index.json" | absURL }}
 </script>
 {{ end }}
 
 {{ "<!-- JS Plugins -->" | safeHTML }}
-{{ range .Site.Params.plugins.js}}
+{{ range site.Params.plugins.js}}
 <script src="{{ .link | absURL }}"></script>
 {{ end }}
 
@@ -59,7 +64,7 @@
 <script src="{{ $script.Permalink }}"></script>
 
 {{ "<!-- google analitycs -->" | safeHTML }}
-{{ with .Site.Params.google_analitycs_id }}
+{{ with site.Params.google_analitycs_id }}
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -68,4 +73,48 @@
   ga('create', '{{ . }}', 'auto');
   ga('send', 'pageview');
 </script>
+{{ end }}
+
+
+<!-- cookie -->
+{{ if site.Params.cookies.enable }}
+<script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.2.1/js.cookie.min.js"></script>
+<div id="js-cookie-box" class="cookie-box cookie-box-hide">
+	This site uses cookies. By continuing to use this website, you agree to their use. <span id="js-cookie-button" class="btn btn-sm btn-outline-light ml-2">I Accept</span>
+</div>
+<script>
+	(function ($) {
+		const cookieBox = document.getElementById('js-cookie-box');
+		const cookieButton = document.getElementById('js-cookie-button');
+		if (!Cookies.get('cookie-box')) {
+			cookieBox.classList.remove('cookie-box-hide');
+			cookieButton.onclick = function () {
+				Cookies.set('cookie-box', true, {
+					expires: {{ site.Params.cookies.expire_days }}
+				});
+				cookieBox.classList.add('cookie-box-hide');
+			};
+		}
+	})(jQuery);
+</script>
+
+<!-- cookie style -->
+<style>
+.cookie-box {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  text-align: center;
+  z-index: 9999;
+  padding: 1rem 2rem;
+  background: rgb(71, 71, 71);
+  transition: all .75s cubic-bezier(.19, 1, .22, 1);
+  color: #fdfdfd;
+}
+
+.cookie-box-hide {
+  display: none;
+}
+</style>
 {{ end }}
 \ No newline at end of file
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 424c34e..c0ca5b2 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -1,15 +1,15 @@
 <head>
   <meta charset="utf-8">
-  <title>{{ .Site.Title }}</title>
+  <title>{{ site.Title }}</title>
 
   {{ "<!-- mobile responsive meta -->" | safeHTML }}
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-  <meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}">
-  {{ with .Site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
+  <meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{ with site.Params.description }}{{ . }}{{ end }}{{ end }}">
+  {{ with site.Params.author }}<meta name="author" content="{{ . }}">{{ end }}
   {{ hugo.Generator }}
 
   {{ "<!-- plugins -->" | safeHTML }}
-  {{ range .Site.Params.plugins.css }}
+  {{ range site.Params.plugins.css }}
   <link rel="stylesheet" href="{{ .link | absURL }} ">
   {{ end }}
 
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 24eca62..05a99dc 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,6 +1,6 @@
 <header class="navigation">
   <nav class="navbar navbar-expand-lg navbar-light">
-    <a class="navbar-brand" href="{{.Site.BaseURL}}"><img class="img-fluid" src="{{ .Site.Params.logo | absURL }}" alt="{{.Site.Title}}"></a>
+    <a class="navbar-brand" href="{{site.BaseURL}}"><img class="img-fluid" src="{{ site.Params.logo | absURL }}" alt="{{site.Title}}"></a>
     <button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navogation"
       aria-controls="navogation" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
@@ -8,10 +8,7 @@
 
     <div class="collapse navbar-collapse text-center" id="navogation">
       <ul class="navbar-nav ml-auto">
-        <li class="nav-item">
-          <a class="nav-link text-uppercase text-dark" href="{{.Site.BaseURL}}">{{ with .Site.Params.Home }} {{ . }} {{ end }}</a>
-        </li>
-        {{ range .Site.Menus.main }}
+        {{ range site.Menus.main }}
         {{ if .HasChildren }}
         <li class="nav-item dropdown">
           <a class="nav-link text-uppercase text-dark dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true"
@@ -31,9 +28,9 @@
         {{ end }}
         {{ end }}
       </ul>
-      {{ if .Site.Params.search }}
+      {{ if site.Params.search }}
       {{ "<!-- search -->" | safeHTML }}
-      <form class="form-inline position-relative ml-lg-4" action="{{ .Site.BaseURL }}/search">
+      <form class="form-inline position-relative ml-lg-4" action="{{ site.BaseURL }}/search">
         <input class="form-control px-0 w-100" type="search" placeholder="Search" id="search-query" name="s">
         <button class="search-icon" type="submit"><i class="ti-search text-dark"></i></button>
       </form>
diff --git a/layouts/partials/instafeed.html b/layouts/partials/instafeed.html
index 9d1d9a6..d973d3a 100644
--- a/layouts/partials/instafeed.html
+++ b/layouts/partials/instafeed.html
@@ -1,9 +1,9 @@
-{{ if .Site.Params.instafeed.enable }}
+{{ if site.Params.instafeed.enable }}
+{{ with site.Params.instafeed }}
 <!-- instagram -->
 <section>
-  <div class="container-fluid px-0">
-    <div class="row no-gutters instagram-slider" id="instafeed" data-accessToken="{{.Site.Params.instafeed.access_token}}"></div>
-  </div>
+  <div class="instagram-slider" id="instafeed" data-accessToken="{{.access_token}}"></div>
 </section>
 <!-- /instagram -->
+{{ end }}
 {{ end }}
 \ No newline at end of file
diff --git a/layouts/partials/preloader.html b/layouts/partials/preloader.html
index 6a1ca07..f19e9e0 100644
--- a/layouts/partials/preloader.html
+++ b/layouts/partials/preloader.html
@@ -1,4 +1,4 @@
-{{ if .Site.Params.preloader }}
+{{ if site.Params.preloader }}
 {{ "<!-- preloader start -->" | safeHTML }}
 <div class="preloader">
   <div class="loader">
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index e06de7e..0ff8150 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -1,20 +1,20 @@
 <div class="col-lg-4">
   <div class="widget search-box">
-    <form action="{{ .Site.BaseURL }}/search">
+    <form action="{{ site.BaseURL }}/search">
       <i class="ti-search"></i>
       <input class="form-control border-0 pl-5" type="search" placeholder="Search" id="search-query" name="s">
     </form>
   </div>
   <div class="widget">
     <h6 class="mb-4">LATEST POST</h6>
-    {{ range first 3 ( where .Site.Pages "Type" "post") }}
+    {{ range first 3 ( where site.Pages "Type" "post") }}
     <div class="media mb-4">
       <div class="post-thumb-sm mr-3">
         <a href="{{ .Permalink }}"><img class="mr-3 post-thumb-sm" src="{{ .Params.Image | absURL }}"></a>
       </div>
       <div class="media-body">
         <ul class="list-inline d-flex justify-content-between mb-2">
-          <li class="list-inline-item">Post By {{.Site.Params.author}}</li>
+          <li class="list-inline-item">Post By {{site.Params.author}}</li>
           <li class="list-inline-item">{{ .PublishDate.Format "Jan 02, 2006" }}</li>
         </ul>
         <h6><a class="text-dark" href="{{ .Permalink }}">{{.Title}}</a></h6>
@@ -24,10 +24,10 @@
   </div>
   <div class="widget">
     <h6 class="mb-4">TAG</h6>
-    {{- if isset .Site.Taxonomies "tags" }}
-    {{- if not (eq (len .Site.Taxonomies.tags) 0) }}
+    {{- if isset site.Taxonomies "tags" }}
+    {{- if not (eq (len site.Taxonomies.tags) 0) }}
     <ul class="list-inline tag-list">
-      {{- range $name, $items := .Site.Taxonomies.tags }}
+      {{- range $name, $items := site.Taxonomies.tags }}
       <li class="list-inline-item m-1"><a href="{{ "tags/" | relLangURL }}{{ $name | urlize | lower }}">{{ $name | humanize }}</a></li>
       {{- end }}
     </ul>
@@ -36,10 +36,10 @@
   </div>
   <div class="widget">
     <h6 class="mb-4">CATEGORIES</h6>
-    {{- if isset .Site.Taxonomies "categories" }}
-    {{- if not (eq (len .Site.Taxonomies.categories) 0) }}
+    {{- if isset site.Taxonomies "categories" }}
+    {{- if not (eq (len site.Taxonomies.categories) 0) }}
     <ul class="list-inline tag-list">
-      {{- range $name, $items := .Site.Taxonomies.categories }}
+      {{- range $name, $items := site.Taxonomies.categories }}
       <li class="list-inline-item m-1"><a href="{{ "categories/" | relLangURL }}{{ $name | urlize | lower }}">{{ $name | title | humanize }}</a></li>
       {{- end }}
     </ul>
author	Ros Cooking <roscooking2020@gmail.com>	2020-10-25 20:00:24 +0300
committer	Ros Cooking <roscooking2020@gmail.com>	2020-10-25 20:00:24 +0300
commit	e392592624f6782532bb14501ea6a0bcd9204e07 (patch)
tree	225cd60d4e7db1655d5befd395a5e8c855d5df90
parent	f04a54b3c60f2ebda0298a8e266c52e3c394ffb8 (diff)
parent	df24e83ce3d2ac97f64500bb77538447815d9cc7 (diff)