Merge pull request volny#4 from vvalchev/get_rid_of_jekyll_menus

Get rid of jekyll-menus - just can't get it working on github-pages.
piq91-com · Mar 3, 2020 · d9fce70 · d9fce70
2 parents c42b200 + 518e85b
commit d9fce70
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 53 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,8 +4,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 gem "github-pages", "~> 204"
 
-# Other dependencies as paginate, sitemap and 'seo-tag'
-# are already added by github-pages
 group :jekyll_plugins do
-    gem "jekyll-menus", "~> 0.6.1"
+  gem "jekyll-sitemap", "~> 1.4"
+  gem "jekyll-seo-tag", "~> 2.6"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -123,8 +123,6 @@ GEM
     jekyll-mentions (1.5.1)
       html-pipeline (~> 2.3)
       jekyll (>= 3.7, < 5.0)
-    jekyll-menus (0.6.1)
-      jekyll (>= 3.6, < 5.0)
     jekyll-optional-front-matter (0.3.2)
       jekyll (>= 3.0, < 5.0)
     jekyll-paginate (1.1.0)
@@ -245,7 +243,8 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages (~> 204)
-  jekyll-menus (~> 0.6.1)
+  jekyll-seo-tag (~> 2.6)
+  jekyll-sitemap (~> 1.4)
 
 BUNDLED WITH
    2.1.2
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ Creating a site with this particular Jekyll theme, is basically writing a markdo
 - Don't forget to change `_data/footer.yml` to update the copyright.
 - In `index.md` reorder or remove section as you prefer.
 - You can also add other pages, like `links.md`.
-- If you want to add the home page sections to the menus - take a look at `_data/menus.yml`
+- Edit `_data/menus.yml` to add links in the navigation bar.
 
 # Credits
 * This work is heavily inspired by https://github.com/volny/creative-theme-jekyll.

diff --git a/_config.yml b/_config.yml
@@ -4,6 +4,7 @@ description: > # this means to ignore newlines until "baseurl:"
 baseurl: "" # the subpath of your site, e.g. /blog/
 url: "" # the base hostname & protocol for your site
 author: Copyright &copy; 2019 - Start Bootstrap
+lang: en_US
 
 # Build settings
 safe: true # always trues on github-pages, disables _plugins/
@@ -13,7 +14,6 @@ sass:
   style: compact
   precision: 10
 plugins:
-  - jekyll-menus
   - jekyll-sitemap
   - jekyll-seo-tag
 exclude:

diff --git a/_data/menus.yml b/_data/menus.yml
@@ -13,3 +13,5 @@ header:
   url: /#timeline
 - title: Contacts
   url: /#contacts
+- title: Links
+  url: /links
diff --git a/_includes/nav.html b/_includes/nav.html
@@ -6,7 +6,7 @@
     </button>
     <div class="collapse navbar-collapse" id="navbarResponsive">
       <ul class="navbar-nav ml-auto my-2 my-lg-0">
-        {% for item in site.menus.header  %}
+        {% for item in site.data.menus.header  %}
           <li class="nav-item">
             <a class="nav-link js-scroll-trigger" href="{{ item.url | relative_url }}">{{ item.title }}</a>
           </li>

diff --git a/_layouts/base.html b/_layouts/base.html
@@ -26,6 +26,7 @@
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
   <![endif]-->
+{% seo %}
 </head>
 
 <body id="page-top" class="{% if page.layout == site.landing_template %}landing {% endif %}">

diff --git a/_plugins/hooks.rb b/_plugins/hooks.rb
diff --git a/index.md b/index.md
@@ -3,8 +3,6 @@ layout: home
 sections:
   - type: call-to-action.html
     section_id: about
-    # If you don't put 'menu_title', this section will not appear in the menus
-    menu_title: About
     background_style: bg-primary
     title: We've got what you need!
     text: Start Bootstrap has everything you need to get your new website up and running in no time! All of the templates and themes on Start Bootstrap are open source, free to download, and easy to use. No strings attached!
@@ -16,7 +14,6 @@ sections:
   - type: services.html
     section_id: services
     #background_style: bg-info
-    menu_title: Services
     title: At Your Service
     services:
       - title: Sturdy Templates
@@ -42,7 +39,6 @@ sections:
     # this section has always ID 'portfolio'
     #section_id: portfolio
     #background_style: bg-dark
-    menu_title: Portfolio
     projects:
       - title: Project 1
         text: This is a very short project description.
@@ -82,7 +78,6 @@ sections:
 
   - type: members.html
     section_id: members
-    menu_title: Members
     title: Our Crew!
     background_style: bg-info text-white
     members:
@@ -116,7 +111,6 @@ sections:
 
   - type: timeline.html
     section_id: timeline
-    menu_title: History
     title: Major Achievements!
     background_style: bg-dark text-primary
     last_image: assets/img/timeline-end.png
@@ -138,7 +132,6 @@ sections:
 
   - type: contact.html
     section_id: contacts
-    menu_title: Contacts
     title: Let's Get In Touch!
     text: >-
       Ready to start your next project with us? Give us a call or send us an email