j1-template 2020.0.20 → 2021.0.0

data/assets/data/mmenu.html

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -31,7 +31,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_config       = site.data.template_settings %}
+{% assign template_config       = site.data.j1_config %}
 {% assign modules               = site.data.modules %}
 
 {% comment %} Set config data

data/assets/data/mmenu_sidebar.html

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -105,7 +105,7 @@ regenerate: true
           <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [USER info enabled] -->
           <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [Write widget placeholder: USER info] -->
           <div id="user-info" class="widget">
-            <h4 class="heading">{{title}}</h4>
+            <h3 class="heading">{{title}}</h3>
             <ul id="display_user_details" class="link">
               {% for link in links %}
 
@@ -156,7 +156,7 @@ regenerate: true
           <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [THEME info detected] -->
           <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [Write widget placeholder: USER info] -->
           <div id="theme-info" class="widget">
-            <h4 class="heading">{{title}}</h4>
+            <h3 class="heading">{{title}}</h3>
             <ul class="link">
             {% for link in links %}
 
@@ -208,7 +208,7 @@ regenerate: true
           <!-- [INFO   ] [ j1.modules.navigator.mmenu_sidebar.html ] [Start processing SITE info] -->
 
           <div id="site-info" class="widget">
-            <h4 class="heading">{{title}}</h4>
+            <h3 class="heading">{{title}}</h3>
             <ul class="link">
               {% for link in links %}
                 {% if link.icon == null %}

data/assets/data/mmenu_toc.html

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}

data/assets/data/panel.html

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 {% capture cache %}
 
@@ -42,17 +42,21 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign panel_config_defaults = site.data.blocks.defaults.panel %}
-{% assign panel_config_settings = site.data.blocks.panel %}
+{% assign template_config           = site.data.j1_config %}
+{% assign blocks                    = site.data.blocks %}
+{% assign panel_config_defaults     = blocks.defaults.panel %}
+{% assign panel_config_settings     = blocks.panel %}
+{% assign bs_config                 = template_config.bootstrap %}
 
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign panel_config_defaults = panel_config_defaults.defaults %}
-{% assign panel_config_settings = panel_config_settings.settings %}
+{% assign panel_config_defaults     = panel_config_defaults.defaults %}
+{% assign panel_config_settings     = panel_config_settings.settings %}
+{% assign bs_card_deck              = bs_config.cards.card_deck %}
 
-{% comment %} Set HELPER variables
+{% comment %} Set HELPER variables (used by exception panel)
 -------------------------------------------------------------------------------- {% endcomment %}
-{% capture panel_config_file_name %}~/_data/modules/panel.yml{% endcapture %}
+{% capture panel_config_file_name %}~/_data/blocks/panel.yml{% endcapture %}
 
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
@@ -90,7 +94,7 @@ regenerate: true
           {% assign tagline         = panel_settings.tagline|strip_newlines %}
           {% assign buttons         = panel_settings.buttons %}
           {% assign header          = panel_settings.header %}
-          {% assign helper_classes  = panel_settings.helper_classes %}
+          {% assign properties  = panel_settings.properties %}
           {% assign cards           = panel_settings.cards %}
         {% endif %}
       {% endfor %}
@@ -147,16 +151,16 @@ regenerate: true
             <!-- Heading -->
             <div class="row">
               <div class="{{panel_settings.animate}}">
-                <h1 class="g-font-weight-500 mb-0">{{panel_settings.title}}</h1>
+                <h2 class="g-font-weight-500 mb-0">{{panel_settings.title}}</h2>
                 <p class="tagline mb-0"><b>{{panel_settings.tagline}}</b></p>
                 <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-2"></div>
               </div>
-              <div class="{{helper_classes}}">{{panel_settings.description}}</div>
+              <div class="{{properties}}">{{panel_settings.description}}</div>
             </div>
             <!-- End Heading -->
 
             <!-- Cards -->
-            <div class="row">
+            <div class="row card-deck">
             {% assign card_items = cards|size %}
             {% for card in cards %}
 
@@ -178,18 +182,9 @@ regenerate: true
                 {% if card_enabled == false %} {% assign card_items = card_items|minus:1 %} {% endif %}
               {% endfor %}
 
-              {% assign card_width_md = 12|divided_by: card_items %}
-
               {% include {{select_icon_size}} family=icon_family size=icon_size %}
               {% assign icon_size = size %}
 
-              {% if card_width %}
-                {% assign card_enabled = true %}
-                {% assign card_width_md = card_width %}
-              {% else %}
-                {% assign card_width_md = 12|divided_by: card_items %}
-              {% endif %}
-
               {% if card_animate %}
                 {% assign card_animate = card_animate %}
               {% else %}
@@ -208,16 +203,9 @@ regenerate: true
                 {% endif %}
               {% endfor %} {% endfor %}
 
-              {% comment %} TODO: Style should be configurable
-              ------------------------------------------------------------------ {% endcomment %}
-              {% assign card_style  = 'flat' %}
-
-              {% if card_type == 'text' and card_enabled and card_style == 'flat' %}
-              {% assign card_raised = 'raised-z5' %}
-
-              <!-- Card Block -->
-              <div class="col-md-{{card_width_md}} col-sm-{{card_width_md}} col-xs-12 pl-0 pr-2">
-                <article class="card raised-z5 mb-5">
+              {% if card_type == 'text' and card_enabled %}
+                {% assign card_raised = 'raised-z5' %}
+                <article class="card raised-z5 mb-3">
                   <div class="card-header bg-primary pt-2 pb-2">
                     <div class="d-flex flex-row align-items-center">
                       <div class="mr-3">
@@ -257,23 +245,45 @@ regenerate: true
                   {% endfor %} {% endfor %}{% endfor %}
 
                   {% if button_target == null %}
-                    <a class="card-link md-blue font-weight-bold g-font-size-12 text-uppercase" href="{{button_href}}">{{button_text}}</a>
+                    <a class="card-link md-grey-800 font-weight-bold g-font-size-12 text-uppercase" href="{{button_href}}">{{button_text}}</a>
                   {% else %}
-                    <a class="card-link  md-blue font-weight-bold g-font-size-12 text-uppercase" href="{{button_href}}" target="{{button_target}}">{{button_text}}</a>
+                    <a class="card-link  md-grey-800 font-weight-bold g-font-size-12 text-uppercase" href="{{button_href}}" target="{{button_target}}">{{button_text}}</a>
                   {% endif %}
                   </div>
 
                 </article>
               {% endif %}
-              </div>
-              <!-- End Card Block -->
-              {% endfor %}
-              {% comment %} END cards
-              ------------------------------------------------------------------ {% endcomment %}
+
+              <!-- Calculate 'column setters' to manage BS break points for 'responsive' card deck (rcard-deck) -->
+              {% assign sm = forloop.index | modulo: bs_card_deck.break_on_sm %}
+              {% assign md = forloop.index | modulo: bs_card_deck.break_on_md %}
+              {% assign lg = forloop.index | modulo: bs_card_deck.break_on_lg %}
+              {% assign xl = forloop.index | modulo: bs_card_deck.break_on_xl %}
+
+              <!-- Add 'column setters' for BS break points -->
+              {% if sm == 0 %}
+                <div class="w-100 d-none d-sm-block d-md-none"> <!-- break on sm --> </div>
+              {% endif %}
+
+              {% if md == 0 %}
+                <div class="w-100 d-none d-md-block d-lg-none"> <!-- break on md --> </div>
+              {% endif %}
+
+              {% if lg == 0 %}
+                <div class="w-100 d-none d-lg-block d-xl-none"> <!-- break on lg --> </div>
+              {% endif %}
+
+              {% if xl == 0 %}
+                <div class="w-100 d-none d-xl-block"> <!-- break on xl --> </div>
+              {% endif %}
+            {% endfor %}
             </div>
-            <!-- END Cards -->
+            <!-- End Cards -->
+            {% comment %} END cards
+            -------------------------------------------------------------------- {% endcomment %}
+
           </div>
-          <!-- END Main Container -->
+          <!-- END main container -->
         </section>
         <!-- END Panel {{panel_settings.id}} -->
 
@@ -297,7 +307,7 @@ regenerate: true
               <!-- Heading -->
               {% if panel_settings.header.enabled %}
               <div>
-                <h1 class="g-font-weight-500 mb-0">{{panel_settings.header.title}}</h1>
+                <h2 class="g-font-weight-500 mb-0">{{panel_settings.header.title}}</h2>
                 <p class="tagline mb-0"><b>{{panel_settings.header.tagline}}</b></p>
                 <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-2"></div>
                 <p>{{panel_settings.header.description}}</p>
@@ -393,11 +403,11 @@ regenerate: true
             <!-- Heading -->
             <div class="row">
               <div class="{{panel_settings.animate}}">
-                <h1 class="g-font-weight-500 mb-0">{{panel_options.title}}</h1>
+                <h2 class="g-font-weight-500 mb-0">{{panel_options.title}}</h2>
                 <p class="tagline mb-0"><b>{{panel_options.tagline}}</b></p>
                 <div class="d-inline-block g-width-50 g-height-2 bg-primary mb-2"></div>
               </div>
-              <p class="{{helper_classes}}">{{panel_options.description}}</p>
+              <p class="{{properties}}">{{panel_options.description}}</p>
             </div>
             <!-- End Heading -->
             {% endif %}
@@ -415,6 +425,7 @@ regenerate: true
                   {% if key == 'style' %}         {% assign card_style    = value %} {% endif %}
                   {% if key == 'raised' %}        {% assign card_raised   = value %} {% endif %}
                   {% if key == 'category' %}      {% assign post_category = value %} {% endif %}
+                  {% if key == 'max_rows' %}      {% assign rows_max      = value %} {% endif %}
                   {% if key == 'max_posts' %}     {% assign posts_max     = value %} {% endif %}
                   {% if key == 'readmore_text' %} {% assign readmore_text = value %} {% endif %}
                   {% if key == 'truncatewords' %} {% assign truncatewords = value %} {% endif %}
@@ -429,50 +440,85 @@ regenerate: true
               {% assign last_post_written = false %}
               {% assign card_width        = 12|divided_by: posts_max %}
 
+              {% assign total_categoray_posts = 0 %}
+              {% for cat in site.categories %}
+                 {% if cat[0] == post_category %}
+                  {% assign total_category_posts = cat[1].size %}
+                 {% endif %}
+              {% endfor %}
+
+              {% assign debug = false %}
+              {% if debug %}
+              <div>
+                <p> total posts per category </p>
+                <ul>
+                {% for cat in site.categories %}
+                    <li>{{cat[0]}} ({{cat[1].size}})</li>
+                {% endfor %}
+                </ul>
+                <p> total posts in {{post_category}}: {{ total_category_posts }} </p>
+              </div>
+              {% endif %}
+
               <!-- Recent posts -->
-              <div class="row">
+              <div class="row card-deck">
               {% for post in site.posts %} {% for category in post.categories %}
                 {% if posts_written == posts_max %} {% assign last_post_written = true %} {% break %}{% endif %}
 
                 {% if category == post_category and last_post_written != true %}
                   {% assign posts_written = posts_written|plus:1 %}
                   <!-- Post -->
-                  {% if posts_written != posts_max %}
-                  <div class="col-md-{{card_width}} col-sm-{{card_width}} col-xs-12 pr-2 pl-0">
-                  {% else %}
-                  <div class="col-md-{{card_width}} col-sm-{{card_width}} col-xs-12 pr-0 pl-0">
-                  {% endif %}
-                    <article class="card raised-z5 mb-5">
+                    <article class="card raised-z5 mb-3">
                       {% if post.image %}
-                        <img class="img-fluid g-height-200" src="{{post.image}}" alt="{{post.title}}">
+                        <img class="img-fluid img__object--cover g-height-200" src="{{post.image}}" alt="{{post.title}}">
                         {% assign post_width = '80x' %}
                       {% else %}
                         <img class="mt-2" src="" alt="">
                         {% assign post_width = '100x' %}
                       {% endif %}
-                      <div>
-                        <h3 class="card-header bg-primary notoc">{{post.title}}</h3>
-                        <!-- Excerpt -->
-                        <div class="card-body r-text-300">
-                          {{post.excerpt|truncatewords:50|replace:'...',' ...'|remove:'<div class="paragraph">'|remove:'</div>'|remove:'<p>'|remove:'</p>'}}
-                        </div>
-                        <!-- End Excerpt -->
-                        <div class="card-body text-muted r-text-200">
+                      <h3 class="card-header bg-primary notoc">{{post.title}}</h3>
+                      <!-- Body|Excerpt -->
+                      <div class="card-body r-text-300">
+                        {{post.excerpt|truncatewords:50|replace:'...',' ...'|remove:'<div class="paragraph">'|remove:'</div>'|remove:'<p>'|remove:'</p>'}}
+                      </div>
+                      <!-- End Body|Excerpt -->
+                      <div class="card-footer r-text-200">
+                        <div class="card-footer-text">
                           <i class="mdi mdi-calendar-blank mr-1"></i>
                           {{post.date|date:"%Y %B, %e"}}
                         </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_text}} · {{post.tagline}}
-                          </a>
-                        </div>
+                        <a class="card-link md-grey-800 font-weight-bold g-font-size-12 text-uppercase"
+                           href="{{post.url}}">
+                           {{readmore_text}} · {{post.tagline}}
+                        </a>
                       </div>
                     </article>
-                   </div>
-                   <!-- End Post -->
-                {% endif %}
+                    <!-- End Post -->
+
+                    <!-- Calculate 'column setters' to manage BS break points for 'responsive' card deck (rcard-deck) -->
+                    {% assign sm = posts_written | modulo: bs_card_deck.break_on_sm %}
+                    {% assign md = posts_written | modulo: bs_card_deck.break_on_md %}
+                    {% assign lg = posts_written | modulo: bs_card_deck.break_on_lg %}
+                    {% assign xl = posts_written | modulo: bs_card_deck.break_on_xl %}
 
+                    <!-- Add 'column setters' for BS break points -->
+                    {% if sm == 0 %}
+                      <div class="w-100 d-none d-sm-block d-md-none"> <!-- break on sm --> </div>
+                    {% endif %}
+
+                    {% if md == 0 %}
+                      <div class="w-100 d-none d-md-block d-lg-none"> <!-- break on md --> </div>
+                    {% endif %}
+
+                    {% if lg == 0 %}
+                      <div class="w-100 d-none d-lg-block d-xl-none"> <!-- break on lg --> </div>
+                    {% endif %}
+
+                    {% if xl == 0 %}
+                      <div class="w-100 d-none d-xl-block" ><!-- break on xl --> </div>
+                    {% endif %}
+
+                {% endif %}
               {% endfor %} {% endfor %}
               </div>
               <!-- End recent posts -->

data/assets/data/quicklinks.html

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -33,7 +33,7 @@ regenerate: true
 
 {% comment %} Set config files
 -------------------------------------------------------------------------------- {% endcomment %}
-{% assign template_settings       = site.data.template_settings %}
+{% assign j1_config       = site.data.j1_config %}
 {% assign authentication_defaults = modules.defaults.authentication.defaults %}
 {% assign authentication_settings = modules.authentication.settings %}
 {% assign navigator_defaults      = modules.defaults.navigator.defaults %}
@@ -125,7 +125,7 @@ regenerate: true
 
 {% comment %} Show|Hide Translator icon
 -------------------------------------------------------------------------------- {% endcomment %}
-{% if template_settings.translation.enabled %}
+{% if j1_config.translation.enabled %}
   {% assign show_translator_icon = true  %}
 {% else %}
   {% assign show_translator_icon = false %}
@@ -220,19 +220,19 @@ regenerate: true
 <!-- [INFO   ] [j1.modules.navigator.quicklinks.html  ] [Set icon size as: {{ icon_size }}] -->
 
 <ul class="navbar-nav">
-  {% if back_url != "none" %}<li id="quickLinksHomeButton" class="nav-item"><a id="page_back_id" class="nav-icon" href="{{back_url}}"><i class="{{icon_family}} {{icon_family}}-{{back_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if home_url != "none" %}<li id="quickLinksHomeButton" class="nav-item"><a id="home_id" class="nav-icon" href="{{home_url}}"><i class="{{icon_family}} {{icon_family}}-{{home_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if disqus_url != "none" %}<li id="quickLinksDisqusButton" class="nav-item"><a id="disqus_id" class="nav-icon" href="{{disqus_url}}" target="blank"><i class="{{icon_family}} {{icon_family}}-{{disqus_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if github_url != "none" %}<li id="quickLinksGithubButton" class="nav-item"><a id="github_id" class="nav-icon" href="{{github_url}}" target="blank"><i class="{{icon_family}} {{icon_family}}-{{github_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if patreon_url != "none" %}<li id="quickLinksPatreonButton" class="nav-item"><a id="patreon_id" class="nav-icon" href="{{patreon_url}}" target="blank"><i class="{{icon_family}} {{icon_family}}-{{patreon_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if facebook_url != "none" %}<li id="quickLinksFacebookButton" class="nav-item"><a id="facebook_id" class="nav-icon" href="{{facebook_url}}" target="blank"><i class="{{icon_family}} {{icon_family}}-{{facebook_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if twitter_url != "none" %}<li id="quickLinksTwitterButton" class="nav-item"><a id="twitter_id" class="nav-icon" href="{{twitter_url}}" target="blank"><i class="{{icon_family}} {{icon_family}}-{{twitter_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_auth_manager_icon %}<li id="quickLinksSignInOutButton" class="nav-item" style="display: none;"><a class="nav-icon" id="navLinkSignInOut" href="#" data-toggle="modal" data-target="#{{signin_modal_id}}"><i id="iconSignInOut" class="{{icon_family}} {{icon_family}}-{{signin_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_cookiebar_icon %}<li id="quickLinksCookieButton" class="nav-item" style="display: none;"><a id="cookie-state" class="nav-icon" href="#" data-toggle="modal" data-target="#cookieRevokeCentralDanger"><i class="{{icon_family}} {{icon_family}}-{{cookies_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_translator_icon %}<li id="quickLinksLanguageButton" class="nav-item translator"><a class="nav-icon" href="#"><i class="{{icon_family}} {{icon_family}}-{{translator_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_quick_search_icon %}<li id="quickLinksSearchButton" class="nav-item search"><a class="nav-icon" href="#"><i class="{{icon_family}} {{icon_family}}-{{search_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_control_center_icon %}<li id="quickLinksControlCenterButton" class="nav-item control-center" style="display: block;"><a class="nav-icon" href="{{control_center_url}}"><i class="{{icon_family}} {{icon_family}}-{{control_center_icon}} {{icon_size}}"></i></a></li>{% endif %}
-  {% if show_r_text_icon %}<li id="quickLinksRTextButton" class="nav-item control-center" style="display: block;"><a class="nav-icon" href="#" data-toggle="modal" data-target="#fluidModalRTextResizer"><i class="{{icon_family}} {{icon_family}}-{{r_text_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if back_url != "none" %}<li id="quickLinksHomeButton" class="nav-item"><a id="page_back_id" class="nav-icon" href="{{back_url}}" aria-label="Page back"><i class="{{icon_family}} {{icon_family}}-{{back_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if home_url != "none" %}<li id="quickLinksHomeButton" class="nav-item"><a id="home_id" class="nav-icon" href="{{home_url}}" aria-label="Home"><i class="{{icon_family}} {{icon_family}}-{{home_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if disqus_url != "none" %}<li id="quickLinksDisqusButton" class="nav-item"><a id="disqus_id" class="nav-icon" href="{{disqus_url}}" aria-label="Disqus" target="blank"><i class="{{icon_family}} {{icon_family}}-{{disqus_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if github_url != "none" %}<li id="quickLinksGithubButton" class="nav-item"><a id="github_id" class="nav-icon" href="{{github_url}}" aria-label="Github" target="blank"><i class="{{icon_family}} {{icon_family}}-{{github_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if patreon_url != "none" %}<li id="quickLinksPatreonButton" class="nav-item"><a id="patreon_id" class="nav-icon" href="{{patreon_url}}" aria-label="Patreon" target="blank"><i class="{{icon_family}} {{icon_family}}-{{patreon_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if facebook_url != "none" %}<li id="quickLinksFacebookButton" class="nav-item"><a id="facebook_id" class="nav-icon" href="{{facebook_url}}" aria-label="Facebook" target="blank"><i class="{{icon_family}} {{icon_family}}-{{facebook_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if twitter_url != "none" %}<li id="quickLinksTwitterButton" class="nav-item"><a id="twitter_id" class="nav-icon" href="{{twitter_url}}" aria-label="Twitter" target="blank"><i class="{{icon_family}} {{icon_family}}-{{twitter_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_auth_manager_icon %}<li id="quickLinksSignInOutButton" class="nav-item" style="display: none;"><a class="nav-icon" id="navLinkSignInOut" aria-label="SignOut" href="#" data-toggle="modal" data-target="#{{signin_modal_id}}"><i id="iconSignInOut" class="{{icon_family}} {{icon_family}}-{{signin_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_cookiebar_icon %}<li id="quickLinksCookieButton" class="nav-item" style="display: none;"><a id="cookie-state" class="nav-icon" href="#" aria-label="Cookies" data-toggle="modal" data-target="#cookieRevokeCentralDanger"><i class="{{icon_family}} {{icon_family}}-{{cookies_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_translator_icon %}<li id="quickLinksLanguageButton" class="nav-item translator"><a class="nav-icon" href="#" aria-label="Translator"><i class="{{icon_family}} {{icon_family}}-{{translator_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_quick_search_icon %}<li id="quickLinksSearchButton" class="nav-item search"><a class="nav-icon" href="#" aria-label="Search"><i class="{{icon_family}} {{icon_family}}-{{search_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_control_center_icon %}<li id="quickLinksControlCenterButton" class="nav-item control-center" style="display: block;"><a class="nav-icon" href="{{control_center_url}}" aria-label="ControlCenter"><i class="{{icon_family}} {{icon_family}}-{{control_center_icon}} {{icon_size}}"></i></a></li>{% endif %}
+  {% if show_r_text_icon %}<li id="quickLinksRTextButton" class="nav-item control-center" style="display: block;"><a class="nav-icon" href="#" aria-label="TextResizer" data-toggle="modal" data-target="#fluidModalRTextResizer"><i class="{{icon_family}} {{icon_family}}-{{r_text_icon}} {{icon_size}}"></i></a></li>{% endif %}
 </ul>
 <!-- Test element -->
 <div id="nav_test_element" class="nav-primary" style="display: none"></div>

data/assets/data/themes.json

@@ -1,5 +1,5 @@
 ---
-regenerate: true
+regenerate:                             true
 ---
 
 {% capture cache %}
@@ -32,8 +32,8 @@ regenerate: true
 {% comment %} Set config data
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign environment         = site.environment %}
-{% assign asset_path          = site.data.template_settings.asset_path %}
-{% assign custom_theme_config = site.data.template_settings.custom_theme %}
+{% assign asset_path          = site.data.j1_config.asset_path %}
+{% assign custom_theme_config = site.data.j1_config.custom_theme %}
 {% assign custom_scss         = custom_theme_config.custom_scss %}
 
 {% capture theme_path %}{{asset_path}}/modules/bs_theme_switcher/themes{% endcapture %}
@@ -47,18 +47,18 @@ regenerate: true
 {
   "themes":
   [
-    {"name": "Uno",             "css": "{{asset_path}}/core/css/uno.css"},
-    {"name": "Uno dark",        "css": "{{asset_path}}/core/css/uno-dark.css"},
-    {"name": "Bootstrap",       "css": "{{asset_path}}/core/css/bootstrap.css"}
+    {"name": "Uno (light)",             "css": "{{asset_path}}/core/css/themes/uno-light/bootstrap.css"},
+    {"name": "Uno (dark)",              "css": "{{asset_path}}/core/css/themes/uno-dark/bootstrap.css"},
+    {"name": "Bootstrap",               "css": "{{asset_path}}/core/css/themes/bootstrap/bootstrap.css"}
   ]
 }
 {% else %}
 {
   "themes":
   [
-    {"name": "Uno",             "css": "{{asset_path}}/core/css/uno.min.css"},
-    {"name": "Uno dark",        "css": "{{asset_path}}/core/css/uno-dark.min.css"},
-    {"name": "Bootstrap",       "css": "{{asset_path}}/core/css/bootstrap.min.css"}
+    {"name": "Uno (light)",             "css": "{{asset_path}}/core/css/themes/uno-light/bootstrap.min.css"},
+    {"name": "Uno (dark)",              "css": "{{asset_path}}/core/css/themes/uno-dark/bootstrap.min.css"},
+    {"name": "Bootstrap",               "css": "{{asset_path}}/core/css/themes/bootstrap/bootstrap.min.css"}
   ]
 }
 {% endif %}