make topbar navigatible better and put everything in row and column

Author: kirstin

_data/navigation.yml

@@ -9,10 +9,12 @@
 - title: Upcoming Events
   url: "/#upcoming-events"
   side: left
+  class: toggle-topbar-click
 
 - title: Testimonials
   url: "/#testimonials"
   side: left
+  class: toggle-topbar-click
 
 # - title: Getting Started
 #   url: "/getting-started/"
@@ -81,6 +83,7 @@
 - title: "About Me"
   url: "/#about-me"
   side: right
+  class: toggle-topbar-click
 
 - title: "Contact"
   url: "/contact/"

_includes/_footer_scripts.html

@@ -5,7 +5,7 @@
 {% endif %}
 
 
-<script src="{{ site.url }}{{ site.baseurl }}/assets/js/javascript.min.js"></script>
+<script src="{{ site.url }}{{ site.baseurl }}/assets/js/javascript.js"></script>
 
 
 {% if page.header.image_fullwidth %}

_includes/_navigation.html

@@ -5,13 +5,13 @@
 *
 {% endcomment %}
 <div id="navigation" class="sticky">
-  <nav class="top-bar" role="navigation" data-topbar>
+  <nav class="top-bar" role="navigation" data-topbar data-options="scrolltop: false">
     <ul class="title-area">
       <li class="name">
       <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class="icon-tree"> {{ site.title }}</a></h1>
     </li>
        <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
-      <li class="toggle-topbar menu-icon"><a href="#"><span>Nav</span></a></li>
+      <li class="toggle-topbar toggle-topbar-click menu-icon"><a><span>Nav</span></a></li>
     </ul>
     <section class="top-bar-section">
 {% comment %}

_includes/render-markdown

@@ -2,5 +2,8 @@
 see https://github.com/jekyll/jekyll-archives/issues/28#issuecomment-101282909
 see https://github.com/jekyll/jekyll/issues/1303#issuecomment-21067548
 {% endcomment %}
-{% capture my_include %}{{ include.content }}{% endcapture %}
-{{ my_include | markdownify }}
+<div class="row t30">
+  <div class="medium-8 columns">
+    {{ include.content | markdownify }}
+  </div><!-- /.medium-8.columns -->
+</div><!-- /.row -->

_includes/vision.md

@@ -1,4 +1,4 @@
-
+{% capture vision %}
 
 
 ## Vision
@@ -10,3 +10,8 @@ I want us to be able to hold love for one another, not succumbing to fear, other
 For this we need a culture which supports peace.
 
 [_Let's work together_](/contact)
+
+
+
+{% endcapture %}
+{% include render-markdown content=vision %}

_layouts/frontpage.html

@@ -9,11 +9,11 @@
     </div><!-- /.row -->
 </div><!-- /#header-home -->
 
-<div class="row t60">
-{% capture vision %}{% include vision.md %}{% endcapture %}
-{{ vision | markdownify }}
+<div class="vision">
+  {% include vision.md %}
 </div>
 
+
 {% comment %}
 *
 * First check, if widget is empty or not by checking if there is a title
@@ -105,6 +105,4 @@ <h2><a href="{{ site.url }}{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a
 * see https://github.com/jekyll/jekyll-archives/issues/28#issuecomment-101282909
 {% endcomment %}
 
-<div class="row">
-    {{ content }}
-</div><!-- /.row -->
+{{ content }}

assets/js/javascript.js

@@ -2152,7 +2152,7 @@ function FastClick(a,b){"use strict";function c(a,b){return function(){return a.
       var self = this,
           topbar;
 
-      if (toggleEl) {
+      if (toggleEl && ! toggleEl.classList.contains("toggle-topbar-click")) {
         topbar = self.S(toggleEl).closest('[' + this.attr_name() + ']');
       } else {
         topbar = self.S('[' + this.attr_name() + ']');
@@ -2192,7 +2192,7 @@ function FastClick(a,b){"use strict";function c(a,b){return function(){return a.
             topbar.addClass('fixed');
             self.S('body').removeClass('f-topbar-fixed');
 
-            window.scrollTo(0,0);
+            window.scrollTo(0,0); // I do not like this
           } else {
             topbar.parent().removeClass('expanded');
           }
@@ -2224,8 +2224,8 @@ function FastClick(a,b){"use strict";function c(a,b){return function(){return a.
 
       S(this.scope)
         .off('.topbar')
-        .on('click.fndtn.topbar', '[' + this.attr_name() + '] .toggle-topbar', function (e) {
-          e.preventDefault();
+        .on('click.fndtn.topbar', '[' + this.attr_name() + '] .toggle-topbar-click', function (e) {
+          //e.preventDefault();
           self.toggle(this);
         })
         .on('click.fndtn.topbar','.top-bar .top-bar-section li a[href^="#"],[' + this.attr_name() + '] .top-bar-section li a[href^="#"]',function (e) {

assets/js/javascript.min.js

@@ -147,9 +147,7 @@ You can also find NVC events by me and other NVC trainers here: [nvc-uk.com](htt
 
 ## about me
 {% endcapture %}
-<div class="row t30">
-{{ index_markdown | markdownify }}
-</div><!-- /.row -->
+{% include render-markdown content=index_markdown %}
 
 {% capture index_markdown %}
 I have been studying and teaching about NVC since 2014, just before my daughter was born. Now, I'm living in a yurt in rural Wales together with my partner Nicco and our two children. In 2020 we moved here from Germany.
@@ -187,9 +185,7 @@ We live off-grid in a yurt and enjoy a very simple lifestyle, which has taught m
 
 
 {% endcapture %}
-<div class="row t30">
-{{ index_markdown | markdownify }}
-</div><!-- /.row -->
+{% include render-markdown content=index_markdown %}