j1-template 2020.0.17 → 2020.0.22

data/_includes/themes/j1/modules/connectors/comment/disqus.html

@@ -21,7 +21,7 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign disqus_short_name = site.data.template_settings.comments.disqus.short_name %}
+{% assign disqus_short_name = site.data.j1_config.comments.disqus.short_name %}
 
 
 {% comment %} Main

data/_includes/themes/j1/modules/connectors/comments

@@ -21,8 +21,8 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign comments          = site.data.template_settings.comments.enabled %}
-{% assign comment_provider  = site.data.template_settings.comments.provider %}
+{% assign comments          = site.data.j1_config.comments.enabled %}
+{% assign comment_provider  = site.data.j1_config.comments.provider %}
 
 {% comment %} Main
 -------------------------------------------------------------------------------- {% endcomment %}

data/_includes/themes/j1/modules/connectors/translator

@@ -21,8 +21,8 @@
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign translation          = site.data.template_settings.translation.enabled %}
-{% assign translation_provider = site.data.template_settings.translation.provider %}
+{% assign translation          = site.data.j1_config.translation.enabled %}
+{% assign translation_provider = site.data.j1_config.translation.provider %}
 
 
 {% comment %} Main

data/_includes/themes/j1/modules/navigator/generator.html

@@ -38,7 +38,7 @@
 
 {% 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,8 +49,13 @@
 
 {% assign navigator_defaults          = site.data.modules.defaults.navigator.defaults %}
 {% assign navigator_settings          = site.data.modules.navigator.settings %}
+
+{% comment %} Cookie Consent module NOT used anymore
+--------------------------------------------------------------------------------
 {% assign consent_defaults            = site.data.modules.defaults.cookie_consent.defaults %}
 {% assign consent_settings            = site.data.modules.cookie_consent.settings %}
+{% assign cookie_consent_options      = consent_defaults | merge: consent_settings %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% assign cookiebar_defaults          = site.data.modules.defaults.cookiebar.defaults %}
 {% assign cookiebar_settings          = site.data.modules.cookiebar.settings %}
@@ -79,7 +84,6 @@
 {% assign quicklinks_options          = nav_quicklinks_defaults | merge: nav_quicklinks_settings %}
 {% assign topsearch_options           = nav_topsearch_defaults | merge: nav_topsearch_settings %}
 {% assign authclient_options          = nav_authclient_defaults | merge: nav_authclient_settings %}
-{% assign cookie_consent_options      = consent_defaults | merge: consent_settings %}
 {% assign authentication_options      = authentication_defaults | merge: authentication_settings %}
 {% assign auth_manager_options        = authentication_options.j1_auth %}
 {% assign nav_mmenu_options           = nav_mmenu_defaults | merge: nav_mmenu_settings %}
@@ -164,7 +168,7 @@
   {% if brand_position == "left" %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand image to the: left ] -->
     {% if site.brand.image %}
-      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a id="navbar-brand" class="navbar-brand animated"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}
@@ -174,7 +178,7 @@
   {% elsif brand_position == "right" %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand to the: right ] -->
     {% if site.brand.image %}
-      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a id="navbar-brand" class="navbar-brand animated"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}
@@ -185,7 +189,7 @@
   {% else %}
     <!-- [INFO   ] [j1.modules.navigator.generator.html   ] [ place brand to default position: left ] -->
     {% if site.brand.image %}
-      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.template_settings.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
+      <a id="navbar-brand" class="navbar-brand animated"> <img src="{{ site.data.j1_config.image_path }}/{{ site.brand.image }}" height="{{ site.brand.image_height }}" alt="{{ site.brand.text }}"></a>
     {% else %}
       <a id="navbar-brand" class="navbar-brand animated"> <b><font color="{{site.brand.text_color}}">{{ site.brand.text }}</font></b></a>
     {% endif %}

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

@@ -0,0 +1,117 @@
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/_includes/themes/j1/procedures/global/attributes_loader.proc
+ #
+ # Liquid PROCEDURE to setup the Asciidoc attributes for an (entry)
+ # document. Initializes the all include paths for folders: images,
+ # documents and tables
+ #
+ # 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
+ # -----------------------------------------------------------------------------
+ # Usage:
+ #  1)  capture the 'load_attributes' variable by full path
+ #  2)  include|configure the load_attributes procedure
+ #
+ # Example:
+ #  {% capture load_attributes %}themes/{{site.template.name}}/procedures/global/attributes_loader.proc{%endcapture%}
+ #  {% include {{load_attributes}} scope="global|local|all" %}
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ #  Default:  scope="global"
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ #  Include directive (include::)
+ #
+ #  The include directive looks like a >>block macro<< but it is a
+ #  >>preprocessor directive<< like ifdef and ifeval. It gets processed
+ #  before the lines are parsed into a document structure.
+ #
+ #  If the path relative, the processor resolves the path using the following
+ #  rules:
+ #
+ #    If the include directive is used in the main (top-level) document,
+ #    relative paths are resolved relative to the base directory. (The base
+ #    directory defaults to the directory of the main document and can be
+ #    overridden from the CLI or API).
+ #
+ #    If the include directive is used in a file that has >>itself<<
+ #    been included, the path is resolved relative to the including
+ #    (i.e. current) file.
+ # -----------------------------------------------------------------------------
+ # NOTE:
+ #  Calculation of Pathes
+ #
+ #  Web sources are loaded by the Web Server. The location imagesdir
+ #  is calculated relative to "_site" (web root). Asciidoc resources
+ #  are being collected by AsciiDoctor relative to "page_root".
+ # -----------------------------------------------------------------------------
+ # TODO:
+ #  For POSTS, currently the ASCIIDOC macro include:: does NOT work.
+ #  Path calculation needes to be fixed. Seems Jekyll is using different
+ #  flavours for page_path (for posts and pages).
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  liquid_var:  {{ liquid_var | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+{% capture get_page_path %}themes/{{site.template.name}}/procedures/global/get_page_path.proc{% endcapture %}
+{% include {{get_page_path}} %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign scope = include.scope %}
+{% assign path_elements = page.path|split:'/' %}
+
+{% comment %} Source pathes
+-------------------------------------------------------------------------------- {% endcomment %}
+{% capture content_root %}{{path_elements[0]}}/..{% endcapture %}
+{% capture page_root %}{{page_path|strip|remove_first:'./'}}{% endcapture %}
+
+{% comment %} Set PATH attributes
+-------------------------------------------------------------------------------- {% endcomment %}
+:content_root:                          {{content_root}}
+:page_root:                             {{page_root}}
+
+:globalincludedir:                      {{content_root}}/_includes
+:includedir:                            {{page_root}}/_includes
+
+:globaltablesdir:                       {{content_root}}/_includes/tables
+:globaldocumentsdir:                    {{content_root}}/_includes/documents
+:documentdir:                           {{page_root}}/_includes/documents
+:tabledir:                              {{page_root}}/_includes/tables
+
+// Load|Publish attributes from FILE|S
+// -----------------------------------------------------------------------------
+{% if scope == "global" %}
+include::{globalincludedir}/attributes.asciidoc[tag=tags]
+include::{globalincludedir}/attributes.asciidoc[tag=urls]
+include::{globalincludedir}/attributes.asciidoc[tag=data]
+include::{globalincludedir}/attributes.asciidoc[tag=tables]
+include::{globalincludedir}/attributes.asciidoc[tag=documents]
+include::{globalincludedir}/attributes.asciidoc[tag=products]
+include::{globalincludedir}/attributes.asciidoc[tag=authors]
+{% elsif scope == "local" %}
+include::{includedir}/attributes.asciidoc[tag=tags]
+include::{includedir}/attributes.asciidoc[tag=urls]
+include::{includedir}/attributes.asciidoc[tag=data]
+include::{includedir}/attributes.asciidoc[tag=authors]
+{% elsif scope == "all" %}
+include::{globalincludedir}/attributes.asciidoc[tag=tags]
+include::{globalincludedir}/attributes.asciidoc[tag=urls]
+include::{globalincludedir}/attributes.asciidoc[tag=data]
+include::{globalincludedir}/attributes.asciidoc[tag=tables]
+include::{globalincludedir}/attributes.asciidoc[tag=documents]
+include::{globalincludedir}/attributes.asciidoc[tag=products]
+include::{globalincludedir}/attributes.asciidoc[tag=authors]
+include::{includedir}/attributes.asciidoc[tag=tags]
+include::{includedir}/attributes.asciidoc[tag=urls]
+include::{includedir}/attributes.asciidoc[tag=data]
+include::{includedir}/attributes.asciidoc[tag=authors]
+{% else %}
+{% endif %}

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

@@ -44,18 +44,18 @@
 {% assign button_type = include.button_type | strip | downcase %}
 
 {% comment %} Liquid procedures
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 {% capture select_color     %}themes/{{site.template.name}}/procedures/global/select_color.proc{% endcapture %}
 
 
 {% comment %} Main
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% case button_type %}
 
   {% when 'link' %}
   {% comment %} Create BS link button
-  ------------------------------------------------------------- {% endcomment %}
+  ------------------------------------------------------------------------------ {% endcomment %}
 
     {% for item in button_data %}
 
@@ -64,6 +64,7 @@
         {% assign value = button[1] %}
         {% if key == 'text' %}       {% assign button_text       = value %} {% endif %}
         {% if key == 'class' %}      {% assign button_class      = value %} {% endif %}
+        {% if key == 'style' %}      {% assign button_style      = value %} {% endif %}
         {% if key == 'icon' %}       {% assign button_icon       = value %} {% endif %}
         {% if key == 'icon_color' %} {% assign button_icon_color = value %} {% endif %}
         {% if key == 'icon_size' %}  {% assign button_icon_size  = value %} {% endif %}
@@ -74,25 +75,25 @@
     {% endfor %}
 
     {% if button_href and button_target %}
-      {% capture bs_button_html %}<a href="{{button_href}}" target="{{ button_target }}" class="btn {{button_class}}"><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 }}" 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="btn {{button_class}}"><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}}" 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 %}
       {% capture bs_button_html %}<!-- INFO: No valid value for parameter href found. -->{% endcapture %}
     {% endif %}
 
   {% when 'input' %}
   {% comment %} Create BS link button
-  ------------------------------------------------------------- {% endcomment %}
+  ------------------------------------------------------------------------------ {% endcomment %}
 
   {% when 'submit' %}
   {% comment %} Create BS link button
-  ------------------------------------------------------------- {% endcomment %}
+  ------------------------------------------------------------------------------ {% endcomment %}
 
 
   {% when 'card' %}
   {% comment %} Create BS card button
-  ------------------------------------------------------------- {% endcomment %}
+  ------------------------------------------------------------------------------ {% endcomment %}
 
     {% for item in button_data %}
 
@@ -110,7 +111,7 @@
     {% endfor %}
 
     {% if button_href %}
-      {% capture bs_button_html %}<a href="{{button_href}}" class="btn {{button_class}}"><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}}" class="{{button_class}}"><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 %}
       {% capture bs_button_html %}<!-- INFO: No valid value for parameter href found. -->{% endcapture %}
     {% endif %}
@@ -119,7 +120,7 @@
 {% endcase %}
 
 {% comment %} Reset Liquid vars
---------------------------------------------------------------- {% endcomment %}
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% assign button_text       = nil %}
 {% assign button_class      = nil %}

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

@@ -38,6 +38,8 @@
  # -----------------------------------------------------------------------------
 {% endcomment %}
 
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
 
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
@@ -50,19 +52,19 @@
 {% endif %}
 
 
-{% comment %} Liquid procedures
--------------------------------------------------------------------------------- {% endcomment %}
-
-
 {% comment %} Main
+--------------------------------------------------------------------------------
+  jadams, 2020-07-24: style cart creates a unwanted border, removed
+                      card styles
+  jadams, 2020-07-24: class "cart" is NOT longer overloaded since CSS
+                      generation has changed
+                      <!-- div class="card tag__box raised-z0 mt-0 mb-2" -->
 -------------------------------------------------------------------------------- {% endcomment %}
+
 <div id="word-cloud" class="row ml-3 mr-3">
-  <!-- jadams, 2020-07-24: style cart creates a unwanted border, removed card styles -->
-  <!-- jadams, 2020-07-24: style cart is NOT longer overloaded since CSS generation has changed -->
-  <!-- div class="card tagbox raised-z0 mt-0 mb-2" -->
-  <div class="tagbox mt-0 mb-2">
+  <div class="tag__box mt-0 mb-2">
+    <div class="tag__cloud">
 
-    <div class="tag-cloud">
     {% unless word_list %}
       {% assign word_list = 'empty wordlist' %}
       <div class="content"><b>Cannot create word cloud. <span class="color-red">EMPTY or INVALID word cloud specified: <i>{{word_list}}</i></span></b></div>
@@ -92,7 +94,7 @@
         {% endif %}
       </ul>
     {% endunless %}
-    </div> <!-- end tag-cloud -->
 
-  </div><!-- end card -->
-</div><!-- end row -->
+    </div> <!-- end tag__cloud -->
+  </div> <!-- end tag__box -->
+</div> <!-- end row -->

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

@@ -51,7 +51,7 @@
 {% capture web_root %}{{ page_path | remove_first: source_dir }}{% endcapture %}
 
 :includedir:                            {{page_root}}/000_includes
-:documentsdir:                          {includedir}/documents
+:documentdir:                          {includedir}/documents
 :tabledir:                              {includedir}/tables
 //:tabledir:                              ../tables
 

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

@@ -30,7 +30,7 @@
 
 {% comment %} TODO: For POSTS, currently the ASCIIDOC macro include:: does NOT work.
 Path calculation needes to be fixed. Seems Jekyll is using different flavours
-for page_path (post|pages). 
+for page_path (post|pages).
 -------------------------------------------------------------------------------- {% endcomment %}
 
 
@@ -70,17 +70,17 @@ for page_path (post|pages).
 {% comment %} Variables
 -------------------------------------------------------------------------------- {% endcomment %}
 {% if site.source.size %} {% assign source_dir = site.source %} {% else %} {% assign source_path = "." %} {% endif %}
-
 {% include {{get_page_path}} %}
 
 {% comment %} dot issue: Woraround - remove "./" from path if site.source = "."
               TODO: Improve Liquid scripts to manage the "dot issue"
 -------------------------------------------------------------------------------- {% endcomment %}
+
 {% capture page_root %}{{ page_path | strip | remove_first: './' }}{% endcapture %}
 {% capture web_root %}{{ page_path  source_dir }}{% endcapture %}
 
 :includedir:                            {{page_root}}/000_includes
-:documentsdir:                          {includedir}/documents
+:documentdir:                          {includedir}/documents
 :tabledir:                              {includedir}/tables
 
 {% comment %} Moved imagesdir setting to the document

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

@@ -25,28 +25,28 @@ jadams, 2019-08-23: no procedures should be used for initial setup
 {% if site.template.setup_provider == "custom" %}
   {% include custom/functions/setup %}
 {% else %}
-  {% if site.theme.safe and site.data.template_settings.base_path and site.data.template_settings.base_path != '' %}
-    {% assign base_path = site.data.template_settings.base_path %}
-    {% assign home_path = site.data.template_settings.base_path %}
+  {% if site.theme.safe and site.data.j1_config.base_path and site.data.j1_config.base_path != '' %}
+    {% assign base_path = site.data.j1_config.base_path %}
+    {% assign home_path = site.data.j1_config.base_path %}
   {% else %}
     {% assign base_path = nil %}
     {% assign home_path = "/" %}
   {% endif %}
 
-  {% if site.data.template_settings.asset_path %}
-    {% assign asset_path = site.data.template_settings.asset_path %}
+  {% if site.data.j1_config.asset_path %}
+    {% assign asset_path = site.data.j1_config.asset_path %}
   {% else %}
     {% capture asset_path %}{{ base_path }}/assets/themes/{{ page.theme.name }}{% endcapture %}
   {% endif %}
 
-  {% if site.data.template_settings.app_path %}
-    {% assign app_path = site.data.template_settings.app_path %}
+  {% if site.data.j1_config.app_path %}
+    {% assign app_path = site.data.j1_config.app_path %}
   {% else %}
     {% capture app_path %}{{ base_path }}/assets/apps{% endcapture %}
   {% endif %}
 
-  {% if site.data.template_settings.image_path %}
-    {% assign image_path = site.data.template_settings.image_path %}
+  {% if site.data.j1_config.image_path %}
+    {% assign image_path = site.data.j1_config.image_path %}
   {% else %}
     {% capture image_path %}{{ base_path }}/assets/images/{{ page.theme.name }}{% endcapture %}
   {% endif %}

data/_includes/themes/j1/procedures/layouts/content_writer.proc

@@ -46,7 +46,7 @@
           {% if key == 'path' %}            {% assign path = value %}       {% endif %}
           {% if key == 'file' %}            {% assign file = value %}       {% endif %}
           {% if key == 'id' %}              {% assign id = value %}         {% endif %}
-          {% if key == 'helper_classes' %}  {% assign class = value %}      {% endif %}
+          {% if key == 'properties' %}      {% assign class = value %}      {% endif %}
           {% if key == 'data' %}            {% assign data = value %}       {% endif %}
         {% endif %}
       {% endfor %}
@@ -74,7 +74,6 @@
             {% if placement == 'body-main' %}
               <!-- [INFO   ] [j1.layout.content_writer.proc         ] [ load region 'body-main' for layout: {{page.layout}} ] -->
               {% if type == 'async' %}
-                <!-- div id="{{id}}" class="{{class}}"></div -->
                 <section id="{{id}}" class="{{class}}"></section>
               {% elsif type == 'sync' %}
                 {% capture path %}{{base}}/{{path}}/{{file}}{% endcapture %}

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

@@ -56,7 +56,7 @@
   {% if include.header_title %}  {% assign header_title   = include.header_title %}  {% endif %}
   {% if include.header_tagline %}{% assign header_tagline = include.header_tagline %}{% endif %}
 
-  {% if site.data.template_settings.posts_collate.provider == 'custom' %}
+  {% if site.data.j1_config.posts_collate.provider == 'custom' %}
     <!-- Use custom collator -->
     {% include themes/{{site.template.name}}/procedures/posts/custom/collate_calendar %}
   {% else %}

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

@@ -54,7 +54,7 @@
 {% comment %} Main
    ----------------------------------------------------------------------------- {% endcomment %}
 
-  {% if site.data.template_settings.posts_collate.provider == 'custom' %}
+  {% if site.data.j1_config.posts_collate.provider == 'custom' %}
     <!-- Use custom collator -->
     {% include themes/{{site.template.name}}/procedures/custom/collate_simple %}
   {% else %}

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

@@ -55,7 +55,7 @@
   {% if include.header_title %}  {% assign header_title   = include.header_title %}  {% endif %}
   {% if include.header_tagline %}{% assign header_tagline = include.header_tagline %}{% endif %}
 
-  {% if site.data.template_settings.posts_collate.provider == 'custom' %}
+  {% if site.data.j1_config.posts_collate.provider == 'custom' %}
     <!-- Use custom collator -->
     {% include themes/{{site.template.name}}/procedures/custom/posts_collate %}
   {% else %}
@@ -90,12 +90,13 @@
       <li class="{{blog_position}}">
         <div class="timeline-badge"><i class="tmicon rounded-x hidden-xs"></i></div>
 
-        <div class="timeline-panel">
+        <div class="card raised-z5 timeline-panel">
 
-          <div class="timeline-title">
-            <a href="{{post.url}}">
-              <h4 id="{{1000000 | rand}}" class="font-light">{{post.title}}</h4>
-            </a>
+          <!-- div class="timeline-title" -->
+          <div class="card-header bg-primary pt-4 pb-3">
+            <!-- a href="{{post.url}}" -->
+              <h3 id="{{1000000 | rand}}" class="md-grey-300">{{post.title}}</h3>
+            <!-- /a -->
           </div>
 
           <!-- Collect icon data from frontmatter -->
@@ -139,7 +140,7 @@
                 <p class="card-subtitle text-muted">{{post.tagline}}</p>
               </div>
               <div class="timeline-excerpt mb-4">
-                {% assign excerpt = post.excerpt | truncatewords: 50 | strip_html | strip_newlines | strip %}
+                {% assign excerpt = post.excerpt|truncatewords: 50|replace:'...',' ...'|strip_html|strip_newlines|strip %}
                 <i class="timeline-icon {{icon_family}} {{icon_family}}-{{icon_name}} {{icon_family}}-{{icon_size}} {{icon_family}}-{{icon_color}}"></i>
                 {{excerpt}}
               </div>
@@ -161,7 +162,7 @@
                 <p class="card-subtitle text-muted">{{post.tagline}}</p>
               </div>
               <div class="timeline-excerpt mb-4">
-                {% assign excerpt = post.excerpt | truncatewords: 50 | strip_html | strip_newlines | strip %}
+                {% assign excerpt = post.excerpt|truncatewords: 50|replace:'...',' ...'|strip_html|strip_newlines|strip %}
                 {{excerpt}}
               </div>
               <div class="card-footer">
@@ -174,50 +175,48 @@
             </div>
           {% else %}
             <!-- !place_icon && !place_image -->
-            <div class="timeline-body">
-              <div class="timeline-tagline">
+            <!-- div class="timeline-body" -->
+            <div class="card-body r-text-300">
+              <!-- div class="tagline">
                 <p class="card-subtitle text-muted">{{post.tagline}}</p>
-              </div>
-              <div class="timeline-excerpt mb-4">
-                {% assign excerpt = post.excerpt | truncatewords: 50 | strip_html | strip_newlines | strip %}
+              </div -->
+              <div class="excerpt">
+                {% assign excerpt = post.excerpt|truncatewords: 50|replace:'...',' ...'|strip_html|strip_newlines|strip %}
                 {{excerpt}}
               </div>
-              <div class="card-footer">
-                <a href="{{post.url}}#readmore"
-                   class="btn btn-secondary btn-raised btn-flex mb-0">
-                   <i class="mdi mdi-eye mdi-lg mr-1" style="color:#FFFFFF;">
-                   </i> Read · {{post.tagline}}
-                </a>
-              </div>
             </div>
-          {% endif %}
-
-          <!-- Collect comment provider details -->
-          {% for sharing in builder_config.sharing_provider %}
-            {% assign provider      = sharing.provider %}
-            {% assign likes_count   = sharing.likes_count %}
-            {% assign comment_count = sharing.comment_count %}
-          {% endfor %}
-
-          <div class="timeline-footer">
-            <ul class="timeline-list-unstyled list-inline blog-info">
-              <li><i class="mdi mdi-calendar-blank mr-1"></i> {{post.date | date: "%Y %B, %e"}}</li>
+            <!-- Collect comment provider details -->
+            {% for sharing in builder_config.sharing_provider %}
+              {% assign provider      = sharing.provider %}
+              {% assign likes_count   = sharing.likes_count %}
+              {% assign comment_count = sharing.comment_count %}
+            {% endfor %}
+
+            <div class="card-body text-muted r-text-200">
+              <i class="mdi mdi-calendar-blank mr-1"></i> {{post.date | date: "%Y %B, %e"}}
               {% if comment_count %}
                 <!-- comment_count enabled  -->
                 <!-- <li><i class="mdi mdi-comment"></i> <a href="#"> 7 Comments</a></li> -->
                 <li><a href="#"><i class="mdi mdi-comment"></i> 7 Comments</a></li>
               {% endif %}
-            </ul>
-            {% if likes_count %}
-              <!-- likes_count enabled  -->
-              <a class="likes" href="#"><i class="mdi mdi-heart"></i> 239</a>
-            {% endif %}
-          </div>
+
+              {% if likes_count %}
+                <!-- likes_count enabled  -->
+                <li><a class="likes" href="#"><i class="mdi mdi-heart"></i> 239</a></li>
+              {% endif %}
+            </div>
+
+            <div class="card-footer r-text-200">
+              <a class="card-link md-blue font-weight-bold g-font-size-12 text-uppercase" href="{{post.url}}#readmore">
+                 Read · {{post.tagline}}
+              </a>
+            </div>
+          {% endif %}
         </div>
       </li>
       {% endfor %}
       <!-- final|last element placed as an empty list item -->
-      <li class="clearfix" style="float: none;"></li>
+      <li class="clearfix mb-0" style="float: none;"></li>
     </ul>
     <!-- End Timeline Collator -->
   {% endif %}