j1-template 2020.0.5 → 2020.0.6

data/lib/starter_web/assets/themes/j1/adapter/js/ssm.js

@@ -155,8 +155,9 @@ j1.adapter['ssm'] = (function (j1, window) {
         if (interval_count > max_count) {
           logger.warn('dependency check failed for module: navigator');
           logger.warn('dependencies of module navigator met after: ' + interval_count * 25 + ' ms');
+          j1.core.ssm.init (moduleOptions);
+          _this.ssmLoader(moduleOptions);
           clearInterval(dependencies_met_navigator);
-          //j1.adapter.ssm.ssmLoader(ssmMenuOptions);
         }
       }, 25);
 
@@ -189,7 +190,8 @@ j1.adapter['ssm'] = (function (j1, window) {
         // ---------------------------------------------------------------------
         var dependencies_met_mmenu_initialized = setInterval (function () {
           if (ssm) {
-            if (j1.getState() === 'finished') {
+           if (j1.getState() === 'finished') {
+//         if ( j1.adapter.navigator.getState() == 'finished' ) {
               logger.info('load HTML data (AJAX): finished');
               _this.setState('processing');
               logger.info('status: ' + _this.getState());
@@ -204,7 +206,7 @@ j1.adapter['ssm'] = (function (j1, window) {
           } else {
             logger.error('initialize ssm failed, HTML data NOT loaded');
           }
-        }); // END dependencies_met_mmenu_loaded
+        }, 25); // END dependencies_met_mmenu_loaded
       }); // END done
     }, // END dataLoader
 

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

@@ -116,7 +116,7 @@ j1.adapter['themer'] = (function (j1, window) {
   var logger;
   var logText;
 
-  var default_theme_css           = environment === 'production' ? '/assets/themes/j1/core/css/uno.min.css' : '/assets/themes/j1/core/css/uno.css';
+  var default_theme_css           = (environment == 'production') ? '/assets/themes/j1/core/css/uno.min.css' : '/assets/themes/j1/core/css/uno.css';
   var default_theme_extention_css = '{{themer_options.includeBootswatch}}';
   var default_theme_name          = 'Uno';
   var default_theme_author        = 'J1 Team';

data/lib/starter_web/assets/themes/j1/adapter/js/toccer.js

@@ -1,5 +1,5 @@
 ---
-regenerate:                             false
+regenerate:                             true
 ---
 
 {% capture j1_cache %}
@@ -127,10 +127,8 @@ j1.adapter['toccer'] = (function () {
         settings.collapseDepth = {{toccer_options.collapseDepth}};
       }
 
-      if (settings.headingsOffset === undefined) {
-        settings.scrollOffset = {{toccer_options.smoothScrollOffset}};
-      } else {
-        settings.scrollOffset = settings.headingsOffset
+      if (settings.scrollSmoothOffset === undefined) {
+        settings.scrollSmoothOffset = {{toccer_options.scrollSmoothOffset}};
       }
 
       if (settings.enabled === undefined) {
@@ -188,47 +186,42 @@ j1.adapter['toccer'] = (function () {
       _this.setState('running');
       logger.info('state: ' + _this.getState());
 
-      // jadams, 2020-06-23: TODO, tocbot should be fired if page|mmenu
-      //                     is ready
+      // tocbot fired if page|mmenu is ready
       //
-      setTimeout (function () {
-        var bg_primary = j1.getStyleValue('bg-primary', 'background-color');
-
-        tocbot.init({
-          log:                    {{ toccer_options.log | json }},
-          activeLinkColor:        {{ toccer_options.activeLinkColor | json }},
-          tocSelector:            {{ toccer_options.tocSelector | json }},
-          headingSelector:        {{ toccer_options.headingSelector | json }},
-          ignoreSelector:         {{ toccer_options.ignoreSelector | json }},
-          contentSelector:        {{ toccer_options.contentSelector | json }},
-          collapseDepth:          settings.collapseDepth,
-          throttleTimeout:        {{ toccer_options.throttleTimeout | json }},
-          includeHtml:            false,
-          linkClass:              'toc-link',
-          extraLinkClasses:       '',
-          activeLinkClass:        'is-active-link',
-          listClass:              'toc-list',
-          extraListClasses:       '',
-          isCollapsedClass:       'is-collapsed',
-          collapsibleClass:       'is-collapsible',
-          listItemClass:          'toc-list-item',
-          positionFixedSelector:  '',
-          positionFixedClass:     'is-position-fixed',
-          fixedSidebarOffset:     'auto',
-          smoothScroll:           {{ toccer_options.smoothScrollEnabled | json }},
-          smoothScrollOffset:     {{ toccer_options.smoothScrollOffset | json }},
-          smoothScrollDuration:   {{ toccer_options.smoothScrollDuration | json }},
-          headingsOffset:         {{ toccer_options.headingsOffset | json }},
-          throttleTimeout:        {{ toccer_options.throttleTimeout | json }}
-        });
-
-        if (tocbot.options.log == true) {
-          // Writes all of the current option settings to JS console
-          console.log(tocbot.options);
-        }
-      }, {{toccer_options.delay}});
-
-      return true;
+        var dependencies_met_j1_page_ready = setInterval (function () {
+          if (j1.getState() === 'finished') {
+            var bg_primary = j1.getStyleValue('bg-primary', 'background-color');
+
+            tocbot.init({
+              log:                    {{ toccer_options.log | json }},
+              activeLinkColor:        {{ toccer_options.activeLinkColor | json }},
+              tocSelector:            {{ toccer_options.tocSelector | json }},
+              headingSelector:        {{ toccer_options.headingSelector | json }},
+              ignoreSelector:         {{ toccer_options.ignoreSelector | json }},
+              contentSelector:        {{ toccer_options.contentSelector | json }},
+              collapseDepth:          settings.collapseDepth,
+              throttleTimeout:        {{ toccer_options.throttleTimeout | json }},
+              includeHtml:            false,
+              linkClass:              'toc-link',
+              extraLinkClasses:       '',
+              activeLinkClass:        'is-active-link',
+              listClass:              'toc-list',
+              extraListClasses:       '',
+              isCollapsedClass:       'is-collapsed',
+              collapsibleClass:       'is-collapsible',
+              listItemClass:          'toc-list-item',
+              positionFixedSelector:  '',
+              positionFixedClass:     'is-position-fixed',
+              fixedSidebarOffset:     'auto',
+              scrollSmooth:           {{ toccer_options.scrollSmooth | json }},
+              scrollSmoothDuration:   {{ toccer_options.scrollSmoothDuration | json }},
+              scrollSmoothOffset:     {{ toccer_options.scrollSmoothOffset | json }},
+              headingsOffset:         {{ toccer_options.headingsOffset | json }},
+              throttleTimeout:        {{ toccer_options.throttleTimeout | json }}
+            });
+            clearInterval(dependencies_met_j1_page_ready);
+        } // END j1 finished
+      }, 25); // END dependencies_met_j1_page_ready
     }, // END initToccerCore
 
     // -------------------------------------------------------------------------

data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/css/themes/uno.css

@@ -23,9 +23,9 @@
    ----------------------------------------------------------------------------- */
 
 /* Drawer */
-.mm-ocd {
+/* .mm-ocd {
   top: 80px; /* jadams, 2020-06-20: offset to the NAV bar */
-}
+} */
 
 .mm-ocd--left .mm-ocd__content {
   background-color: #212121;
@@ -35,6 +35,64 @@
   background-color: #212121;
 }
 
+/* Responsive */
+/* jadams, 2020-07-02: media query for MMenu
+--------------------------------------------------------------------------------
+NOTE: For unknown reason, style "mm-ocd--left" is NOT applied correctly
+      like "mm-ocd--right" what cause the wrong background-color
+      As a workaround, the background-color is added to the media
+      queries as well (but MUST be removed if fixed!!!)
+-------------------------------------------------------------------------------- */
+
+/* Large desktop */
+@media only screen and (min-width: 1200px) {
+  .mm-ocd {
+    top: 80px; /* drawer top offset to NAV bar */
+  }
+  .mm-ocd__content {
+      background-color: #212121;
+  }
+}
+
+/* Desktop */
+@media only screen and (min-width: 992px) {
+  .mm-ocd {
+    top: 80px; /* drawer top offset to NAV bar */
+  }
+  .mm-ocd__content {
+      background-color: #212121;
+  }
+}
+
+/* Desktop 2 (intermediate|responsive size) */
+@media only screen and (min-width: 768px) and (max-width: 992px) {
+  .mm-ocd {
+    top: 68px; /* drawer top offset to NAV bar */
+  }
+  .mm-ocd__content {
+      background-color: #212121;
+  }
+}
+/* Landscape iPad, 768px */
+@media only screen and (min-width: 576px) and (max-width: 768px){
+  .mm-ocd {
+    top: 68px; /* drawer top offset to NAV bar */
+  }
+  .mm-ocd__content {
+      background-color: #212121;
+  }
+}
+
+/* Small devices (landscape phones, up to 576px) */
+@media only screen and (max-width: 576px) {
+  .mm-ocd {
+    top: 68px; /* drawer top offset to NAV bar */
+  }
+  .mm-ocd__content {
+      background-color: #212121;
+  }
+}
+
 /* Navigator */
 .mm-spn.mm-spn--navbar:after {
   text-align: left;  /* jadams, 2020-06-20: set menu title to the left */

data/lib/starter_web/assets/themes/j1/extensions/mmenu-light/css/themes/uno.min.css

@@ -23,9 +23,9 @@
    ----------------------------------------------------------------------------- */
 
 /* Drawer */
-.mm-ocd {
+/* .mm-ocd {
   top: 80px; /* jadams, 2020-06-20: offset to the NAV bar */
-}
+} */
 
 .mm-ocd--left .mm-ocd__content {
   background-color: #212121;
@@ -35,6 +35,64 @@
   background-color: #212121;
 }
 
+/* Responsive */
+/* jadams, 2020-07-02: media query for MMenu
+--------------------------------------------------------------------------------
+NOTE: For unknown reason, style "mm-ocd--left" is NOT applied correctly
+      like "mm-ocd--right" what cause the wrong background-color
+      As a workaround, the background-color is added to the media
+      queries as well (but MUST be removed if fixed!!!)
+-------------------------------------------------------------------------------- */
+
+/* Large desktop */
+@media only screen and (min-width: 1200px) {
+  .mm-ocd {
+    top: 80px; /* drawer top offset to NAV bar */
+  }
+  .mm-ocd__content {
+      background-color: #212121;
+  }
+}
+
+/* Desktop */
+@media only screen and (min-width: 992px) {
+  .mm-ocd {
+    top: 80px; /* drawer top offset to NAV bar */
+  }
+  .mm-ocd__content {
+      background-color: #212121;
+  }
+}
+
+/* Desktop 2 (intermediate|responsive size) */
+@media only screen and (min-width: 768px) and (max-width: 992px) {
+  .mm-ocd {
+    top: 68px; /* drawer top offset to NAV bar */
+  }
+  .mm-ocd__content {
+      background-color: #212121;
+  }
+}
+/* Landscape iPad, 768px */
+@media only screen and (min-width: 576px) and (max-width: 768px){
+  .mm-ocd {
+    top: 68px; /* drawer top offset to NAV bar */
+  }
+  .mm-ocd__content {
+      background-color: #212121;
+  }
+}
+
+/* Small devices (landscape phones, up to 576px) */
+@media only screen and (max-width: 576px) {
+  .mm-ocd {
+    top: 68px; /* drawer top offset to NAV bar */
+  }
+  .mm-ocd__content {
+      background-color: #212121;
+  }
+}
+
 /* Navigator */
 .mm-spn.mm-spn--navbar:after {
   text-align: left;  /* jadams, 2020-06-20: set menu title to the left */

data/lib/starter_web/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "j1_starter",
-  "version": "2020.0.5",
+  "version": "2020.0.6",
   "description": "J1 Template starter Web",
   "homepage": "https://your.site",
   "author": {

data/lib/starter_web/utilsrv/_defaults/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2020.0.5",
+  "version": "2020.0.6",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

data/lib/starter_web/utilsrv/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "utls",
-  "version": "2020.0.5",
+  "version": "2020.0.6",
   "description": "J1 Template Utility Server",
   "homepage": "https://jekyll.one",
   "author": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j1-template
 version: !ruby/object:Gem::Version
-  version: 2020.0.5
+  version: 2020.0.6
 platform: ruby
 authors:
 - juergen_jekyll_one
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -393,7 +393,6 @@ files:
 - assets/themes/j1/core/css/custom.scss
 - assets/themes/j1/core/css/globals.css
 - assets/themes/j1/core/css/globals.min.css
-- assets/themes/j1/core/css/globals.scss
 - assets/themes/j1/core/css/theme_extensions.css
 - assets/themes/j1/core/css/theme_extensions.min.css
 - assets/themes/j1/core/css/uno.css
@@ -548,12 +547,10 @@ files:
 - lib/starter_web/_data/layouts/raw.yml
 - lib/starter_web/_data/modules/attics.yml
 - lib/starter_web/_data/modules/authentication.yml
-- lib/starter_web/_data/modules/back2top.yml
 - lib/starter_web/_data/modules/cookie_consent.yml
 - lib/starter_web/_data/modules/cookiebar.yml
 - lib/starter_web/_data/modules/defaults/attics.yml
 - lib/starter_web/_data/modules/defaults/authentication.yml
-- lib/starter_web/_data/modules/defaults/back2top.yml
 - lib/starter_web/_data/modules/defaults/cookie_consent.yml
 - lib/starter_web/_data/modules/defaults/cookiebar.yml
 - lib/starter_web/_data/modules/defaults/framer.yml
@@ -561,7 +558,6 @@ files:
 - lib/starter_web/_data/modules/defaults/log4javascript.yml
 - lib/starter_web/_data/modules/defaults/log4r.yml
 - lib/starter_web/_data/modules/defaults/navigator.yml
-- lib/starter_web/_data/modules/defaults/smooth_scroll.yml
 - lib/starter_web/_data/modules/defaults/ssm.yml
 - lib/starter_web/_data/modules/defaults/stickybits.yml
 - lib/starter_web/_data/modules/defaults/themer.yml
@@ -571,9 +567,7 @@ files:
 - lib/starter_web/_data/modules/log4javascript.yml
 - lib/starter_web/_data/modules/log4r.yml
 - lib/starter_web/_data/modules/navigator.yml
-- lib/starter_web/_data/modules/navigator.yml.new
 - lib/starter_web/_data/modules/navigator_menu.yml
-- lib/starter_web/_data/modules/smooth_scroll.yml
 - lib/starter_web/_data/modules/ssm.yml
 - lib/starter_web/_data/modules/themer.yml
 - lib/starter_web/_data/modules/toccer.yml
@@ -607,6 +601,7 @@ files:
 - lib/starter_web/_plugins/prettify.rb
 - lib/starter_web/_plugins/simple_search_filter.rb
 - lib/starter_web/_plugins/symlink_watcher.rb
+- lib/starter_web/_plugins/uglify.rb
 - lib/starter_web/apps/public/cc/cc.yml
 - lib/starter_web/apps/public/cc/index.adoc
 - lib/starter_web/assets/images/collections/blog/featured/jekyll.1200x400.png
@@ -909,7 +904,6 @@ files:
 - lib/starter_web/assets/images/quotes/people.png
 - lib/starter_web/assets/themes/j1/adapter/js/algolia.js
 - lib/starter_web/assets/themes/j1/adapter/js/attic.js
-- lib/starter_web/assets/themes/j1/adapter/js/back2top.js
 - lib/starter_web/assets/themes/j1/adapter/js/carousel.js
 - lib/starter_web/assets/themes/j1/adapter/js/cookie_consent.js
 - lib/starter_web/assets/themes/j1/adapter/js/framer.js
@@ -919,9 +913,7 @@ files:
 - lib/starter_web/assets/themes/j1/adapter/js/lightbox.js
 - lib/starter_web/assets/themes/j1/adapter/js/logger.js
 - lib/starter_web/assets/themes/j1/adapter/js/mmenu.js
-- lib/starter_web/assets/themes/j1/adapter/js/mmenu.js.new
 - lib/starter_web/assets/themes/j1/adapter/js/navigator.js
-- lib/starter_web/assets/themes/j1/adapter/js/scroller.js
 - lib/starter_web/assets/themes/j1/adapter/js/searcher.js
 - lib/starter_web/assets/themes/j1/adapter/js/ssm.js
 - lib/starter_web/assets/themes/j1/adapter/js/themer.js

data/assets/themes/j1/core/css/globals.scss

@@ -1,28 +0,0 @@
------
-# This front matter enables Jekyll to read the SASS file to be transformed
-# into CSS.
-#
-# !!! To enble SASS processing, change the five dashes into triple dashes !!!
-#
-# NOTE: Only main files contain this front matter, NOT the (SASS) partials
-# located under the SASS folder _sass.
------
-
-// -----------------------------------------------------------------------------
-//  ~/assets/themes/j1/core/css/themes/vendor.scss
-//  J1 Vendor Styles. Partials located in folder _sass/scss/vendor
-//
-//  Product/Info:
-//  https://jekyll.one
-//
-//  Copyright (C) 2020 Juergen Adams
-//
-//  J1 Template is licensed under the MIT License.
-//  See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
-//  -----------------------------------------------------------------------------
-//  J1 Template Core, generated: {{site.time}}
-//  -----------------------------------------------------------------------------
-
-{% comment %} Import Theme Uno SCSS partials
---------------------------------------------------------------- {% endcomment %}
-@import "globals";

data/lib/starter_web/_data/modules/back2top.yml

@@ -1,40 +0,0 @@
-# ------------------------------------------------------------------------------
-# ~/_data/modules/back2top.yml
-# User configuration settings for J1 Back2Top module
-#
-# Product/Info:
-# https://jekyll.one
-#
-# Copyright (C) 2020 Juergen Adams
-#
-# J1 Template is licensed under the MIT License.
-# See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# About this configuration (used for J1 CC only)
-#
-about_config:
-
-  title:                                Back2Top
-  scope:                                User settings
-  location:                             _data/modules/back2top.yml
-
-# ------------------------------------------------------------------------------
-# User configuration settings
-#
-settings:
-
-  enabled:                              true
-  active_color:                         md_indigo
-  background_color:                     md_grey_900
-  
-  icon:                                 "f05d"
-  icon_family:                          MDI
-
-  scrollto:                             0
-  startline:                            100  
-  scrollduration:                       1000
-
-# END config
-# ------------------------------------------------------------------------------