j1-template 2022.5.3 → 2022.6.1

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

@@ -162,6 +162,18 @@ var logText;
       // Global variable settings
       // -----------------------------------------------------------------------
 
+      // create settings object from frontmatter
+      var frontmatterOptions  = options != null ? $.extend({}, options) : {};
+
+      // create settings object from comment options
+      var commentDefaults = $.extend({}, {{comments_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      var commentSettings = $.extend({}, {{comments_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+
+      // merge all comment options
+      var commentOptions = $.extend({}, commentDefaults, commentSettings, frontmatterOptions);
+
+      // check comment options from frontmatter
+      if (j1.stringToBoolean(commentOptions.comments)) {
       {% if site_id %}
 
       _this = j1.adapter.comments;
@@ -329,10 +341,9 @@ var logText;
           clearInterval(dependencies_met_page_ready);
         } // END if getState 'finished'
       }, 25);
-
       {% endcase %}
-      // [INFO   ] [j1.adapter.comments                    ] [ end processing ]
-      {% else %}
+
+    {% else %}
       var dependencies_met_page_ready = setInterval(function() {
         if (j1.getState() == 'finished') {
           logger = log4javascript.getLogger('j1.adapter.comments');
@@ -340,9 +351,10 @@ var logText;
           clearInterval(dependencies_met_page_ready);
         }
       }, 25);
-      {% endif %}
+    {% endif %}
+    } // END if 'commentOptions.comments'
 
-      {% else %}
+    {% else %}
       var dependencies_met_page_ready = setInterval(function() {
         if (j1.getState() == 'finished') {
           logger = log4javascript.getLogger('j1.adapter.comments');
@@ -350,8 +362,7 @@ var logText;
           clearInterval(dependencies_met_page_ready);
         }
       }, 25);
-      {% endif %}
-      return;
+    {% endif %}
     }, // END init
 
     // -------------------------------------------------------------------------

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

@@ -84,6 +84,7 @@ j1.adapter.lunr = (function (j1, window) {
   var _this;
   var logger;
   var logText;
+  var modalBody;
 
   // ---------------------------------------------------------------------------
   // Helper functions
@@ -120,7 +121,7 @@ j1.adapter.lunr = (function (j1, window) {
       searchOptions = $.extend({}, {{lunr_search_options | replace: '=>', ':' | replace: 'nil', '""'}});
 
       // -----------------------------------------------------------------------
-      // lunr_search initializer
+      // lunr initializer
       // -----------------------------------------------------------------------
       var dependencies_met_j1_finished = setInterval(function() {
         if (j1.getState() == 'finished') {
@@ -150,6 +151,38 @@ j1.adapter.lunr = (function (j1, window) {
 
     }, // END init
 
+    // -------------------------------------------------------------------------
+    // loadDialog (modal)
+    // -------------------------------------------------------------------------
+    loadDialog: function () {
+
+      logger.info('\n' + 'create|append search modal, id: ' + 'bratze');
+
+      _this.modal = document.createElement('div');
+      _this.modal.id = "topInfoModalContainer";
+      document.body.append(_this.modal);
+
+      {% raw %}
+      _this.modalScript       = document.createElement('script');
+      _this.modalScript.type  = 'text/mustache';
+      _this.modalScript.id    = 'search-results-template';
+      _this.modalScript.text  = '<ul style="list-style: none; margin-left: .5rem; margin-right: 4.25rem">' + '\n';
+      _this.modalScript.text += '{{#docs}}' + '\n';
+      _this.modalScript.text += '  <li>' + '\n';
+      _this.modalScript.text += '    <h4 class="result-item"> <a class="link-no-decoration" href="{{url}}" target="_blank">{{title}} · {{tagline}}</a> </h4>' + '\n';
+      _this.modalScript.text += '    <p class="result-item-text small text-muted mt-2 mb-0"> <i class="mdi mdi-calendar-blank mdi-18px mr-1"></i>{{displaydate}} </p>' + '\n';
+      _this.modalScript.text += '    <p class="result-item-text">{{description}}</p>' + '\n';
+      _this.modalScript.text += '      <i class="mdi mdi-tag-text-outline mdi-18px mr-1"></i><span class="sr-categories">{{#categories}} {{.}} · {{/categories}}</span>' + '\n';
+      _this.modalScript.text += '      <i class="mdi mdi-tag mdi-18px mr-1 ml-2"></i><span class="sr-tags">{{#tags}} {{.}} · {{/tags}}</span>' + '\n';
+      _this.modalScript.text += '    </p>' + '\n';
+      _this.modalScript.text += '  </li>' + '\n';
+      _this.modalScript.text += '{{/docs}}' + '\n';
+      _this.modalScript.text += '<ul>' + '\n';
+      {% endraw %}
+      document.body.append(_this.modalScript);
+
+    }, // END loadDialog
+
     // -------------------------------------------------------------------------
     // event handler
     // -------------------------------------------------------------------------

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

@@ -80,8 +80,6 @@ regenerate:                             true
 
 {% assign nav_quicklinks_defaults       = navigator_defaults.nav_quicklinks %}
 {% assign nav_quicklinks_settings       = navigator_settings.nav_quicklinks %}
-{% assign nav_topsearch_defaults        = navigator_defaults.nav_topsearch %}
-{% assign nav_topsearch_settings        = navigator_settings.nav_topsearch %}
 {% assign nav_authclient_defaults       = authentication_defaults.auth_client %}
 {% assign nav_authclient_settings       = authentication_settings.auth_client %}
 
@@ -92,7 +90,6 @@ regenerate:                             true
 {% assign nav_bar_options               = nav_bar_defaults | merge: nav_bar_settings %}
 {% assign nav_menu_options              = nav_menu_defaults | merge: nav_menu_settings %}
 {% 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 nav_bar_id                    = navigator_defaults.nav_bar.id %}
@@ -231,12 +228,10 @@ j1.adapter.navigator = (function (j1, window) {
       var navBarConfig                              = {};
       var navMenuConfig                             = {};
       var navQuicklinksConfig                       = {};
-      var navTopsearchConfig                        = {};
       var navAuthClientConfig                       = {};
       var navBarOptions                             = {};
       var navMenuOptions                            = {};
       var navQuicklinksOptions                      = {};
-      var navTopsearchOptions                       = {};
       var navAuthClientOptions                      = {};
       var navAuthMAnagerConfig                      = {};
 
@@ -257,7 +252,6 @@ j1.adapter.navigator = (function (j1, window) {
       navBarConfig                                  = $.extend({}, {{nav_bar_options | replace: '=>', ':' }});
       navMenuConfig                                 = $.extend({}, {{nav_menu_options | replace: '=>', ':' }});
       navQuicklinksConfig                           = $.extend({}, {{quicklinks_options | replace: '=>', ':' }});
-      navTopsearchConfig                            = $.extend({}, {{topsearch_options | replace: '=>', ':' }});
       navAuthClientConfig                           = $.extend({}, {{authclient_options | replace: '=>', ':' }});
 
       navAuthMAnagerConfig                          = $.extend({}, {{authentication_options | replace: '=>', ':' }});
@@ -270,7 +264,6 @@ j1.adapter.navigator = (function (j1, window) {
       navBarOptions                                 = j1.mergeData(navBarConfig, navDefaults.nav_bar);
       navMenuOptions                                = j1.mergeData(navMenuConfig, navDefaults.nav_menu);
       navQuicklinksOptions                          = j1.mergeData(navQuicklinksConfig, navDefaults.nav_quicklinks);
-      navTopsearchOptions                           = j1.mergeData(navTopsearchConfig, navDefaults.nav_topsearch);
       navAuthClientConfig                           = j1.mergeData(navAuthClientConfig, navDefaults.nav_authclient);
 
       // save config settings into the adapter object for global access
@@ -279,7 +272,6 @@ j1.adapter.navigator = (function (j1, window) {
       _this['navBarOptions']         = navBarOptions;
       _this['navMenuOptions']        = navMenuOptions;
       _this['navQuicklinksOptions']  = navQuicklinksOptions;
-      _this['navTopsearchOptions']   = navTopsearchOptions;
       _this['navAuthClientConfig']   = navAuthClientConfig;
       _this['navAuthManagerConfig']  = navAuthMAnagerConfig;
 
@@ -422,7 +414,7 @@ j1.adapter.navigator = (function (j1, window) {
                   // apply module configuration settings
                   _this.applyNavigatorSettings (
                     navDefaults, navBarOptions, navMenuOptions,
-                    navQuicklinksOptions, navTopsearchOptions
+                    navQuicklinksOptions
                   );
 
                   // (static) delay applying styles until added CSS data
@@ -432,7 +424,7 @@ j1.adapter.navigator = (function (j1, window) {
                     logger.info('\n' + 'initializing dynamic CSS styles');
                     _this.applyThemeSettings (
                       navDefaults, navBarOptions, navMenuOptions,
-                      navQuicklinksOptions, navTopsearchOptions
+                      navQuicklinksOptions
                     );
                   }, 500);
 
@@ -453,7 +445,7 @@ j1.adapter.navigator = (function (j1, window) {
                 logger.info('\n' + 'apply dynamic CSS styles');
                 _this.applyThemeSettings (
                   navDefaults, navBarOptions, navMenuOptions,
-                  navQuicklinksOptions, navTopsearchOptions
+                  navQuicklinksOptions
                 );
 
                 logger.info('\n' + 'init auth client');
@@ -476,13 +468,6 @@ j1.adapter.navigator = (function (j1, window) {
       $(window).on('resize', function() {
         j1.core.navigator.manageDropdownMenu(navDefaults, navMenuOptions);
 
-        // jadams, 2020-07-10: cause severe trouble on mobile devices if
-        // OnScreen Kbd comes up and reduces the window size (resize event)
-        // DISABLED
-        // -------------------------------------------------------------------
-        // Hide|Close topSearch on resize event
-        // $('.top-search').slideUp();
-
         // Manage sticky NAV bars
         setTimeout (function() {
           j1.core.navigator.navbarSticky();
@@ -654,7 +639,7 @@ j1.adapter.navigator = (function (j1, window) {
     // applyThemeSettings
     // Apply CSS styles from current theme
     // -------------------------------------------------------------------------
-    applyThemeSettings: function (navDefaults, navBarOptions, navMenuOptions, navQuicklinksOptions, navTopsearchOptions) {
+    applyThemeSettings: function (navDefaults, navBarOptions, navMenuOptions, navQuicklinksOptions) {
       var logger              = log4javascript.getLogger('j1.adapter.navigator.applyThemeSettings');
       var gridBreakpoint_lg   = '992px';
       var gridBreakpoint_md   = '768px';
@@ -688,11 +673,6 @@ j1.adapter.navigator = (function (j1, window) {
       navQuicklinksOptions.icon_color_hover           = navQuicklinksOptions.icon_color_hover;
       navQuicklinksOptions.background_color           = navQuicklinksOptions.background_color;
 
-      // Set|Resolve navTopsearchOptions
-      // -----------------------------------------------------------------------
-      navTopsearchOptions.input_color                 = navTopsearchOptions.input_color;
-      navTopsearchOptions.background_color            = navTopsearchOptions.background_color;
-
       // Set dymanic styles
       // -----------------------------------------------------------------------
       var style;
@@ -952,26 +932,9 @@ j1.adapter.navigator = (function (j1, window) {
 //       style += '    }';
 //       style += '  }';
 //       style += '</style>';
-//       $('head').append(style);
-//
-//       // navQuicklinks|navTopSearch
-//       // -----------------------------------------------------------------------
-// //    $('head').append('<style>.top-search { background-color: ' +navTopsearchOptions.background_color+ ' !important; }</style>');
-//       style  = '<style>';
-//       style += '  .top-search {';
-//       style += '    background-color: ' + navTopsearchOptions.background_color + ' !important;';
-//       style += '  }';
-//       style += '</style>';
-//       $('head').append(style);
-//
-// //    $('head').append('<style>.top-search input.form-control { color: ' +navTopsearchOptions.input_color+ ' !important; }</style>');
-//       style  = '<style>';
-//       style += '  .top-search input.form-control {';
-//       style += '    color: ' + navTopsearchOptions.input_color + ' !important;';
-//       style += '  }';
-//       style += '</style>';
 //       $('head').append(style);
 
+
       // Timeline styles
       // -----------------------------------------------------------------------
       style  = '<style>';
@@ -1046,7 +1009,7 @@ j1.adapter.navigator = (function (j1, window) {
     // applyNavigatorSettings
     // Apply settings from configuration
     // -------------------------------------------------------------------------
-    applyNavigatorSettings: function (navDefaults, navBarOptions, navMenuOptions, navQuicklinksOptions, navTopsearchOptions) {
+    applyNavigatorSettings: function (navDefaults, navBarOptions, navMenuOptions, navQuicklinksOptions) {
       var logger              = log4javascript.getLogger('j1.adapter.navigator.applyThemeSettings');
       var gridBreakpoint_lg   = '992px';
       var gridBreakpoint_md   = '768px';
@@ -1080,11 +1043,6 @@ j1.adapter.navigator = (function (j1, window) {
       navQuicklinksOptions.icon_color_hover           = navQuicklinksOptions.icon_color_hover;
       navQuicklinksOptions.background_color           = navQuicklinksOptions.background_color;
 
-      // Set|Resolve navTopsearchOptions
-      // -----------------------------------------------------------------------
-      navTopsearchOptions.input_color                 = navTopsearchOptions.input_color;
-      navTopsearchOptions.background_color            = navTopsearchOptions.background_color;
-
       // Set dymanic styles
       // -----------------------------------------------------------------------
       var style;
@@ -1348,19 +1306,9 @@ j1.adapter.navigator = (function (j1, window) {
 
       // navQuicklinks|navTopSearch
       // -----------------------------------------------------------------------
-//    $('head').append('<style>.top-search { background-color: ' +navTopsearchOptions.background_color+ ' !important; }</style>');
-      style  = '<style>';
-      style += '  .top-search {';
-      style += '    background-color: ' + navTopsearchOptions.background_color + ' !important;';
-      style += '  }';
-      style += '</style>';
-      $('head').append(style);
-
-      // jadams, 2022-07-25: DISABLED
-//    $('head').append('<style>.top-search input.form-control { color: ' +navTopsearchOptions.input_color+ ' !important; }</style>');
       // style  = '<style>';
-      // style += '  .top-search input.form-control {';
-      // style += '    color: ' + navTopsearchOptions.input_color + ' !important;';
+      // style += '  .top-search {';
+      // style += '    background-color: ' + navTopsearchOptions.background_color + ' !important;';
       // style += '  }';
       // style += '</style>';
       // $('head').append(style);

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

@@ -0,0 +1,227 @@
+---
+regenerate:                             true
+---
+
+{% capture cache %}
+
+{% comment %}
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/waves.js
+ # Liquid template to adapt the Waves module
+ #
+ # Product/Info:
+ # https://jekyll.one
+ # Copyright (C) 2022 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
+ # -----------------------------------------------------------------------------
+ # Test data:
+ #  {{ liquid_var | debug }}
+ #  wave_options:  {{ wave_options | debug }}
+ # -----------------------------------------------------------------------------
+{% endcomment %}
+
+{% comment %} Liquid procedures
+-------------------------------------------------------------------------------- {% endcomment %}
+
+{% comment %} Set global settings
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign environment       = site.environment %}
+{% assign asset_path        = "/assets/themes/j1" %}
+
+{% comment %} Process YML config data
+================================================================================ {% endcomment %}
+
+{% comment %} Set config files
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign template_config    = site.data.j1_config %}
+{% assign blocks             = site.data.blocks %}
+{% assign modules            = site.data.modules %}
+
+{% comment %} Set config data (settings only)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign wave_defaults = modules.defaults.waves.defaults %}
+{% assign wave_settings = modules.waves.settings %}
+
+{% comment %} Set config options (settings only)
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign wave_options  = wave_defaults | merge: wave_settings %}
+
+{% comment %} Variables
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign comments          = wave_options.enabled %}
+
+{% comment %} Detect prod mode
+-------------------------------------------------------------------------------- {% endcomment %}
+{% assign production = false %}
+{% if environment == 'prod' or environment == 'production' %}
+  {% assign production = true %}
+{% endif %}
+
+/*
+ # -----------------------------------------------------------------------------
+ # ~/assets/themes/j1/adapter/js/comments.js
+ # J1 Adapter for the comments module
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2022 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # For details, see: https://github.com/jekyll-one-org/j1-template/blob/main/LICENSE.md
+ # -----------------------------------------------------------------------------
+ #  Adapter generated: {{site.time}}
+ # -----------------------------------------------------------------------------
+*/
+
+// -----------------------------------------------------------------------------
+// ESLint shimming
+// -----------------------------------------------------------------------------
+/* eslint indent: "off"                                                       */
+// -----------------------------------------------------------------------------
+'use strict';
+j1.adapter.waves = (function (j1, window) {
+
+{% comment %} Set global variables
+-------------------------------------------------------------------------------- {% endcomment %}
+var environment     = '{{environment}}';
+var cookie_names    = j1.getCookieNames();
+var user_state      = j1.readCookie(cookie_names.user_state);
+var viewport_width  = $(window).width();
+var themes_allowed;
+var theme_enabled;
+var theme;
+var _this;
+var logger;
+var logText;
+
+  // ---------------------------------------------------------------------------
+  // Main object
+  // ---------------------------------------------------------------------------
+  return {
+
+    // -------------------------------------------------------------------------
+    // init()
+    // adapter initializer
+    // -------------------------------------------------------------------------
+    init: function (options) {
+
+      // [INFO   ] [j1.adapter.comments                    ] [ detected comments provider (j1_config): {{comments_provider}}} ]
+      // [INFO   ] [j1.adapter.comments                    ] [ start processing load region head, layout: {{page.layout}} ]
+
+      // -----------------------------------------------------------------------
+      // Default module settings
+      // -----------------------------------------------------------------------
+      var settings = $.extend({
+        module_name: 'j1.adapter.waves',
+        generated:   '{{site.time}}'
+      }, options);
+
+      // -----------------------------------------------------------------------
+      // Global variable settings
+      // -----------------------------------------------------------------------
+
+      // create settings object from frontmatter
+      var frontmatterOptions  = options != null ? $.extend({}, options) : {};
+
+      // create settings object from comment options
+      var waveDefaults = $.extend({}, {{wave_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      var waveSettings = $.extend({}, {{wave_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+
+      // merge all comment options
+      var waveOptions = $.extend({}, waveDefaults, waveSettings, frontmatterOptions);
+
+      _this  = j1.adapter.waves;
+      theme  = user_state.theme_name;
+      logger = log4javascript.getLogger('j1.adapter.wave');
+
+      // -----------------------------------------------------------------------
+      // initializer
+      // -----------------------------------------------------------------------
+      var dependencies_met_page_ready = setInterval (function (options) {
+
+        if ( j1.getState() === 'finished' ) {
+          themes_allowed = waveOptions.themes.toString();
+          theme_enabled  = waveOptions.themes.indexOf(theme) > -1 ? true : false;
+
+          _this.setState('started');
+          logger.debug('\n' + 'state: ' + _this.getState());
+          logger.info('\n' + 'module is being initialized');
+
+          logger.debug('\n' + 'themes allowd: ' + themes_allowed);
+          logger.debug('\n' + 'theme detected: ' + theme);
+
+          if (themes_allowed === 'all' ) {
+            logger.info('\n' + 'activate waves for theme: ' + 'all' );
+            $('.wave').show();
+          } else if (theme_enabled) {
+            logger.info('\n' + 'activate waves for theme: ' + theme );
+            $('.wave').show();
+          } else {
+            logger.warn('\n' + 'no valid theme/s found');
+            logger.warn('\n' + 'deactivate (hide) waves');
+            $('.wave').hide();
+          }
+
+          logger.info('\n' + 'initializing module finished');
+          clearInterval(dependencies_met_page_ready);
+        }
+      }, 25);
+
+    }, // END init
+
+    // -------------------------------------------------------------------------
+    // messageHandler()
+    // manage messages send from other J1 modules
+    // -------------------------------------------------------------------------
+    messageHandler: function (sender, message) {
+      var json_message = JSON.stringify(message, undefined, 2);
+
+      logText = '\n' + 'received message from ' + sender + ': ' + json_message;
+      logger.debug(logText);
+
+      // -----------------------------------------------------------------------
+      //  Process commands|actions
+      // -----------------------------------------------------------------------
+      if (message.type === 'command' && message.action === 'module_initialized') {
+        //
+        // Place handling of command|action here
+        //
+        logger.info('\n' + message.text);
+      }
+
+      //
+      // Place handling of other command|action here
+      //
+
+      return true;
+    }, // END messageHandler
+
+    // -------------------------------------------------------------------------
+    // setState()
+    // Sets the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    setState: function (stat) {
+      _this.state = stat;
+    }, // END setState
+
+    // -------------------------------------------------------------------------
+    // getState()
+    // Returns the current (processing) state of the module
+    // -------------------------------------------------------------------------
+    getState: function () {
+      return _this.state;
+    } // END getState
+
+  }; // END return
+})(j1, window);
+
+{% endcapture %}
+{% if production %}
+  {{ cache | minifyJS }}
+{% else %}
+  {{ cache | strip_empty_lines }}
+{% endif %}
+{% assign cache = nil %}

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

@@ -16,7 +16,7 @@
  # -----------------------------------------------------------------------------
 */
 /*!
-   * Bootstrap  v5.2.1 (https://getbootstrap.com/)
+   * Bootstrap  v5.2.2 (https://getbootstrap.com/)
    * Copyright 2011-2022 The Bootstrap Authors
    * Copyright 2011-2022 Twitter, Inc.
    * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -2217,10 +2217,14 @@ textarea.form-control-lg {
   @media (prefers-reduced-motion: reduce) {
     .btn {
       transition: none; } }
-  :not(.btn-check) + .btn:hover, .btn:first-child:hover {
+  .btn:hover {
     color: var(--bs-btn-hover-color);
     background-color: var(--bs-btn-hover-bg);
     border-color: var(--bs-btn-hover-border-color); }
+  .btn-check + .btn:hover {
+    color: var(--bs-btn-color);
+    background-color: var(--bs-btn-bg);
+    border-color: var(--bs-btn-border-color); }
   .btn:focus-visible {
     color: var(--bs-btn-hover-color);
     background-color: var(--bs-btn-hover-bg);
@@ -3510,7 +3514,7 @@ textarea.form-control-lg {
           border-bottom-left-radius: 0; } }
 
 .accordion {
-  --bs-accordion-color: var(--bs-body-color);
+  --bs-accordion-color: #212529;
   --bs-accordion-bg: #fff;
   --bs-accordion-transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, border-radius 0.15s ease;
   --bs-accordion-border-color: var(--bs-border-color);
@@ -3519,9 +3523,9 @@ textarea.form-control-lg {
   --bs-accordion-inner-border-radius: calc(0.375rem - 1px);
   --bs-accordion-btn-padding-x: 1.25rem;
   --bs-accordion-btn-padding-y: 1rem;
-  --bs-accordion-btn-color: var(--bs-body-color);
+  --bs-accordion-btn-color: #212529;
   --bs-accordion-btn-bg: var(--bs-accordion-bg);
-  --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='var%28--bs-body-color%29'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
+  --bs-accordion-btn-icon: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23212529'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
   --bs-accordion-btn-icon-width: 1.25rem;
   --bs-accordion-btn-icon-transform: rotate(-180deg);
   --bs-accordion-btn-icon-transition: transform 0.2s ease-in-out;
@@ -4223,6 +4227,7 @@ textarea.form-control-lg {
     display: none; }
 
 .toast-container {
+  --bs-toast-zindex: 1090;
   position: absolute;
   z-index: var(--bs-toast-zindex);
   width: max-content;