j1-template 2020.0.5 → 2020.0.10

data/lib/j1/version.rb

@@ -1,3 +1,3 @@
 module J1
-  VERSION = '2020.0.5'
+  VERSION = '2020.0.10'
 end

data/lib/starter_web/Gemfile

@@ -51,7 +51,7 @@ gem 'jekyll', '~> 4.0'
 
 # Theme Rubies, default: J1 Template
 #
-gem 'j1-template', '~> 2020.0.5'
+gem 'j1-template', '~> 2020.0.10'
 
 # ------------------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment
@@ -178,7 +178,7 @@ gem "puma", '>= 4.3.1'
 # authentication. For default, the Omniauth (authentication) strategies
 # for Github, Twitter, Facebook and Patreon are implemented.
 #
-# gem 'rack', '>= 2.0.8'
+# gem 'rack', '>= 2.2.3'
 # gem 'rack-protection', '~> 2.0'
 # gem 'rack-ssl-enforcer', '~> 0.2'
 # gem 'rest-client', '~> 2.0'

data/lib/starter_web/_config.yml

@@ -53,7 +53,7 @@ environment:                            production
 # ------------------------------------------------------------------------------
 #   Sets the build version of J1 Template Gem
 #
-version:                                2020.0.5
+version:                                2020.0.10
 
 # version
 # ------------------------------------------------------------------------------

data/lib/starter_web/_data/modules/defaults/navigator.yml

@@ -162,11 +162,12 @@ defaults:
     type:                               quicksearch
     icon_family:                        MDI
     icon_color:                         md_white
-    icon_size:                          xxxlarge
+    icon_size:                          mdi-2x
     search_icon:                        magnify
     close_icon:                         close
-    input_color:                        md_grey_900
-    background_color:                   md_grey_400
+    clear_icon:                         notification-clear-all
+    input_color:                        rgba(0, 0, 0, 0.75)
+    background_color:                   md_grey_50
     placeholder:                        QuickSearch
     search_heading_lead:                ""
     result_heading_lead:                ""

data/lib/starter_web/_data/modules/defaults/ssm.yml

@@ -31,15 +31,15 @@ defaults:
 
   xhr_container_id:                     ssm-container
   xhr_data_path:                        /assets/data/ssm/index.html
+  menu_id:                              ssm_menu
 
   icon_family:                          MDI
   icon_color:                           mdi-md-grey
   icon_size:                            mdi-2x
 
   min_width:                            200
-  margin:                               -150                                    # button size 50x50
-
-  mode:                                 menu                                    # icon|menu
+  margin:                               -140
+  mode:                                 menu
 
   # ----------------------------------------------------------------------------
   # CONTAINER elements (empty for default)

data/lib/starter_web/_data/modules/defaults/toccer.yml

@@ -152,20 +152,15 @@ defaults:
   #       default:                      true
   #
   # ----------------------------------------------------------------------------
-  tocSelector:                        .js-toc
-  headingSelector:                    "h2, h3, h4, h5"
-  headingsOffset:                     500
-  ignoreSelector:                     .notoc
-  contentSelector:                    .js-toc-content
-  activeLinkColor:                    "#3F51B5"                                 # MD Indigo
-  collapseDepth:                      2
-  throttleTimeout:                    50
-  includeHtml:                        false
-  smoothScrollEnabled:                true
-  smoothScrollDuration:               300
-  smoothScrollOffset:                 90
-  headingsOffset:                     0
-  throttleTimeout:                    50
+  tocSelector:                          .js-toc
+  contentSelector:                      .js-toc-content
+  headingSelector:                      "h2, h3, h4, h5, h6"
+  ignoreSelector:                       .notoc
+  collapseDepth:                        2
+  throttleTimeout:                      50
+  scrollSmooth:                         true
+  scrollSmoothDuration:                 300
+  scrollSmoothOffset:                   -90
 
 
 # ------------------------------------------------------------------------------

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

@@ -32,10 +32,11 @@ settings:
   results_container:                    jss-results
   index_data:                           /assets/data/search.yml
   result_limit:                         1000
+  result_truncate:                      100
   no_results_text:                      The search has no results
   min_search_item_len:                  3
   search_fuzzy:                         false
-  search_exlude:                        [ Impress ]
+  search_exlude:                        [ Impress, License ]
   result_template: >
                                         <li>
                                           <div>
@@ -48,4 +49,4 @@ settings:
 
 
 # ------------------------------------------------------------------------------
-# END config
+# END config

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

@@ -67,6 +67,7 @@ settings:
             position:                   right
 
           content:
+            id:                         menu_mmenu
             type:                       navigation
             title:                      Starter Web
             theme:                      dark
@@ -86,6 +87,7 @@ settings:
             position:                   left
 
           content:
+            id:                         sidebar_mmenu
             type:                       drawer
             title:                      Site Info
             theme:                      dark
@@ -195,9 +197,10 @@ settings:
             position:                   right
 
           content:
+            id:                         toc_mmenu
             type:                       drawer
             title:                      Table of Contents
-            theme:                      light
+            theme:                      dark
             button:                     "#ssm_toc"
             button_activated:           "js-toc-content"
 

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

@@ -38,12 +38,21 @@ settings:
     # --------------------------------------------------------------------------
     # TOPLEVEL items
     #
+    - item:                             Reload Page
+      enabled:                          true
+      id:                               ssm_reload_page
+      href:
+      target:
+      event_handler:                    reload_page
+      icon:                             reload
+      icon_classes:
+
     - item:                             Table of Contents
       enabled:                          true
       id:                               ssm_toc
       href:
       target:
-      event_handler:                    open_mmenu
+      event_handler:                    open_ssm_toc
       icon:                             wrap
       icon_classes:
 

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

@@ -32,8 +32,8 @@ settings:
   # ----------------------------------------------------------------------------
   #   Enables|Disables the use of J1 TocManager
   #
-  #   values:                         boolean (true|false)
-  #   default:                        false
+  #   values:                           boolean (true|false)
+  #   default:                          false
   #
   #   log
   #   --------------------------------------------------------------------------
@@ -45,7 +45,7 @@ settings:
   # ----------------------------------------------------------------------------
   enabled:                              true
   log:                                  false
-  delay:                                400                                     
+  delay:                                400
 
   # ----------------------------------------------------------------------------
   # MODULE settings
@@ -54,9 +54,9 @@ settings:
   # ----------------------------------------------------------------------------
   #   Specifies the <div> element where to render the table of contents.
   #
-  #   type:                           string (HTML class)
-  #   values:                         any HTML class
-  #   default:                        .js-toc
+  #   type:                             string (HTML class)
+  #   values:                           any HTML class
+  #   default:                          .js-toc
   #
   #   headingSelector
   #   --------------------------------------------------------------------------
@@ -110,64 +110,16 @@ settings:
   #     type:                           integer
   #     default:                        50
   #
-  #   scrollOptions
-  #   --------------------------------------------------------------------------
-  #   smooth-scroll options object, see more details at:
-  #   https://github.com/cferdinandi/smooth-scroll
-  #
-  #   values
-  #
-  #     easing                        Type|Speed of the scroll effect the heading|section
-  #                                   (of the content) is scrolled to if a toc element
-  #                                   has been selected.
-  #       Linear,                     moves at the same speed from start to finish.
-  #       EaseIn,                     gradually increases in speed.
-  #       EaseOut,                    gradually decreases in speed.
-  #       EaseInOut,                  gradually increases in speed, peaks, and then
-  #                                   gradually slows down.
-  #
-  #       values:                     Linear|
-  #                                   easeInQuad|easeInCubic|easeInQuart|easeInQuint
-  #                                   easeOutQuad|easeOutCubic|easeOutQuart|easeOutQuint
-  #                                   easeInOutQuad|easeInOutCubic|easeInOutQuart|easeInOutQuint
-  #
-  #       default:                    easeInOutCubic
-  #
-  #     offset
-  #       Amount of space (calculated as pixels) between the top of page and the
-  #       selected table of contents item after the page has been scrolled.
-  #
-  #       values:                     integer
-  #       default:                    0
-  #
-  #     speed
-  #       Overall time (measured in milliseconds) to complete the scroll.
-  #
-  #       values:                     integer
-  #       default:                    300
-  #
-  #     updateURL
-  #       ...
-  #
-  #       values:                     boolean (true|false)
-  #       default:                    true
-  #
   # ----------------------------------------------------------------------------
-  tocSelector:                      .js-toc
-  headingSelector:                  "h2, h3, h4, h5"
-  headingsOffset:                   500
-  ignoreSelector:                   .notoc
-  contentSelector:                  .js-toc-content
-  activeLinkColor:                  "#212121"                                   # md_bluegrey_900
-  collapseDepth:                    2
-  throttleTimeout:                  50
-  includeHtml:                      false
-  smoothScrollEnabled:              true
-  smoothScrollDuration:             300
-  smoothScrollOffset:               90
-  headingsOffset:                   0
-  throttleTimeout:                  50
-
+  tocSelector:                          .js-toc                                 # Where to render the table of contents
+  contentSelector:                      .js-toc-content                         # Where to grab the headings to build the table of contents
+  headingSelector:                      "h2, h3, h4, h5"                        # Which headings to grab inside of the contentSelector element
+  ignoreSelector:                       .notoc                                  # Headings that match the ignoreSelector will be skipped
+  collapseDepth:                        2                                       # How many heading levels should not be collapsed
+  throttleTimeout:                      50                                      # Timeout between firing events to make sure it's not too rapid
+  scrollSmooth:                         true
+  scrollSmoothDuration:                 300
+  scrollSmoothOffset:                   -80
 
 # ------------------------------------------------------------------------------
 # END config

data/lib/starter_web/_data/resources.yml

@@ -321,7 +321,7 @@ globals:
   base_path:                            /assets/themes/j1
   location:                             local
   dependency_check_cycle:               25
-  dependency_check_timeout:             10
+  dependency_check_timeout:             50
   extensions:
     css_dev:                            css
     css_prod:                           min.css
@@ -351,17 +351,14 @@ resources:
   #   6   n/a                           moment@2.19.2
   #   7   log4javascript                log4javascript@1.4.15
   #   8   clipboard                     clipboard@1.7.1
-  #   9   smoothscroll                  smoothscroll-for-websites@4.11.12
   #   10  bs_material_design            bootstrap-material-design@4.0.0-beta.4
   #   11  j1_template_4                 j1_template_4@0.0.1
-  #   12  tocbot                        tocbot@3.0.2
+  #   12  tocbot                        tocbot@4.11.2
   #   13  jekyll_search                 simple_jekyll_search@1.1.5
-  #   14  back2top                      back2top@1.1
   #   15  bs_theme_switcher             bs_theme_switcher@1.1.5
   #   16  backstretch                   backstretch@2.1.16
   #   17  cookie consent                cookieConsent@2019-07-24
   #   18  bootstrap_datepicker          datepicker@1.7.1
-  #   19  bs_gallery                    bs_gallery@2017-12-27
   #
   # ----------------------------------------------------------------------------
   #   J1 Template Core, integrated CSS Resources
@@ -488,46 +485,6 @@ resources:
         js:                             []
         init_function:                  [ j1.adapter.toccer.init ]
 
-  # ----------------------------------------------------------------------------
-  # Back2Top
-  #
-  - name:                               J1 Back2Top
-    resource:
-      id:                               back2top
-      enabled:                          false
-      comment:                          module back2top
-      region:                           head
-      layout:                           [ all ]
-      required:                         always
-      script_load:                      defer                                   # Warum defer???
-      dependencies:                     [ navigator ]
-      pass_init_data:                   false
-      data:
-        css:                            []
-        files:                          [ adapter/js/back2top.js ]
-        js:                             []
-        init_function:                  [ j1.adapter.back2top.init ]
-
-  # ----------------------------------------------------------------------------
-  # Scroller
-  #
-  - name:                               J1 Scroller
-    resource:
-      id:                               scroller
-      enabled:                          true
-      comment:                          module smoothscroll
-      region:                           head
-      layout:                           [ all ]
-      required:                         always
-      script_load:                      defer
-      dependencies:                     false
-      pass_init_data:                   false
-      data:
-        css:                            []
-        files:                          [ adapter/js/scroller.js ]
-        js:                             []
-        init_function:                  [ j1.adapter.scroller.init ]
-
   # ----------------------------------------------------------------------------
   # Searcher
   #
@@ -577,7 +534,7 @@ resources:
       enabled:                          true
       comment:                          module ssm
       region:                           head
-      layout:                           [ app, page, post, collection ]
+      layout:                           [ page, post, app, collection, blog_archive ]
       required:                         always
       script_load:                      defer
       dependencies:                     false
@@ -733,15 +690,9 @@ resources:
       dependencies:                     false
       pass_init_data:                   false
       data:
-        css:                            [
-                                          extensions/mmenu-light/css/mmenu-light,
-                                          extensions/mmenu-light/css/themes/uno
-                                        ]
+        css:                            []
         files:                          [ adapter/js/mmenu.js ]
-        js:                             [
-                                          extensions/mmenu-light/js/mmenu-light,
-                                          extensions/mmenu-light/js/mmenu-light.polyfills
-                                        ]
+        js:                             []
         init_function:                  [ j1.adapter.mmenu.init ]
 
 # ==============================================================================