resolve conflict

16 files changed, 96 insertions, 44 deletions

diff --git a/README.md b/README.md
index 26747d2..25f3c6f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,11 @@
+## Biztrox - Business theme (Premium)
+[![Biztrox hugo theme](https://user-images.githubusercontent.com/5304905/48638129-e8ffb200-e9f9-11e8-99a7-b081e27a1941.png)](https://themefisher.com/products/biztrox-hugo-template/)
+
+[Live Preview](http://demo.themefisher.com/themefisher/biztrox-hugo/)
+
+[Download Now](https://themefisher.com/products/biztrox-hugo-template/)
+
+
 # _Meghna_ for Hugo
 ![screenshot](https://user-images.githubusercontent.com/37659754/45415821-501e8480-b6a0-11e8-89a8-5c2248b35d5e.png "Home of the website")
 
diff --git a/assets/js/script.js b/assets/js/script.js
index 246874a..4483b4b 100644
--- a/assets/js/script.js
+++ b/assets/js/script.js
@@ -63,7 +63,8 @@ jQuery(function ($) {
 	/*	Portfolio Filtering Hook
 	/* =========================================================================  */
 
-	var mixer = mixitup('.portfolio-items-wrapper');
+	if ($('.portfolio-items-wrapper').length)
+		mixitup('.portfolio-items-wrapper');
 
 	/* ========================================================================= */
 	/*	Testimonial Carousel
@@ -305,4 +306,6 @@ function initialize() {
 	map.setMapTypeId('roadatlas');
 }
 
-google.maps.event.addDomListener(window, "load", initialize);
\ No newline at end of file
+// Check init google maps only if "google" has been defined.
+if("google" in window)
+	google.maps.event.addDomListener(window, "load", initialize);
\ No newline at end of file
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index 922c832..f637c17 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -1,7 +1,7 @@
 baseURL = "http://example.org/"
 languageCode = "en-us"
 title = "Meghna | Responsive Multipurpose Parallax HTML5 Template"
-theme = "meghna"
+theme = "meghna-hugo"
 
 # Menu
 [menu]
@@ -50,6 +50,7 @@ description = "Airspace Hugo theme"
 author = "Themefisher"
 # Google Analitycs
 googleAnalitycsID = "Your ID"
+custom_css = ["css/custom.css"]
 
     # Banner Section
     [params.banner]
@@ -102,21 +103,28 @@ googleAnalitycsID = "Your ID"
         # social Icons
         [[params.footer.socialIcon]]
         icon = "tf-ion-social-facebook"
+        url = "#"
         
         [[params.footer.socialIcon]]
         icon = "tf-ion-social-twitter"
+        url = "#"
         
         [[params.footer.socialIcon]]
         icon = "tf-ion-social-google-outline"
+        url = "#"
         
         [[params.footer.socialIcon]]
         icon = "tf-ion-social-youtube"
+        url = "#"
         
         [[params.footer.socialIcon]]
         icon = "tf-ion-social-linkedin"
+        url = "#"
         
         [[params.footer.socialIcon]]
         icon = "tf-ion-social-dribbble-outline"
+        url = "#"
         
         [[params.footer.socialIcon]]
-        icon = "tf-ion-social-pinterest-outline"
\ No newline at end of file
+        icon = "tf-ion-social-pinterest-outline"
+        url = "#"
diff --git a/exampleSite/data/contact.yml b/exampleSite/data/contact.yml
index 64e5b11..a63c25c 100644
--- a/exampleSite/data/contact.yml
+++ b/exampleSite/data/contact.yml
@@ -3,6 +3,7 @@ heading : Get In
 headingSpan : Touch
 title : Contact Details
 content : Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ipsam, vero, provident, eum eligendi blanditiis ex explicabo vitae nostrum facilis asperiores dolorem illo officiis ratione vel fugiat dicta laboriosam labore adipisci.
+enable_maps : false
 mapLatitude : 51.5223477
 mapLongitude: -0.1622023
 contactDetails :
diff --git a/exampleSite/data/team.yml b/exampleSite/data/team.yml
index f4cb4c2..5805927 100644
--- a/exampleSite/data/team.yml
+++ b/exampleSite/data/team.yml
@@ -8,9 +8,13 @@ teamMember :
     description : Lorem ipsum dolor sit amet consectetur adipisicing elit. Aspernatur necessitatibus ullam, culpa odio.
     socialIcon :
       - icon : tf-ion-social-facebook
+        url : "#"
       - icon : tf-ion-social-twitter
+        url : "#"
       - icon : tf-ion-social-linkedin
+        url : "#"
       - icon : tf-ion-social-dribbble-outline
+        url : "#"
       
   - image : images/team/team-2.jpg
     name : Frank Miller
@@ -18,9 +22,13 @@ teamMember :
     description : Lorem ipsum dolor sit amet consectetur adipisicing elit. Aspernatur necessitatibus ullam, culpa odio.
     socialIcon :
       - icon : tf-ion-social-facebook
+        url : "#"
       - icon : tf-ion-social-twitter
+        url : "#"
       - icon : tf-ion-social-linkedin
+        url : "#"
       - icon : tf-ion-social-dribbble-outline
+        url : "#"
       
   - image : images/team/team-3.jpg
     name : Michael Jonson
@@ -28,9 +36,13 @@ teamMember :
     description : Lorem ipsum dolor sit amet consectetur adipisicing elit. Aspernatur necessitatibus ullam, culpa odio.
     socialIcon :
       - icon : tf-ion-social-facebook
+        url : "#"
       - icon : tf-ion-social-twitter
+        url : "#"
       - icon : tf-ion-social-linkedin
+        url : "#"
       - icon : tf-ion-social-dribbble-outline
+        url : "#"
       
   - image : images/team/team-4.jpg
     name : Mo. Kha. Alamgir
@@ -38,6 +50,10 @@ teamMember :
     description : Lorem ipsum dolor sit amet consectetur adipisicing elit. Aspernatur necessitatibus ullam, culpa odio.
     socialIcon :
       - icon : tf-ion-social-facebook
+        url : "#"
       - icon : tf-ion-social-twitter
+        url : "#"
       - icon : tf-ion-social-linkedin
-      - icon : tf-ion-social-dribbble-outline
\ No newline at end of file
+        url : "#"
+      - icon : tf-ion-social-dribbble-outline
+        url : "#"
\ No newline at end of file
diff --git a/exampleSite/static/css/custom.css b/exampleSite/static/css/custom.css
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/exampleSite/static/css/custom.css
@@ -0,0 +1 @@
+
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 5f8e2ec..a908c02 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -1,11 +1,14 @@
 <!DOCTYPE html>
-<html>
-    {{- partial "head.html" . -}}
-    <body>
-        {{- partial "header.html" . -}}
-        <div id="content">
+<html class="no-js" lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}">
+{{- partial "head.html" . -}}
+
+{{"<!-- body start -->" | safeHTML}}
+
+<body id="body" data-spy="scroll" data-target=".navbar" data-offset="50">
+    <div id="content">
         {{- block "main" . }}{{- end }}
-        </div>
-        {{- partial "footer.html" . -}}
-    </body>
-</html>
+    </div>
+    {{- partial "footer.html" . -}}
+</body>
+
+</html>
\ No newline at end of file
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 10d9e21..36b14d3 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,3 +1,5 @@
+{{ define "main" }}
+
 {{ partial "header.html" . }}
 
 {{ partial "navigation.html" . }}
@@ -31,4 +33,4 @@
 </section>
 {{"<!-- /blog -->" | safeHTML}}
 
-{{ partial "footer.html" . }}
+{{ end }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 2ec6546..f3ff0c8 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,3 +1,5 @@
+{{ define "main" }}
+
 {{ partial "header.html" . }}
 
 {{ partial "navigation.html" . }}
@@ -22,4 +24,4 @@
     </div>
 </section>
 
-{{ partial "footer.html" . }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index 21f41ea..d770239 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,31 +1,33 @@
-{{ partial "header.html" . }}
-	
-{{ partial "preloader.html" . }}
-	    
-{{ partial "hero-area.html" . }}
+{{ define "main" }}
 
-{{ partial "navigation.html" . }}
+    {{ partial "header.html" . }}
+        
+    {{ partial "preloader.html" . }}
+            
+    {{ partial "hero-area.html" . }}
 
-{{ partial "about.html" . }}
+    {{ partial "navigation.html" . }}
 
-{{ partial "cta.html" . }}
+    {{ partial "about.html" . }}
 
-{{ partial "service.html" . }}
-	
-{{ partial "skill.html" . }}
+    {{ partial "cta.html" . }}
 
-{{ partial "portfolio.html" . }}
+    {{ partial "service.html" . }}
+        
+    {{ partial "skill.html" . }}
 
-{{ partial "counter.html" . }}
+    {{ partial "portfolio.html" . }}
 
-{{ partial "team.html" . }}
-		
-{{ partial "pricing.html" . }}
+    {{ partial "counter.html" . }}
 
-{{ partial "testimonial.html" . }}
+    {{ partial "team.html" . }}
+            
+    {{ partial "pricing.html" . }}
 
-{{ partial "blog.html" . }}
-		
-{{ partial "contact.html" . }}
+    {{ partial "testimonial.html" . }}
 
-{{ partial "footer.html" . }}
\ No newline at end of file
+    {{ partial "blog.html" . }}
+            
+    {{ partial "contact.html" . }}
+
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/blog.html b/layouts/partials/blog.html
index 023ff48..04ef6ae 100644
--- a/layouts/partials/blog.html
+++ b/layouts/partials/blog.html
@@ -6,7 +6,7 @@
 
             {{"<!-- section title -->" | safeHTML}}
             <div class="title text-center wow fadeInDown">
-                <h2> {{ with .Site.Data.blog.heading }} {{ . }} {{ end }} <span class="color"> {{ with .Site.Data.blog.heading }} {{ . }} {{ end }} </span></h2>
+                <h2> {{ with .Site.Data.blog.heading }} {{ . }} {{ end }} <span class="color"> {{ with .Site.Data.blog.headingSpan }} {{ . }} {{ end }} </span></h2>
                 <div class="border"></div>
             </div>
             {{"<!-- /section title -->" | safeHTML}}
@@ -38,4 +38,4 @@
     </div>
 </section>
 {{"<!-- /blog -->" | safeHTML}}
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/partials/contact.html b/layouts/partials/contact.html
index a2b2a84..7b01554 100644
--- a/layouts/partials/contact.html
+++ b/layouts/partials/contact.html
@@ -63,11 +63,13 @@
         </div>
     </div>
 
+    {{ if .Site.Data.contact.enable_maps }}
     {{"<!-- Google Map -->" | safeHTML}}
     <div class="google-map">
         <div id="map-canvas" {{ with .Site.Data.contact.mapLatitude }} data-latitude="{{ . }}" {{ end }} 
         {{ with .Site.Data.contact.mapLongitude }} data-longitude="{{ . }}" {{ end }}></div>
     </div>
+    {{ end }}
 
 </section>
 {{"<!-- /contact -->" | safeHTML}}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 9b84967..29aecc6 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -8,7 +8,7 @@
 				<div class="social-icon">
 					<ul class="list-inline">
 						{{ range .Site.Params.footer.socialIcon }}
-						<li><a href="#"><i class="{{ .icon }}"></i></a></li>
+            <li><a href="{{ .url }}"><i class="{{ .icon }}"></i></a></li>
 						{{ end }}
 					</ul>
 				</div>
@@ -66,4 +66,4 @@
 		</script>
 		
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index d38aec8..43858f1 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -29,7 +29,11 @@
 		{{"<!-- Main Stylesheet -->"|safeHTML}}
         {{ $styles := resources.Get "css/style.css" | minify}}
         <link rel="stylesheet" href="{{ $styles.Permalink }}" integrity="{{ $styles.Data.Integrity }}" media="screen">
+        
+        {{ range .Site.Params.custom_css }}
+        <link rel="stylesheet" href="{{ . | absURL }}">
+        {{ end }}
 
     </head>
     {{"<!-- body start -->" | safeHTML}}
-    <body id="body" data-spy="scroll" data-target=".navbar" data-offset="50"></body>
\ No newline at end of file
+    <body id="body" data-spy="scroll" data-target=".navbar" data-offset="50"></body>
diff --git a/layouts/partials/team.html b/layouts/partials/team.html
index beb0447..195ce54 100644
--- a/layouts/partials/team.html
+++ b/layouts/partials/team.html
@@ -23,7 +23,7 @@
                         <div class="mask">
                             <ul class="list-inline">
                                 {{ range .socialIcon }}
-                                <li><a href="#"><i class="{{ .icon }}"></i></a></li>
+                                <li><a href="{{ .url }}"><i class="{{ .icon }}"></i></a></li>
                                 {{ end }}
                             </ul>
                         </div>
diff --git a/theme.toml b/theme.toml
index dce338b..dbac2e4 100644
--- a/theme.toml
+++ b/theme.toml
@@ -2,7 +2,7 @@ name = "Meghna Hugo"
 license = "CC BY 3.0"
 licenselink = "https://creativecommons.org/licenses/by/3.0/"
 description = "Hugo port of the Themefisher’s Meghna Template"
-homepage = "http://demo.themefisher.com/themefisher/meghna/"
+homepage = "https://github.com/themefisher/meghna-hugo"
 tags = ['landing-page', 'business', 'agency-template', 'themefisher', 'hugo-theme', 'hugo-templates', 'bootstrap', 'blog', 'responsive', 'portfolio', 'single-page', 'dark', 'clean', 'simple', 'company', 'creative', 'contact-form', 'custom-themes', 'mobile']
 features = ['bootstrap','responsive']
 min_version = "0.48"