j1-template 2021.0.9 → 2021.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b532323c312f5e4f29197952a554f72e937788720b46ddab76995bb5d1abecb
-  data.tar.gz: 12c6c49d0a6bd07f5be239189c2546cf95735fbed47b0eef3ee127bbb192d50f
+  metadata.gz: 9ad880eb93e91e36cb456660c77e863b64dae610a81569a968524a627136b285
+  data.tar.gz: 844c32e109bba242ceb8035697248b04982a20b8565f07e8c8ca28bcb1a3d027
 SHA512:
-  metadata.gz: 00f07838d49656973f637894165c4b83cc0970cfeb41e3e38b0d394b58cdc72d5c9a5b846ed7bd056695394a07ab109e747aaf236e2f795214167aec93e1ac00
-  data.tar.gz: 8d1aafecf11a7760ef73c98d9e5d84f67d5434e3fbbf87707481dae5c5b5a5e42f36378759e1926bc85927a539ed3d77ecbc952fb185cb3680372f0a3381bbc5
+  metadata.gz: 30e32c19d2c52bb5a89262edb032187ea1860d10b2da61378247f36c94c87878462855196365ec63b6f252529991d252cb34d6e6a7e0acf641f382070a01ab3e
+  data.tar.gz: 6f6418b39121165283f0bcd7d743eeb76910774985515e7c4c7095257e7223fecd7de44a60ffe5b5745684ddde7900a879fca81cb1cc5fd1824b1c7480a0be99

data/_includes/themes/j1/layouts/content_generator_blog_archive.html

@@ -104,10 +104,10 @@
                 <nav class="paginator">
                   <ul class="pagination raised-z0">
 
-                    <li class="page-item"><a class="page-link md-grey-800" href="{{category_view}}" title="View by Category">By Category</a></li>
-                    <li class="page-item"><a class="page-link md-grey-800" href="{{date_view}}" title="View by Date">By Date</a></li>
-                    <!-- li class="page-item"><a class="page-link md-grey-800" href="{{tag_view}}" title="View by Tag">By Tag</a></li -->
-                    <li class="page-item"><a class="page-link md-grey-800" href="{{all_view}}" title="View All">All Posts</a></li>
+                    <li class="page-item"><a class="page-link" href="{{category_view}}" title="View by Category">By Category</a></li>
+                    <li class="page-item"><a class="page-link" href="{{date_view}}" title="View by Date">By Date</a></li>
+                    <!-- li class="page-item"><a class="page-link" href="{{tag_view}}" title="View by Tag">By Tag</a></li -->
+                    <li class="page-item"><a class="page-link" href="{{all_view}}" title="View All">All Posts</a></li>
 
                   </ul>
                 </nav> <!-- end paginator -->
@@ -133,8 +133,30 @@
                   <h2 id="previewer" class="mt-4">Preview</h2>
                 </div>
 
-                {% comment %} Display pagination links if any
-                ---------------------------------------------------------------- {% endcomment %}
+                {% if paginator.total_pages > 1 %}
+                <nav class="paginator mb-4">
+                  <ul class="pagination raised-z0">
+                    {% if paginator.previous_page %}
+                      <li class="page-item">
+                          <a class="page-link" href="{{ paginator.previous_page_path }}#article_navigator">Newer Posts</a>
+                      </li>
+                    {% else %}
+                        <li class="page-item disabled"><a href="#" class="page-link">First Page</a></li>
+                    {% endif %}
+
+                    {% if paginator.next_page %}
+                    <li class="page-item">
+                        <a class="page-link" href="{{ paginator.next_page_path }}#article_navigator">Older Posts</a>
+                    </li>
+                    {% else %}
+                        <li class="page-item disabled"><a href="#" class="page-link">Last Page</a></li>
+                    {% endif %}
+                  </ul>
+                </nav>
+                {% endif %}
+
+                {% comment %} Old (defect) preview paginator
+                ----------------------------------------------------------------
                 {% if paginator.total_pages > 1 %}
                 <!-- nav class="paginator ml-3" -->
                 <nav class="paginator">
@@ -142,26 +164,27 @@
                     {% if paginator.previous_page %}
                       {% if paginator.previous_page > 1 %}
                         {% capture page_link %}{{paginator.previous_page_path}}#previewer{% endcapture %}
-                        <li class="page-item"><a href="#" class="page-link md-grey-800" href="{{page_link}}" title="Previous page">Previous</a></li>
+                        <li class="page-item"><a href="#" class="page-link" href="{{page_link}}" title="Previous page">Previous</a></li>
                       {% else %}
                         {% comment %} Back to FIRST page {% endcomment %}
                         {% assign navigator = page.url | remove_first:'page2/index.html' %}
                         {% capture page_link %}{{navigator}}#previewer{% endcapture %}
-                        <li class="page-item"><a href="#" class="page-link md-grey-800" href="{{page_link}}" title="First page">Previous</a></li>
+                        <li class="page-item"><a href="#" class="page-link" href="{{page_link}}" title="First page">Previous</a></li>
                       {% endif %}
                     {% else %}
-                        <li class="page-item disabled"><a href="#" class="page-link md-grey-800">First</a></li>
+                        <li class="page-item disabled"><a href="#" class="page-link">First</a></li>
                     {% endif %}
 
                     {% if paginator.next_page %}
                         {% capture page_link %}{{paginator.next_page_path}}#previewer{% endcapture %}
-                        <li class="page-item"><a class="page-link md-grey-800" href="{{page_link}}" title="Next page">Next</a></li>
+                        <li class="page-item"><a class="page-link" href="{{page_link}}" title="Next page">Next</a></li>
                     {% else %}
-                        <li class="page-item disabled"><a href="#" class="page-link md-grey-800">Last</a>
+                        <li class="page-item disabled"><a href="#" class="page-link">Last</a>
                     {% endif %}
                   </ul>
                 </nav>
                 {% endif %}
+                ---------------------------------------------------------------- {% endcomment %}
 
                 <!-- div class="view-description ml-3 mb-3" -->
                 <div class="view-description mb-3">
@@ -246,5 +269,4 @@
     <!-- /div --> <!-- end row -->
   <!-- /div --> <!-- end container -->
 
-
   <!-- [INFO   ] [j1.layout.content_generator_blog.html  ] [ end content ] -->

data/_includes/themes/j1/layouts/content_generator_post.html

@@ -77,8 +77,8 @@
       ------------------------------------------------------------------------ {% endcomment %}
       {% if page.series %}
       <header class="bmd-layout-header">
-        <!-- div class="navbar navbar-dark bg-primary raised-z2 mb-4" -->
-        <div class="navbar navbar-dark bg-primary raised-z2">
+        <!-- jadams, 2021-02-28 added mb-3 to the navbar -->
+        <div class="navbar navbar-dark bg-primary raised-z2 mb-3">
           <button class="bmd-drawer drawer-toggler animated fadeIn" type="button" data-toggle="drawer" data-target="#post_navigator">
             <span class="mdi mdi-menu mdi-2x"></span>
           </button>
@@ -90,11 +90,13 @@
         </div>
       </header>
 
-      <nav class="nav bmd-layout-container custom-size-350 bmd-drawer-f-l">
+      <!-- jadams, 2021-02-28: added bmd-drawer-overlay to close nav -->
+      <!-- by click on overflow (as well as by toggle button) -->
+      <nav class="nav bmd-layout-container bmd-drawer-overlay custom-size-350 bmd-drawer-f-l">
         <!-- Drawer content -->
         <div id="post_navigator" class="bmd-layout-drawer bg-faded">
-          <!-- header><a class="navbar-brand ml-3 mb-3">{{page.title}}</a></header -->
-          <header><a class="navbar-brand mb-3">{{page.title}}</a></header>
+          <!-- jadams, 2021-02-28: disabled header -->
+          <!-- header><a class="navbar-brand mb-3">{{page.title}}</a></header -->
           <!--  Series Navigator -->
           {% comment %}{% include {{create_series_header}} page=page post=post readmore=page.readmore %}{% endcomment %}
           {% include {{create_series_header}} page=page post=post readmore=false %}

data/_includes/themes/j1/procedures/global/create_bs_button.proc

@@ -75,7 +75,7 @@
     {% endfor %}
 
     {% if button_href and button_target %}
-      {% capture bs_button_html %}<a href="{{button_href}}" target="{{ button_target }}" class="{{button_class}}" style="{{button_style}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
+      {% capture bs_button_html %}<a href="{{button_href}}" target="{{ button_target }}" rel="noopener" class="{{button_class}}" style="{{button_style}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
     {% elsif button_href %}
       {% capture bs_button_html %}<a href="{{button_href}}" class="{{button_class}}" style="{{button_style}}"><i class="{{icon_family}} {{icon_family}}-{{button_icon}} {{icon_family}}-{{button_icon_size}} {{icon_family}}-{{button_icon_color}} mr-1"></i> {{button_text}} </a>{% endcapture %}
     {% else %}

data/_includes/themes/j1/procedures/posts/create_series_header.proc

@@ -52,6 +52,7 @@
 {% capture open %}
 <div id="post_series">
  <!-- div class="series-navigator ml-3" -->
+ <!-- jadams, 2021-02-28: added ml-3 -->
  <div class="series-navigator">
   <div class="container content series-navigation">
 
@@ -78,6 +79,7 @@
        </div>
 
        <!-- div class="col-xs-12 col-md-12 col-lg-12 mt-2" -->
+       <!-- jadams, 2021-02-28: added mr-3 -->
        <div class="mt-2">
          <h5 class="notoc series-exerpt-title">{{excerpt_title}}</h5>
          <!-- div class="series-exerpt mr-3" -->

data/assets/data/menu.html

@@ -192,13 +192,13 @@ regenerate:                             true
               {% if level_1.target == null %}
                 <li class="dropdown-item"><a href="{{ level_1.href }}{{ext}}">{{ level_1.title }}</a></li>
               {% else %}
-                <li class="dropdown-item"><a href="{{ level_1.href }}{{ext}}" target="{{ level_1.target }}">{{ level_1.title }}</a></li>
+                <li class="dropdown-item"><a href="{{ level_1.href }}{{ext}}" target="{{ level_1.target }}" rel="noopener">{{ level_1.title }}</a></li>
               {% endif %}
             {% else %}
               {% if level_1.target == null %}
                 <li class="dropdown-item"><a href="{{ level_1.href }}{{ext}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_1.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{ level_1.title }}</a></li>
               {% else %}
-                <li class="dropdown-item"><a href="{{ level_1.href }}{{ext}}" target="{{ level_1.target }}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_1.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{ level_1.title }}</a></li>
+                <li class="dropdown-item"><a href="{{ level_1.href }}{{ext}}" target="{{ level_1.target }}" rel="noopener"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_1.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{ level_1.title }}</a></li>
               {% endif %}
             {% endif %}
           {% endif %}
@@ -219,13 +219,13 @@ regenerate:                             true
                       {% if level_2.target == null %}
                         <li class="dropdown-item"><a href="{{ level_2.href }}{{ext}}">{{ level_2.title }}</a></li>
                       {% else %}
-                        <li class="dropdown-item"><a href="{{ level_2.href }}{{ext}}" target="{{ level_2.target }}">{{ level_2.title }}</a></li>
+                        <li class="dropdown-item"><a href="{{ level_2.href }}{{ext}}" target="{{ level_2.target }}" rel="noopener">{{ level_2.title }}</a></li>
                       {% endif %}
                     {% else %}
                       {% if level_2.target == null %}
                         <li class="dropdown-item"><a href="{{ level_2.href }}{{ext}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_2.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{ level_2.title }}</a></li>
                       {% else %}
-                        <li class="dropdown-item"><a href="{{ level_2.href }}{{ext}}" target="{{ level_2.target }}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_2.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{ level_2.title }}</a></li>
+                        <li class="dropdown-item"><a href="{{ level_2.href }}{{ext}}" target="{{ level_2.target }}" rel="noopener"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_2.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{ level_2.title }}</a></li>
                       {% endif %}
                     {% endif %}
                   {% endif %}
@@ -245,13 +245,13 @@ regenerate:                             true
                           {% if level_3.target == null %}
                             <li class="dropdown-item"><a href="{{ level_3.href }}{{ext}}">{{ level_3.title }}</a></li>
                           {% else %}
-                            <li class="dropdown-item"><a href="{{ level_3.href }}{{ext}}" target="{{ level_3.target }}">{{ level_3.title }}</a></li>
+                            <li class="dropdown-item"><a href="{{ level_3.href }}{{ext}}" target="{{ level_3.target }}" rel="noopener">{{ level_3.title }}</a></li>
                           {% endif %}
                         {% else %}
                           {% if level_3.target == null %}
                             <li class="dropdown-item"><a href="{{ level_3.href }}{{ext}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_3.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{ level_3.title }}</a></li>
                           {% else %}
-                            <li class="dropdown-item"><a href="{{ level_3.href }}{{ext}}" target="{{ level_3.target }}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_3.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{ level_3.title }}</a></li>
+                            <li class="dropdown-item"><a href="{{ level_3.href }}{{ext}}" target="{{ level_3.target }}" rel="noopener"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{level_3.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{ level_3.title }}</a></li>
                           {% endif %}
                         {% endif %}
                         {% if level_3.divider %} <li class="divider"></li> {% endif %}
@@ -299,9 +299,9 @@ regenerate:                             true
                 <ul class="menu-col">
                 {% for links in megabox.column %}
                   {% if links.icon == null %}
-                    <li class="dropdown-megamenu-item"><a href="{{links.href}}{{ext}}" target="{{ links.target }}">{{links.title}}</a></li>
+                    <li class="dropdown-megamenu-item"><a href="{{links.href}}{{ext}}" target="{{ links.target }}" rel="noopener">{{links.title}}</a></li>
                   {% else %}
-                    <li class="dropdown-megamenu-item"><a href="{{links.href}}{{ext}}" target="{{ links.target }}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{links.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{links.title}}</a></li>
+                    <li class="dropdown-megamenu-item"><a href="{{links.href}}{{ext}}" target="{{ links.target }}" rel="noopener"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{links.icon}} {{nav_menu_icon_size}} mr-2" style="color:{{nav_menu_icon_color}}"></i> {{links.title}}</a></li>
                   {% endif %}
                 {% endfor %}
                 </ul>
@@ -327,14 +327,14 @@ regenerate:                             true
           {% if menu.target == null %}
             <li class="nav-item"> <a class="nav-link" href="{{ menu.href }}{{ext}}">{{ menu.item }}</a> </li>
           {% else %}
-            <li class="nav-item"> <a class="nav-link" href="{{ menu.href }}{{ext}}" target="{{ menu.target }}">{{ menu.item }}</a> </li>
+            <li class="nav-item"> <a class="nav-link" href="{{ menu.href }}{{ext}}" target="{{ menu.target }}" rel="noopener">{{ menu.item }}</a> </li>
           {% endif %}
         {% elsif menu.icon %}
           <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [no icon for menu-item found -->
           {% if menu.target == null %}
             <li> <a class="nav-link" href="{{ menu.href }}{{ext}}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{menu.icon}} {{nav_menu_icon_size}}" style="color:{{nav_menu_icon_color}}"></i> {{ menu.item }}</a> </li>
           {% else %}
-            <li> <a class="nav-link" href="{{ menu.href }}{{ext}}" target="{{ menu.target }}"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{menu.icon}} {{nav_menu_icon_size}}" style="color:{{nav_menu_icon_color}}"></i> {{ menu.item }}</a> </li>
+            <li> <a class="nav-link" href="{{ menu.href }}{{ext}}" target="{{ menu.target }}" rel="noopener"><i class="{{nav_menu_icon_style}} {{nav_menu_icon_family}}-{{menu.icon}} {{nav_menu_icon_size}}" style="color:{{nav_menu_icon_color}}"></i> {{ menu.item }}</a> </li>
           {% endif %}
         {% else %}
           <!-- [FATAL ] [nav_menu.menu-top-level-only       ] [processing menu item failed] -->
@@ -465,38 +465,6 @@ regenerate:                             true
   {% endfor %}
   <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [nav_menu_settings: end menu] -->
   </ul>
-
-  <style>
-    /* jadams, 2021-02-16: unclear why global styles defined in CSS file */
-    /* (bootsttrap.css) not applied. For that reason, given locally for now */
-    /* firefox: scrollbar-color, scrollbar-width */
-    .scrollable-menu {
-        height: auto;
-        max-height: 300px;
-        overflow-x: hidden;
-        scrollbar-color: #424242 #f5f5f5;
-      	scrollbar-width: thin;
-    }
-
-  .scrollable-menu::-webkit-scrollbar {
-      -webkit-appearance: none;
-      width: 12px;
-      background-color: #f5f5f5;
-  }
-
-  .scrollable-menu::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    -webkit-box-shadow: inset 0 0 6px rgba(255, 255, 255, 0.3);
-    background-color: #424242;
-  }
-
-  .scrollable-menu::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-    border-radius: 0px;
-    background-color: #f5f5f5;
-  }
-  </style>
-
   <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [nav_menu_settings: end navbar] -->
   <!-- [INFO   ] [j1.modules.navigator.menu.html  ] [nav_menu_settings: end processing] -->
 {% endcapture %}

data/assets/themes/j1/adapter/js/fam.js

@@ -396,16 +396,39 @@ j1.adapter['fam'] = (function (j1, window) {
       var currentNode;
       var prev_node;
       var anchor_id;
+      var index                = 0;
+      var maxNode              = $(nodes).length-1;
+      var $toc                 = $('#sidebar');
+      var current_header_id    = $toc.find('.is-active-link').attr('href');
+      var toccerScrollDuration = {{toccer_options.scrollSmoothDuration}};
+      var toccerScrollOffset   = {{toccer_options.scrollSmoothOffset}};
+
+      // Scroll offset correction if mobile or window width <= 992
+      // For smaller window sizes, the height of the menubar changes
+      //
+      // if (j1.core.isMobile() || $(window).width() <= 992) { scrollOffset += 30; }
+
+      // calculate offset for correct (smooth) scroll position
+      //
+      var $pagehead       = $('.attic');
+      var $navbar         = $('nav.navbar');
+      var $adblock        = $('#adblock');
+
+      var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
+      var fontSize        = $('body').css('font-size').replace('px','');
+      var start           = window.pageYOffset;
+
+      var l               = parseInt(fontSize);
+
+      var h               = $pagehead.length ? $pagehead.height() : 0;
+      var n               = $navbar.length ? $navbar.height() : 0;
+      var a               = $adblock.length ? $adblock.height() : 0;
 
-      var index             = 0;
-      var maxNode           = $(nodes).length - 1;
-      var $toc              = $('#sidebar');
-      var current_header_id = $toc.find('.is-active-link').attr('href');
-      var scrollDuration    = {{toccer_options.scrollSmoothDuration}};
-      var scrollOffset      = {{toccer_options.scrollSmoothOffset}};
+      var scrollOffset    = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
 
-      // Correction if mobile (offset: desktop -90px, mobile -80px)
-      scrollOffset          = j1.core.isMobile() ? scrollOffset + 10 : scrollOffset;
+      // static offset, to be checked why this is needed
+      //
+      scrollOffset        = scrollOffset + toccerScrollOffset;
 
       nodes.each(function () {
         currentNode = $(this).find(current_header_id);
@@ -418,7 +441,7 @@ j1.adapter['fam'] = (function (j1, window) {
             anchor_id           = '#' + previous_header_id;
 
             j1.core.scrollSmooth.scroll( anchor_id, {
-              duration: scrollDuration,
+              duration: toccerScrollDuration,
               offset: scrollOffset,
               callback: null
             });
@@ -439,12 +462,12 @@ j1.adapter['fam'] = (function (j1, window) {
       var nextNode;
       var next_header_id;
       var next_anchor_id;
-      var index             = 0;
-      var maxNode           = $(nodes).length-1;
-//    var maxNode           = $(nodes).length;
-      var $toc              = $('#sidebar');
-      var scrollDuration    = {{toccer_options.scrollSmoothDuration}};
-      var scrollOffset      = {{toccer_options.scrollSmoothOffset}};
+      var index                 = 0;
+      var maxNode               = $(nodes).length-1;
+      var $toc                  = $('#sidebar');
+      var scrollDuration        = {{toccer_options.scrollSmoothDuration}};
+      var toccerScrollDuration  = {{toccer_options.scrollSmoothDuration}};
+      var toccerScrollOffset    = {{toccer_options.scrollSmoothOffset}};
 
       current_header_id = $toc.find('.is-active-link').attr('href');
       nodes.each(function () {
@@ -453,28 +476,37 @@ j1.adapter['fam'] = (function (j1, window) {
           if (index == maxNode) {
             return false;
           } else {
-//          nextNode              = nodes[index];
-//          next_header_id        = $(nextNode).find(':header').first()[0].id;
-//          anchor_id             = '#' + next_header_id;
             nextNode              = nodes[index+1];
             next_header_id        = $(nextNode).find(':header').first()[0].id;
             next_anchor_id        = '#' + next_header_id;
 
-            // Correction if mobile (offset: desktop -90px, mobile -80px)
-            scrollOffset          = j1.core.isMobile() ? scrollOffset + 10 : scrollOffset;
+            // calculate offset for correct (smooth) scroll position
+            //
+            var $pagehead       = $('.attic');
+            var $navbar         = $('nav.navbar');
+            var $adblock        = $('#adblock');
+
+            var navbarType      = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
+            var fontSize        = $('body').css('font-size').replace('px','');
+            var start           = window.pageYOffset;
+
+            var l               = parseInt(fontSize);
 
-            // j1.core.scrollSmooth.scroll( next_anchor_id, {
-            //   duration: scrollDuration,
-            //   offset: scrollOffset,
-            //   callback: tocbot.refresh()
-            // });
+            var h               = $pagehead.length ? $pagehead.height() : 0;
+            var n               = $navbar.length ? $navbar.height() : 0;
+            var a               = $adblock.length ? $adblock.height() : 0;
+
+            var scrollOffset    = navbarType == 'fixed' ? -1*(n + a + l) : -1*(h + n + a + l);
+
+            // static offset, to be checked why this is needed
+            //
+            scrollOffset        = scrollOffset + toccerScrollOffset;
 
             j1.core.scrollSmooth.scroll( next_anchor_id, {
-              duration: scrollDuration,
+              duration: toccerScrollDuration,
               offset: scrollOffset,
               callback: null
             });
-
           }
         }
         index < maxNode ? index++ : index;

data/assets/themes/j1/adapter/js/mmenu.js

@@ -311,10 +311,15 @@ j1.adapter['mmenu'] = (function (j1, window) {
 
             // jadams, 2020-09-30: loading the menues (themes) if enabled
             if (themerEnabled) {
-              // from Bootswatch API (set localFeed EMPTY)
-              $('#remote_themes_mmenu').bootstrapThemeSwitcher({localFeed: ''});
-              // load (local) J1 themes (default settings) from JSON data
-              $('#local_themes_mmenu').bootstrapThemeSwitcher();
+              // load REMOTE themes from Bootswatch API (localFeed EMPTY!)
+              $('#remote_themes_mmenu').bootstrapThemeSwitcher({
+                localFeed: '',
+                bootswatchApiVersion: themerOptions.bootswatchApiVersion
+              });
+              // load LOCAL themes from JSON data
+              $('#local_themes_mmenu').bootstrapThemeSwitcher({
+                localFeed: themerOptions.localThemes
+              });
             }
 
             $('#{{item.menu.content.id}}').show();

data/assets/themes/j1/adapter/js/navigator.js

@@ -347,14 +347,21 @@ j1.adapter['navigator'] = (function (j1, window) {
                 logText = 'theme switcher detect: enabled';
                 logger.info(logText);
 
-                // load remote themes (Bootswatch API)
-                logText = 'load remote themes (Bootswatch API)';
+                logText = 'load themes';
                 logger.info(logText);
-                $('#remote_themes').bootstrapThemeSwitcher({localFeed: ''});
-                // load local themes (json file)
+
+                // load REMOTE themes from Bootswatch API (localFeed EMPTY!)
+                $('#remote_themes').bootstrapThemeSwitcher({
+                  localFeed: '',
+                  bootswatchApiVersion: themerOptions.bootswatchApiVersion
+                });
+
+                // load LOCAL themes from JSON data
                 logText = 'load local themes (json file)';
                 logger.info(logText);
-                $('#local_themes').bootstrapThemeSwitcher({localFeed: themerOptions.localThemes});
+                $('#local_themes').bootstrapThemeSwitcher({
+                  localFeed: themerOptions.localThemes
+                });
                 clearInterval(dependencies_met_page_finished);
               }
               _this.setState('initialized');

data/assets/themes/j1/adapter/js/themer.js

@@ -197,10 +197,19 @@ j1.adapter['themer'] = (function (j1, window) {
         if (j1.getState() == 'finished') {
           if (themerOptions.enabled) {
             // enable BS ThemeSwitcher
+            //
             logger.info('themes detected as: enabled');
             logger.info('theme is being initialized: ' + user_state.theme_name);
 
+            // jadams, 2021-02-22: make sure that remote themes are loaded
+            // max retries = max_count
+
+            // load list of remote themes
+            //
             if ( $('#remote_themes').length ) {
+              var interval_count = 0;
+              var max_count      = themerOptions.retries;
+
               /* eslint-disable */
               // initialize Bootswatch Theme Switcher
               $('#remote_themes').bootstrapThemeSwitcher.defaults = {
@@ -224,6 +233,46 @@ j1.adapter['themer'] = (function (j1, window) {
               }
               /* eslint-enable */
 
+              // jadams, 2021-02-16: load checking disabled. Seem does NOT
+              // solve the problem
+
+              // var dependencies_met_remote_themes_loaded = setInterval(function() {
+              //   interval_count += 1;
+              //   if ( document.getElementById("remote_themes").getElementsByTagName("li").length == 0  ) {
+              //     /* eslint-disable */
+              //     // initialize Bootswatch Theme Switcher
+              //     $('#remote_themes').bootstrapThemeSwitcher.defaults = {
+              //       debug:                    themerOptions.debug,
+              //       saveToCookie:             themerOptions.saveToCookie,
+              //       cssThemeLink:             themerOptions.cssThemeLink,
+              //       cookieThemeName:          themerOptions.cookieThemeName,
+              //       cookieDefaultThemeName:   themerOptions.cookieDefaultThemeName,
+              //       cookieThemeCss:           themerOptions.cookieThemeCss,
+              //       cookieThemeExtensionCss:  themerOptions.cookieThemeExtensionCss,
+              //       cookieExpiration:         themerOptions.cookieExpiration,
+              //       cookiePath:               themerOptions.cookiePath,
+              //       defaultCssFile:           themerOptions.defaultCssFile,
+              //       bootswatchApiUrl:         themerOptions.bootswatchApiUrl,
+              //       bootswatchApiVersion:     themerOptions.bootswatchApiVersion,
+              //       loadFromBootswatch:       themerOptions.loadFromBootswatch,
+              //       localFeed:                themerOptions.localThemes,
+              //       excludeBootswatch:        themerOptions.excludeBootswatch,
+              //       includeBootswatch:        themerOptions.includeBootswatch,
+              //       skipIncludeBootswatch:    themerOptions.skipIncludeBootswatch
+              //     }
+              //     /* eslint-enable */
+              //   } else {
+              //     logger.info('remote themes loaded: successfully');
+              //     logger.debug('remote themes loaded: successfully after: ' + interval_count * 25 + ' ms');
+              //     clearInterval(dependencies_met_remote_themes_loaded);
+              //   }
+              //   if (interval_count > max_count) {
+              //     logger.warn('remote themes loading: failed');
+              //     logger.warn('continue processing');
+              //     clearInterval(dependencies_met_remote_themes_loaded);
+              //   }
+              // }, 25);
+
               logger.info('theme loaded: ' + user_state.theme_name);
               logger.info('theme css file: ' + user_state.theme_css);
               _this.setState('finished');