j1-template 2020.0.17 → 2020.0.22

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

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             false
 ---
 
 {% capture cache %}
@@ -37,7 +37,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 
@@ -49,10 +49,8 @@ regenerate: true
 {% comment %} Set config options
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign themer_options    = themer_defaults| merge: themer_settings %}
-{% assign default_theme     = template_config.bootstrap.default_theme %}
-{% assign vendor_css        = "vendor" %}
-{% assign theme_base        = "core/css" %}
-{% assign theme_ext         = "css" %}
+{% assign default_theme     = template_config.theme %}
+{% assign theme_base        = "core/css/themes" %}
 
 {% if environment == "development" or environment == "test" %}
   {% assign theme_ext       = "css" %}
@@ -68,23 +66,23 @@ regenerate: true
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/themer.js
- # JS Adapter for J1 themer (BS Theme themer)
+ # JS Adapter for J1 themer (bootstrapThemeSwitcher)
  #
  # Product/Info:
  # https://jekyll.one
- # https://github.com/jguadagno/bootstrapThemethemer
+ # https://github.com/jguadagno/bootstrapThemeSwitcher
  #
  # Copyright (C) 2020 Juergen Adams
  # Copyright (C) 2014 Joseph Guadagno
  #
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
- # BS Theme themer is licensed under the MIT License.
- # For details, see https://github.com/jguadagno/bootstrapThemethemer/blob/master/LICENSE
+ # bootstrapThemeSwitcher is licensed under the MIT License.
+ # For details, see https://github.com/jguadagno/bootstrapThemeSwitcher/blob/master/LICENSE
  # -----------------------------------------------------------------------------
  # NOTE:
- #  Setup of theme selectors (ThemeList|ThemeSelect) moved
- #  to j1_adapter_navigator.js
+ #  Setup of theme loaders for local_themes|remote_themes moved
+ #  to adapter navigator.js
  # -----------------------------------------------------------------------------
  # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
@@ -102,79 +100,42 @@ j1.adapter['themer'] = (function (j1, window) {
   // globals
   // ---------------------------------------------------------------------------
   var environment                 = '{{environment}}';
-  var moduleOptions               = {};
+  var themerOptions               = $.extend({}, {{themer_options | replace: '=>', ':' | replace: 'nil', '""' }});
   var user_state                  = {};
   var cookie_names                = j1.getCookieNames();
   var cookie_user_state_name      = cookie_names.user_state;
   var user_state_detected         = false;
+  var styleLoaded                 = false;
   var id                          = 'default';
-  var cssFile                     = '{{themer_options.defaultCssFile}}';
-  var interval_count              = 0;
-  var max_count                   = 4;
-  var user_state_json;
   var user_state_cookie;
+  var theme_css_html;
   var _this;
-  var theme;
-  var themeName;
-  var themeCss;
-  var themeCssHtml;
-  var vendorCssHtml;
-  var themeExtensionCss;
-  var themeExtensionCssHtml;
   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_extention_css = '{{themer_options.includeBootswatch}}';
-  var default_theme_name          = 'Uno';
-  var default_theme_author        = 'J1 Team';
-  var default_theme_link          = 'https://jekyll.one/';
+  var default_theme_name        = '{{default_theme.name}}';
+  var default_theme_author      = '{{default_theme.author}}';
+  var default_theme_author_url  = '{{default_theme.theme_author_url}}';
+  var default_theme_css_name    = default_theme_name.toLowerCase().replace(' ', '-');
+  var default_theme_css         = (environment == 'production')
+                                  ? '{{asset_path}}/{{theme_base}}/' +default_theme_css_name+ '/bootstrap.min.css'
+                                  : '{{asset_path}}/{{theme_base}}/' +default_theme_css_name+ '/bootstrap.css';
 
   // ---------------------------------------------------------------------------
   // helper functions
   // ---------------------------------------------------------------------------
-  // See: https://stackoverflow.com/questions/16965515/how-to-get-a-style-attribute-from-a-css-class-by-javascript-jquery
-  // Example: getStyleValueFromStyleSheet('bg-primary', 'background-color', 'vendor');
+  // Example: var styleLoaded = styleSheetLoaded('');
   function styleSheetLoaded(styleSheet) {
-    // var styleSheet  = styleSheetName.toLowerCase() + '.css';
-    var sheets      = document.styleSheets, stylesheet = sheets[(sheets.length - 1)];
+    var sheets = document.styleSheets, stylesheet = sheets[(sheets.length - 1)];
 
     // find CSS file 'styleSheetName' in document
     for(var i in document.styleSheets) {
       if(sheets[i].href && sheets[i].href.indexOf(styleSheet) > -1) {
-        return true;;
-      }
-    }
-  }
-
-  {% comment %} Unused code
-  ------------------------------------------------------------------------------
-  // NOTE: Does not work anymore because of CORS check violation
-  // See: https://stackoverflow.com/questions/16965515/how-to-get-a-style-attribute-from-a-css-class-by-javascript-jquery
-  // Example: getStyleValueFromStyleSheet('bg-primary', 'background-color', 'vendor');
-  function getStyleValueFromStyleSheet(className, style, styleSheetName) {
-    var sheets = document.styleSheets, stylesheet = sheets[(sheets.length - 1)];
-    var style;
-
-    // find CSS file 'styleSheetName' in document
-    for(var i in document.styleSheets){
-      if(sheets[i].href && sheets[i].href.indexOf(styleSheetName + ".css") > -1) {
-        stylesheet = sheets[i];
-        break;
-      }
-      if (typeof(stylesheet) === 'undefined') return null;
-    }
-
-    // find CSS style 'style' in styleSheetName
-    for (var j=0, k=stylesheet.cssRules.length; j < k; j++) {
-      var rule = stylesheet.cssRules[j];
-      if (rule.selectorText && rule.selectorText.split(',').indexOf('.' +className) !== -1) {
-        style = rule.style[style];
-        return style;
+        return true;
       }
     }
+    return false;
   }
-  ------------------------------------------------------------------------------ {% endcomment %}
 
   // ---------------------------------------------------------------------------
   // Main object
@@ -198,71 +159,64 @@ j1.adapter['themer'] = (function (j1, window) {
       user_state_detected = j1.existsCookie(cookie_user_state_name);
       if (user_state_detected) {
         user_state            = j1.readCookie(cookie_user_state_name);
-        themeName             = user_state.theme_name;
-        themeCss              = user_state.theme_css;
-        themeExtensionCss     = user_state.theme_extension_css;
-      }
-      if (themeCss) {
-        themeCssHtml          = '<link rel="stylesheet" id="' + id + '" href="' + themeCss + '" type="text/css" />';
-        themeExtensionCssHtml = '<link rel="stylesheet" id="' + id +'" href="' + themeExtensionCss + '" type="text/css" />';
-      } else {
-        themeName             = default_theme_name;
-        themeCssHtml          = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{default_theme}}.{{theme_ext}}" />';
-        vendorCssHtml         = '<link rel="stylesheet" type="text/css" id="default" href="{{asset_path}}/{{theme_base}}/{{vendor_css}}.{{theme_ext}}" />';
-        $('head').append(vendorCssHtml);
       }
 
-      // Don't load Theme CSS twice! (loaded already as resource 'core')
-      if (themeName != default_theme_name) {
-        $('head').append(themeCssHtml);
+      // initial user_state cookie
+      //
+      if ( user_state.theme_name == '') {
+        user_state.theme_name       = default_theme_name;
+        user_state.theme_css        = default_theme_css;
+        user_state.theme_author     = default_theme_author;
+        user_state.theme_author_url = default_theme_author_url;
       }
 
-      // Append|Remove theme extentions
-      // TODO: Make default theme name 'Uno' configurable
-      if (themeName === 'Uno') {
-        $('head link[href*="' +themeExtensionCss+ '"]').remove();
-      } else {
-        $('head').append(themeExtensionCssHtml);
+      styleLoaded     = styleSheetLoaded(user_state.theme_css);
+      theme_css_html  = '<link rel="stylesheet" id="' + id + '" href="' + user_state.theme_css + '" type="text/css" />';
+
+      // skip loading UNO CSS file except it is NOT loaded
+      //
+      if (!user_state.theme_name.includes('Uno') || !styleLoaded) {
+        $('head').append(theme_css_html);
       }
 
+      j1.writeCookie({
+        name: cookie_user_state_name,
+        data: user_state
+      });
+
       {% if themer_options.enabled %}
+        // enable BS ThemeSwitcher
         logger.info('themes detected as: enabled');
-        logger.info('theme is being initialized: ' + themeName);
+        logger.info('theme is being initialized: ' + user_state.theme_name);
 
       var dependencies_met_navigator_started = setInterval (function () {
-        if (j1.adapter.navigator.getState() == 'started') {
+        // if (j1.adapter.navigator.getState() == 'started') {
+        if ( $('#remote_themes').length ) {
           /* eslint-disable */
           // initialize Bootswatch Theme Switcher
-          $('#ThemeList').bootstrapThemeSwitcher.defaults = {
-            debug:                    {{themer_options.debug|json}},
-            saveToCookie:             {{themer_options.saveToCookie|json}},
-            cssThemeLink:             {{themer_options.cssThemeLink|json}},
-            cookieThemeName:          {{themer_options.cookieThemeName|json}},
-            cookieDefaultThemeName:   {{themer_options.cookieDefaultThemeName|json}},
-            cookieThemeCss:           {{themer_options.cookieThemeCss|json}},
-            cookieThemeExtensionCss:  {{themer_options.cookieThemeExtensionCss|json}},
-            cookieExpiration:         {{themer_options.cookieExpiration|json}},
-            cookiePath:               {{themer_options.cookiePath|json}},
-            defaultCssFile:           {{themer_options.defaultCssFile|json}},
-            bootswatchApiUrl:         {{themer_options.bootswatchApiUrl|json}},
-            bootswatchApiVersion:     {{themer_options.bootswatchApiVersion|json}},
-            loadFromBootswatch:       {{themer_options.loadFromBootswatch|json}},
-            localFeed:                {{themer_options.localFeed|json}},
-            excludeBootswatch:        {{themer_options.excludeBootswatch|json}},
-            includeBootswatch:        {{themer_options.includeBootswatch|json}},
-            skipIncludeBootswatch:    {{themer_options.skipIncludeBootswatch|json}}
+          $('#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 */
 
-          if (themeName == 'Uno'|| themeName == 'Bootstrap') {
-            theme = environment === 'production'
-              ? themeName.toLowerCase() + '.min.css'
-              : themeName.toLowerCase() + '.css';
-          } else {
-            theme = 'bootstrap.css';  // fallback
-          }
-          logger.info('theme loaded: ' + themeName);
-          logger.info('theme file: ' + theme);
+          logger.info('theme loaded: ' + user_state.theme_name);
+          logger.info('theme css file: ' + user_state.theme_css);
 
           _this.setState('finished');
           logger.info('state: ' + _this.getState());
@@ -274,18 +228,10 @@ j1.adapter['themer'] = (function (j1, window) {
       {% else %}
         _this.setState('finished');
         logger.info('state: ' + _this.getState());
-        logger.info('module detected as: disabled');
+        logger.info('themes detected as: disabled');
       {% endif %}
     }, // END init
 
-    // -------------------------------------------------------------------------
-    // setCss
-    // Set dynamic styles
-    // -------------------------------------------------------------------------
-    setCss: function () {
-      var bg_primary = j1.getStyleValue('bg-primary', 'background-color');
-    }, // END setCss
-
     // -------------------------------------------------------------------------
     // messageHandler
     // Manage messages send from other J1 modules

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

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -23,6 +23,14 @@ regenerate: true
  # TODO:
  # 2019-03-10:  Old BS Affix code is to be removed
  # -----------------------------------------------------------------------------
+ # TODO:
+ #  Height of the window
+ #    $(window).height()
+ #  should be calculated and checked against the effective height of
+ #  the toc menu:
+ #    $('#toc_mmenu').outerHeight()
+ #  to remove unneded overflow-y indicator (the scrollbar)
+ # -----------------------------------------------------------------------------
 {% endcomment %}
 
 {% comment %} Liquid procedures
@@ -33,7 +41,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config   = site.data.template_settings %}
+{% assign template_config   = site.data.j1_config %}
 {% assign blocks            = site.data.blocks %}
 {% assign modules           = site.data.modules %}
 

data/assets/themes/j1/core/css/animate.css

@@ -1,3 +1,20 @@
+/*
+ # -----------------------------------------------------------------------------
+ # ~/packages/100_template_css/animate.scss
+ # CSS index file for AnimateCSS
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2020 Juergen Adams
+ # Copyright (C) 2020 Daniel Eden and Contributors
+ #
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # Animate.css is licensed under the MIT license
+ # See: https://opensource.org/licenses/MIT
+ # -----------------------------------------------------------------------------
+*/
 /*
  # -----------------------------------------------------------------------------
  # ~/vendor/animate/animate.scss

data/assets/themes/j1/core/css/{fontawesome.css → icon-fonts/fontawesome.css}

@@ -1,20 +1,39 @@
 /*
  # -----------------------------------------------------------------------------
- #  ~/vendor/fonts/_font_awesome_5.scss
- #  Font Awesome 5.8.1 by @fontawesome - http://fontawesome.com
+ # ~/packages/100_template_css/fontawesome.scss
+ # CSS index file for Font Awesome 5.8.1
  #
- #  Product/Info:
- #  https://jekyll.one
- #  http://fontawesome.io
+ # Product/Info:
+ # https://jekyll.one
+ # http://fontawesome.io
  #
- #  Copyright (C) 2020 Juergen Adams
+ # 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
- #  Font Awesome is licensed for Icons: CC BY 4.0
- #  Font Awesome is licensed for Fonts: SIL OFL 1.1
- #  Font Awesome is licensed for CSS|Code: MIT License
- #  See: http://fontawesome.com/license
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # Font Awesome is licensed for Icons: CC BY 4.0
+ # Font Awesome is licensed for Fonts: SIL OFL 1.1
+ # Font Awesome is licensed for CSS|Code: MIT License
+ # See: http://fontawesome.com/license
+ #  ----------------------------------------------------------------------------
+*/
+/*
+ # -----------------------------------------------------------------------------
+ # ~/vendor/fonts/fontawesome/scss/_font_awesome_5.scss
+ # Font Awesome 5.8.1 by @fontawesome
+ #
+ # Product/Info:
+ # https://jekyll.one
+ # http://fontawesome.io
+ #
+ # 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
+ # Font Awesome is licensed for Icons: CC BY 4.0
+ # Font Awesome is licensed for Fonts: SIL OFL 1.1
+ # Font Awesome is licensed for CSS|Code: MIT License
+ # See: http://fontawesome.com/license
  # -----------------------------------------------------------------------------
 */
 /* FONT PATH

data/assets/themes/j1/core/css/{iconify-icons.css → icon-fonts/iconify.css}

@@ -1,36 +1,49 @@
 /*
  # -----------------------------------------------------------------------------
- #  ~/vendor/fonts/_iconify_icons.scss
- #  Unified icons framework
+ # ~/packages/100_template_css/iconify-icons.scss
+ # CSS index file for Unified icons framework
  #
- #  Product/Info:
- #  https://jekyll.one
- #  https://iconify.design/
+ # Product/Info:
+ # https://jekyll.one
+ # https://iconify.design/
  #
- #  Copyright (C) 2020 Juergen Adams
+ # 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
- #  Iconify SVG framework is dual licensed under Apache 2.0 license and GPL 2.0 license.
- #  Icons are released under different licenses, see details on https://iconify.design/
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # Iconify SVG framework is dual licensed under Apache 2.0 license and GPL 2.0 license.
+ # Icons are released under different licenses, see details on https://iconify.design/
  # -----------------------------------------------------------------------------
 */
-/* FUNCTIONS
------------------------------------------------------------------------------ */
-/* BS|MD STYLE|S
------------------------------------------------------------------------------ */
 /*
  # -----------------------------------------------------------------------------
- #  ~/vendor/fonts/md_icons/scss/_bs_color_palette.scss
- #  Bootstrap Color Palette for MD Icons
+ # ~/vendor/fonts/iconify_icons/_iconify_icons.scss
+ # Unified icons framework
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
+ # https://iconify.design/
  #
- #  Copyright (C) 2020 Juergen Adams
+ # 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 is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # Iconify SVG framework is dual licensed under Apache 2.0 license and GPL 2.0 license.
+ # Icons are released under different licenses, see details on https://iconify.design/
+ # -----------------------------------------------------------------------------
+*/
+/*
+ # -----------------------------------------------------------------------------
+ # ~/vendor/fonts/md_icons/scss/color_palette_bs.scss
+ # BS (Bootstrap) Color Palette for MD Icons
+ #
+ # 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
  # -----------------------------------------------------------------------------
 */
 .iconify-md-bg-primary {
@@ -41,7 +54,7 @@ a.iconify-md-bg-primary:focus {
   color: #b0bec5; }
 
 .iconify-bs-primary, .iconify-md-primary {
-  color: #3f51b5; }
+  color: #2196f3; }
 
 a.iconify-bs-primary:hover,
 a.iconify-bs-primary:focus,
@@ -50,7 +63,7 @@ a.iconify-md-primary:focus {
   color: #1A237E; }
 
 .iconify-bs-secondary, .iconify-md-secondary {
-  color: #e91e63; }
+  color: #607d8b; }
 
 a.iconify-bs-secondary:hover,
 a.iconify-bs-secondary:focus,
@@ -68,7 +81,7 @@ a.iconify-md-success:focus {
   color: #1B5E20; }
 
 .iconify-bs-info, .iconify-md-info {
-  color: #03a9f4; }
+  color: #00bcd4; }
 
 a.iconify-bs-info:hover,
 a.iconify-bs-info:focus,
@@ -96,16 +109,16 @@ a.iconify-md-danger:focus {
 
 /*
  # -----------------------------------------------------------------------------
- #  ~/vendor/fonts/md_icons/scss/_md_color_palette.scss
- #  MD (Material Design) Color Palette for MD Icons
+ # ~/vendor/fonts/md_icons/scss/_color_palette_md.scss
+ # MD (Material Design) Color Palette for MD Icons
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ # 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 is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
  # -----------------------------------------------------------------------------
 */
 .iconify-md-red {
@@ -4044,16 +4057,16 @@ a.iconify-md-black-darker:focus {
 
 /*
  # -----------------------------------------------------------------------------
- #  ~/vendor/fonts/md_icons/scss/_md_sizes.scss
- #  Additional styles for MDI Icon Font sizes
+ # ~/vendor/fonts/md_icons/scss/_sizes_md.scss
+ # MD (Material Design) MDI Icon Font sizes
  #
- #  Product/Info:
- #  https://jekyll.one
+ # Product/Info:
+ # https://jekyll.one
  #
- #  Copyright (C) 2020 Juergen Adams
+ # 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 is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
  # -----------------------------------------------------------------------------
 */
 /* Bootstrap sizes