Merge branch 'master' into menu-sections

 Conflicts:
	README.md
	exampleSite/config.toml
	layouts/partials/nav.html

14 files changed, 116 insertions, 35 deletions

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index def7af3..66b7e3c 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -1,6 +1,7 @@
-baseurl = "https://example.org"
+baseurl = "https://devcows.github.io/hugo-universal-theme/" # Configure URL. if using gh-pages https://github.com/<username>/hugo-universal-theme URL: https://<username>.github.io/hugo-universal-theme/
 title = "Universal"
 theme = "hugo-universal-theme"
+themesDir = "../.."
 languageCode = "en-us"
 # Site language. Available translations in the theme's `/i18n` directory.
 defaultContentLanguage = "en"
@@ -9,13 +10,14 @@ disqusShortname = "devcows"
 # Enable Google Analytics by entering your tracking code
 googleAnalytics = ""
 
+
 # Define the number of posts per page
 paginate = 10
 
 [menu]
 
-# Main menu
 
+# Main menu
 [[menu.main]]
     name       = "Home"
     identifier = "menu.home"
@@ -317,7 +319,7 @@ paginate = 10
 [[menu.main]]
     name       = "Blog"
     identifier = "section.ap-blog"
-    url        = ""
+    url        = "/blog/"
     weight     = 3
     parent     = "menu.allpages"
     post       = 4
@@ -329,15 +331,23 @@ paginate = 10
     parent     = "section.ap-blog"
 
 [[menu.main]]
+    name       = "Blog"
+    identifier = "menu.blog"
+    url        = "/blog/"
+    weight     = 5
+
+[[menu.main]]
     name       = "FAQ"
     identifier = "menu.faq"
     url        = "/faq/"
-    weight     = 5
+    weight     = 6
 
 [[menu.main]]
+    identifier = "contact"
     name       = "Contact"
     url        = "/contact/"
-    weight     = 6
+    weight     = 7
+
 
 # Top bar social links menu
 
@@ -345,52 +355,64 @@ paginate = 10
     weight = 1
     name = "GitHub"
     url = "https://github.com/devcows/hugo-universal-theme"
-    pre = "<i class='fa fa-2x fa-github'></i>"
+    pre = "<i class='fab fa-2x fa-github'></i>"
 
 [[menu.topbar]]
     weight = 2
     name = "Facebook"
     url = "http://facebook.com"
-    pre = "<i class='fa fa-2x fa-facebook'></i>"
+    pre = "<i class='fab fa-2x fa-facebook'></i>"
 
 [[menu.topbar]]
     weight = 3
     name = "Twitter"
     url = "http://twitter.com"
-    pre = "<i class='fa fa-2x fa-twitter'></i>"
+    pre = "<i class='fab fa-2x fa-twitter'></i>"
 
 [[menu.topbar]]
     weight = 4
     name = "Email"
-    url = "mailto:your@email.com"
-    pre = "<i class='fa fa-2x fa-envelope'></i>"
+    url = "mailto:hello@universal.com"
+    pre = "<i class='fas fa-2x fa-envelope'></i>"
 
 [params]
     viewMorePostLink = "/blog/"
     author = "DevCows"
     defaultKeywords = ["devows", "hugo", "go"]
+    mainSections = ["blog"]
     defaultDescription = "Site template made by devcows using hugo"
 
-    # Google Maps API key (if not set will default to not passing a key.)
-    googleMapsApiKey = "AIzaSyCFhtWLJcE30xOAjcbSFi-0fnoVmQZPb1Y"
+    # Social media
+    facebook_site = "" # the Facebook handle of your site ('https://www.facebook.com/HANDLE')
+    twitter_site = "GoHugoIO" # the Twitter handle of your site (without the '@')
+    default_sharing_image = "img/sharing-default.png"
+
+    # Google Maps widget: If `googleMapsApiKey` is not set, no key will be passed to Google (which likely results in a broken map widget).
+    enableGoogleMaps = true
+    googleMapsApiKey = "AIzaSyAv7Sza8NSp9_l_g8G2vlo0H4ydEPn_2jY"
+
+    latitude = "-12.043333"
+    longitude = "-77.028333"
 
     # Style options: default (light-blue), blue, green, marsala, pink, red, turquoise, violet
     style = "default"
 
     # Since this template is static, the contact form uses www.formspree.io as a
     # proxy. The form makes a POST request to their servers to send the actual
-    # email. Visitors can send up to a 1000 emails each month for free.
+    # email. Visitors can send up to a 50 emails each month for free.
     #
     # What you need to do for the setup?
     #
-    # - set your email address under 'email' below
+    # - register your account to https://formspree.io/register
+    # - login and create new form
+    # - set your form's endpoint url under 'formspree_action' below
     # - upload the generated site to your server
-    # - send a dummy email yourself to confirm your account
-    # - click the confirm link in the email from www.formspree.io
+    # - test a dummy email yourself
     # - you're done. Happy mailing!
     #
-    # Enable the contact form by entering your Formspree.io email
-    email = "your@email.com"
+    # Enable the contact form by entering your Formspree.io endpoint url
+    formspree_action = "https://formspree.io/sample/of/endpoint"
+    contact_form_ajax = false
 
     about_us = "<p>Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.</p>"
     copyright = "Copyright (c) 2015 - 2016, YourCompany; all rights reserved."
@@ -399,7 +421,8 @@ paginate = 10
     date_format = "January 2, 2006"
 
     logo = "img/logo.png"
-    address = """<p><strong>Universal Ltd.</strong>
+    logo_small = "img/logo-small.png"
+    address = """<p class="text-uppercase"><strong>Universal Ltd.</strong>
         <br>13/25 New Avenue
         <br>Newtown upon River
         <br>45Y 73J
@@ -408,18 +431,16 @@ paginate = 10
         <strong>Great Britain</strong>
       </p>
       """
-    latitude = "-12.043333"
-    longitude = "-77.028333"
 
-[Permalinks]
+[permalinks]
     blog = "/blog/:year/:month/:day/:filename/"
 
 # Enable or disable top bar with social icons
 [params.topbar]
     enable = true
     text = """<p class="hidden-sm hidden-xs">Contact us on +420 777 555 333 or hello@universal.com.</p>
-      <p class="hidden-md hidden-lg"><a href="#" data-animate-hover="pulse"><i class="fa fa-phone"></i></a>
-      <a href="#" data-animate-hover="pulse"><i class="fa fa-envelope"></i></a>
+      <p class="hidden-md hidden-lg"><a href="tel:+420 777 555 333" data-animate-hover="pulse"><i class="fas fa-phone"></i></a>
+      <a href="mailto:hello@universal.com" data-animate-hover="pulse"><i class="fas fa-envelope"></i></a>
       </p>
       """
 
@@ -429,11 +450,26 @@ paginate = 10
     tags = true
     search = true
 
-[params.carousel]
-    enable = true
+[params.carouselCustomers]
+    items = 6
+    auto_play = false
+    slide_speed = 2000
+    pagination_speed = 1000
+
+[params.carouselTestimonals]
+    items = 4
+    auto_play = false
+    slide_speed = 2000
+    pagination_speed = 1000
+
+[params.carouselHomepage]
     # All carousel items are defined in their own files. You can find example items
     # at 'exampleSite/data/carousel'.
     # For more informtion take a look at the README.
+    enable = true
+    auto_play = true
+    slide_speed = 2000
+    pagination_speed = 1000
 
 [params.features]
     enable = true
@@ -451,7 +487,7 @@ paginate = 10
 
 [params.see_more]
     enable = true
-    icon = "fa fa-file-code-o"
+    icon = "far fa-file-alt"
     title = "Do you want to see more?"
     subtitle = "We have prepared for you more than 40 different HTML pages, including 5 variations of homepage."
     link_url = "#"
@@ -469,3 +505,9 @@ paginate = 10
     enable = true
     title = "From our blog"
     subtitle = "Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend leo."
+    hide_summary = false
+
+[taxonomies]
+  category = "categories"
+  tag = "tags"
+  author = "authors"
diff --git a/exampleSite/content/blog/categories-post.md b/exampleSite/content/blog/categories-post.md
new file mode 100644
index 0000000..55f2b78
--- /dev/null
+++ b/exampleSite/content/blog/categories-post.md
@@ -0,0 +1,19 @@
++++
+title = "Categories Post"
+date = "2021-08-01T21:29:20+02:00"
+tags = ["golang", "programming", "theme", "hugo"]
+categories = ["programming","lorem","pseudo"]
+banner = "img/banners/banner-4.jpg"
+authors = ["John Doe"]
++++
+
+I'm a post with multiple categories in the frontmatter:
+
+    categories = ["programming","lorem","pseudo"]
+
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. In mauris nulla, vestibulum vel auctor sed, posuere eu lorem. Aliquam consequat augue ut accumsan mollis. Suspendisse malesuada sodales tincidunt. Vivamus sed erat ac augue bibendum porta sed id ipsum. Ut mollis mauris eget ligula sagittis cursus. Aliquam id pharetra tellus. Pellentesque sed tempus risus. Proin id hendrerit ante. Vestibulum vitae urna ut mauris ultricies dignissim. Ut ante turpis, tristique vitae sagittis quis, sagittis nec diam. Fusce pulvinar cursus porta. Vivamus maximus leo dolor, ut pellentesque lorem fringilla nec. Mauris faucibus turpis posuere sapien euismod, a ullamcorper mi maximus.
+
+Morbi varius ex vel justo dictum placerat. Sed ac arcu pretium, varius elit eget, gravida purus. Fusce sit amet massa mollis eros tincidunt sollicitudin. Suspendisse iaculis cursus mauris ut sagittis. Interdum et malesuada fames ac ante ipsum primis in faucibus. Maecenas elit ligula, molestie quis magna eu, semper posuere lorem. Mauris a justo pharetra, congue ex eget, tincidunt massa. Maecenas sit amet neque lorem.
+
+Curabitur at elementum quam. Curabitur tristique elit non sapien aliquam vulputate. Vivamus in odio tincidunt, tempor sem quis, tincidunt lacus. Mauris pulvinar nunc sed tempus dictum. Nam vel arcu quis mi fermentum ullamcorper non ac lacus. Donec aliquet vitae ante at imperdiet. Aenean scelerisque venenatis urna, eget elementum risus convallis ac. Nullam gravida arcu lacus, non consectetur augue pretium non. Duis dignissim eros id urna pretium congue. Nullam eu magna in sem sollicitudin tempor. Pellentesque vel convallis ligula. Quisque semper, turpis a rhoncus efficitur, magna nibh iaculis elit, eget tempor dolor eros ut mi. Maecenas eu placerat lacus. Praesent congue pretium nulla, sed suscipit metus rutrum vel.
diff --git a/exampleSite/content/blog/creating-a-new-theme.md b/exampleSite/content/blog/creating-a-new-theme.md
index 07f0145..233b293 100644
--- a/exampleSite/content/blog/creating-a-new-theme.md
+++ b/exampleSite/content/blog/creating-a-new-theme.md
@@ -3,7 +3,9 @@ title = "Creating a new theme"
 date = "2015-06-24T13:50:46+02:00"
 tags = ["theme"]
 categories = ["starting"]
+description = "This tutorial will show you how to create a simple theme in Hugo. I assume that you are familiar with HTML, the bash command line, and that you are comfortable using Markdown to format content."
 banner = "img/banners/banner-1.jpg"
+authors = ["Jane Doe"]
 +++
 
 ## Introduction
diff --git a/exampleSite/content/blog/go-is-for-lovers.md b/exampleSite/content/blog/go-is-for-lovers.md
index 8b09d63..b5f3ff0 100644
--- a/exampleSite/content/blog/go-is-for-lovers.md
+++ b/exampleSite/content/blog/go-is-for-lovers.md
@@ -4,6 +4,7 @@ date = "2015-09-17T13:47:08+02:00"
 tags = ["go"]
 categories = ["programming"]
 banner = "img/banners/banner-2.jpg"
+facebook_author = "GolangSociety"
 +++
 
 Hugo uses the excellent [go][] [html/template][gohtmltemplate] library for
diff --git a/exampleSite/content/blog/linked-post.md b/exampleSite/content/blog/linked-post.md
index f2793d1..6463eca 100644
--- a/exampleSite/content/blog/linked-post.md
+++ b/exampleSite/content/blog/linked-post.md
@@ -4,7 +4,7 @@ date = "2015-10-02T21:49:20+02:00"
 tags = ["golang", "programming", "theme", "hugo"]
 categories = ["programming"]
 banner = "img/banners/banner-4.jpg"
-author = "John Doe"
+authors = ["John Doe","Jane Doe"]
 +++
 
 I'm a linked post in the menu. You can add other posts by adding the following line to the frontmatter:
diff --git a/exampleSite/content/blog/migrate-from-jekyll.md b/exampleSite/content/blog/migrate-from-jekyll.md
index ce21cb5..dfe0018 100644
--- a/exampleSite/content/blog/migrate-from-jekyll.md
+++ b/exampleSite/content/blog/migrate-from-jekyll.md
@@ -1,9 +1,9 @@
 +++
 title = "Migrate from Jekyll"
-date = "2015-10-10T13:07:31+02:00"
 tags = ["ipsum"]
 categories = ["lorem"]
 banner = "img/banners/banner-5.jpg"
+twitter_author = "jekyllrb"
 +++
 
 ## Move static content to `static`
diff --git a/exampleSite/data/features/consulting.yaml b/exampleSite/data/features/consulting.yaml
index 7f62850..4284222 100644
--- a/exampleSite/data/features/consulting.yaml
+++ b/exampleSite/data/features/consulting.yaml
@@ -1,4 +1,5 @@
 weight: 4
 name: "Consulting"
-icon: "fa fa-lightbulb-o"
+icon: "fas fa-lightbulb"
+url: ""
 description: "Fifth abundantly made Give sixth hath. Cattle creature i be don't them behold green moved fowl Moved life us beast good yielding. Have bring."
diff --git a/exampleSite/data/features/email.yaml b/exampleSite/data/features/email.yaml
index 327081f..42c6499 100644
--- a/exampleSite/data/features/email.yaml
+++ b/exampleSite/data/features/email.yaml
@@ -1,4 +1,5 @@
 weight: 5
 name: "Email Marketing"
-icon: "fa fa-envelope-o"
+icon: "far fa-envelope"
+url: ""
 description: "Advantage old had otherwise sincerity dependent additions. It in adapted natural hastily is justice. Six draw you him full not mean evil."
diff --git a/exampleSite/data/features/print.yaml b/exampleSite/data/features/print.yaml
index 9057565..6362fa3 100644
--- a/exampleSite/data/features/print.yaml
+++ b/exampleSite/data/features/print.yaml
@@ -1,4 +1,5 @@
 weight: 2
 name: "Print"
-icon: "fa fa-print"
+icon: "fas fa-print"
+url: ""
 description: "Advantage old had otherwise sincerity dependent additions. It in adapted natural hastily is justice. Six draw you him full not mean evil."
diff --git a/exampleSite/data/features/seo.yaml b/exampleSite/data/features/seo.yaml
index c0f165f..29af3d3 100644
--- a/exampleSite/data/features/seo.yaml
+++ b/exampleSite/data/features/seo.yaml
@@ -1,4 +1,5 @@
 weight: 3
 name: "SEO and SEM"
-icon: "fa fa-globe"
+icon: "fas fa-globe"
+url: ""
 description: "Am terminated it excellence invitation projection as. She graceful shy believed distance use nay. Lively is people so basket ladies window expect."
diff --git a/exampleSite/data/features/uiux.yaml b/exampleSite/data/features/uiux.yaml
index 1257208..0533859 100644
--- a/exampleSite/data/features/uiux.yaml
+++ b/exampleSite/data/features/uiux.yaml
@@ -1,4 +1,5 @@
 weight: 6
 name: "UI/UX"
-icon: "fa fa-user"
+icon: "fas fa-user"
+url: ""
 description: "Am terminated it excellence invitation projection as. She graceful shy believed distance use nay. Lively is people so basket ladies window expect."
diff --git a/exampleSite/data/features/webdesign.yaml b/exampleSite/data/features/webdesign.yaml
index 097bc1a..0731ce8 100644
--- a/exampleSite/data/features/webdesign.yaml
+++ b/exampleSite/data/features/webdesign.yaml
@@ -1,4 +1,5 @@
 weight: 1
 name: "Webdesign"
-icon: "fa fa-desktop"
+icon: "fas fa-desktop"
+url: ""
 description: "Fifth abundantly made Give sixth hath. Cattle creature i be don't them behold green moved fowl Moved life us beast good yielding. Have bring."
diff --git a/exampleSite/static/css/custom.css b/exampleSite/static/css/custom.css
new file mode 100644
index 0000000..34b59c5
--- /dev/null
+++ b/exampleSite/static/css/custom.css
@@ -0,0 +1,11 @@
+/* your styles go here */
+/* Example site test */
+
+.box-image-text .image {
+    min-height: 200px;
+    max-height: 200px;
+}
+
+.box-simple {
+    min-height: 230px;
+}
diff --git a/exampleSite/static/img/sharing-default.png b/exampleSite/static/img/sharing-default.png
new file mode 100644
index 0000000..5180bbb
--- /dev/null
+++ b/exampleSite/static/img/sharing-default.png