j1-template 2023.0.16 → 2023.1.0

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

@@ -60,6 +60,9 @@ regenerate:                             true
 {% assign themer_defaults           = modules.defaults.themer.defaults %}
 {% assign themer_settings           = modules.themer.settings %}
 
+{% assign scroller_defaults         = modules.defaults.scroller.defaults %}
+{% assign scroller_settings         = modules.scroller.settings %}
+
 {% assign tracking_enabled          = modules.analytics.enabled %}
 {% assign tracking_id               = modules.analytics.google.trackingID %}
 
@@ -135,10 +138,13 @@ var j1 = (function (options) {
   // globals
   // ---------------------------------------------------------------------------
   // base page resources
-  var rePager                     =  new RegExp('navigator|dateview|tagview|archive');
-  var environment                 = '{{environment}}';
-  var moduleOptions               = {};
-  var j1_runtime_data             = {};
+  var rePager          =  new RegExp('navigator|dateview|tagview|archive');
+  var environment      = '{{environment}}';
+  var moduleOptions    = {};
+  var j1_runtime_data  = {};
+  var scrollerSettings = {};
+  var scrollerOptions  = {};
+  var scrollerDefaults = {};
   var _this;
   var settings;
   var json_data;
@@ -147,6 +153,9 @@ var j1 = (function (options) {
   var referrer;
   var documentHeight;
 
+  var scrollOffset;
+  var scrollOffsetCorrection;
+
   // defaults for status information
   var state                         = 'not_started';
   var mode                          = 'not_detected';
@@ -260,7 +269,7 @@ var j1 = (function (options) {
   };
 
   // ---------------------------------------------------------------------------
-  // helper functions
+  // Helper functions
   // ---------------------------------------------------------------------------
 
   // See: https://stackoverflow.com/questions/359788/how-to-execute-a-javascript-function-when-i-have-its-name-as-a-string
@@ -301,6 +310,11 @@ var j1 = (function (options) {
       // create settings object from frontmatter options
       var frontmatterOptions  = options != null ? $.extend({}, options) : {};
 
+      // Load scroller module DEFAULTS|CONFIGs
+      scrollerDefaults = $.extend({}, {{scroller_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      scrollerSettings = $.extend({}, {{scroller_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      scrollerOptions  = $.extend(true, {}, scrollerDefaults, scrollerSettings);
+
       // settings for dynamic pages
       scrollDynamicPagesTopOnChange = frontmatterOptions.scrollDynamicPagesTopOnChange ? frontmatterOptions.scrollDynamicPagesTopOnChange : '{{template_config.scrollDynamicPagesTopOnChange}}';
       scrollDynamicPagesTopOnChange = j1.stringToBoolean(scrollDynamicPagesTopOnChange);
@@ -1311,12 +1325,12 @@ var j1 = (function (options) {
     // getScrollOffset()
     // Calculate offset for a correct (smooth) scroll position
     // -------------------------------------------------------------------------
-    getScrollOffset: function () {
-      var scrollOffset;
-      var offsetCorrection = 0;
+    getScrollOffset: function (offsetCorrection) {
+//     var scrollOffset;
+//      var offsetCorrection = 0;
 
       var $pagehead     = $('.attic');
-      var $navbar       = $('nav.navbar');
+      var $navbar       = $('#navigator_nav_navbar');
       var $adblock      = $('#adblock');
       var navbarType    = $navbar.hasClass('navbar-fixed') ? 'fixed' : 'scrolled';
       var fontSize      = $('body').css('font-size').replace('px','');
@@ -1587,6 +1601,44 @@ var j1 = (function (options) {
       }
     },
 
+    // -------------------------------------------------------------------------
+    // subdomain()
+    // Returns true|false if a subdomain is used for a given URL
+    // -------------------------------------------------------------------------
+    subdomain: function (url) {
+      // See: https://snipplr.com/view/5449/check-if-a-url-contains-a-subdomain
+
+      // IF THERE, REMOVE WHITE SPACE FROM BOTH ENDS
+      url = url.replace(new RegExp(/^\s+/),""); // START
+      url = url.replace(new RegExp(/\s+$/),""); // END
+
+      // IF FOUND, CONVERT BACK SLASHES TO FORWARD SLASHES
+      url = url.replace(new RegExp(/\\/g),"/");
+
+      // IF THERE, REMOVES 'http://', 'https://' or 'ftp://' FROM THE START
+      url = url.replace(new RegExp(/^http\:\/\/|^https\:\/\/|^ftp\:\/\//i),"");
+
+      // IF THERE, REMOVES 'www.' FROM THE START OF THE STRING
+      url = url.replace(new RegExp(/^www\./i),"");
+
+      // REMOVE COMPLETE STRING FROM FIRST FORWARD SLASH ON
+      url = url.replace(new RegExp(/\/(.*)/),"");
+
+      // REMOVES '.??.??' OR '.???.??' FROM END - e.g. '.CO.UK', '.COM.AU'
+      if (url.match(new RegExp(/\.[a-z]{2,3}\.[a-z]{2}$/i))) {
+            url = url.replace(new RegExp(/\.[a-z]{2,3}\.[a-z]{2}$/i),"");
+
+      // REMOVES '.??' or '.???' or '.????' FROM END - e.g. '.US', '.COM', '.INFO'
+      } else if (url.match(new RegExp(/\.[a-z]{2,4}$/i))) {
+            url = url.replace(new RegExp(/\.[a-z]{2,4}$/i),"");
+      }
+
+      // CHECK TO SEE IF THERE IS A DOT '.' LEFT IN THE STRING
+      var isSubDomain = (url.match(new RegExp(/\./g))) ? true : false;
+
+      return(isSubDomain);
+    }, // END subdomain
+
     // -------------------------------------------------------------------------
     //  readCookie (Vanilla JS)
     // -------------------------------------------------------------------------
@@ -2392,6 +2444,7 @@ var j1 = (function (options) {
     // -------------------------------------------------------------------------
     scrollToAnchor: function () {
       var logger = log4javascript.getLogger('j1.adapter.scrollToAnchor');
+      var scrollOffset;
 
       var dependencies_met_page_displayed = setInterval (function () {
         var pageState   = $('#no_flicker').css("display");
@@ -2401,24 +2454,26 @@ var j1 = (function (options) {
           // TODO: Check why a timeout is required to run the smmoth scroller (j1.scrollTo)
           if (j1['pageMonitor'].pageType == 'static') {
             setTimeout (function() {
-              logger.info('\n' + 'Scroller: Scroll static page')
-              const scrollOffset = j1.getScrollOffset();
+              logger.debug('\n' + 'Scroller: Scroll static page');
+              scrollOffsetCorrection = scrollerOptions.smoothscroll.offsetCorrection;
+              scrollOffset = j1.getScrollOffset(scrollOffsetCorrection);
               j1.scrollTo(scrollOffset);
-            }, {{template_config.page_on_load_timeout}} );
+            }, {{template_config.timeoutScrollStaticPages}} );
             clearInterval(dependencies_met_page_displayed);
           } else if (j1['pageMonitor'].pageType == 'dynamic') {
             setTimeout (function() {
-              const scrollOffset = j1.getScrollOffset();
+              scrollOffsetCorrection = scrollerOptions.smoothscroll.offsetCorrection;
+              scrollOffset = j1.getScrollOffset(scrollOffsetCorrection);
               j1.scrollTo(scrollOffset);
-              logger.info('\n' + 'Scroller: Scroll dynamic page on timeout')
-//          }, timeoutScrollDynamicPages);
-          }, {{template_config.page_on_load_timeout}} );
+              logger.debug('\n' + 'Scroller: Scroll dynamic page on timeout');
+          }, {{template_config.timeoutScrollDynamicPages}} );
             clearInterval(dependencies_met_page_displayed);
           } else {
             // failsave fallback
             setTimeout (function() {
-              logger.warn('\n' + 'Scroller: Scroll page of unknown type')
-              const scrollOffset = j1.getScrollOffset();
+              logger.debug('\n' + 'Scroller: Scroll page of unknown type');
+              scrollOffsetCorrection = scrollerOptions.smoothscroll.offsetCorrection;
+              scrollOffset = j1.getScrollOffset(scrollOffsetCorrection);
               j1.scrollTo(scrollOffset);
             }, {{template_config.page_on_load_timeout}} );
             clearInterval(dependencies_met_page_displayed);
@@ -2460,9 +2515,10 @@ var j1 = (function (options) {
       // see: https://stackoverflow.com/questions/14866775/detect-document-height-change
       //
       const observer = new ResizeObserver(entries => {
-        const body              = document.body,
-              html              = document.documentElement,
-              scrollOffset      = j1.getScrollOffset();
+        var scrollOffsetCorrection  = scrollerOptions.smoothscroll.offsetCorrection;
+        const body                  = document.body,
+              html                  = document.documentElement,
+              scrollOffset          = j1.getScrollOffset(scrollOffsetCorrection);
 
         // get the page height from the DOM
         //
@@ -2580,7 +2636,23 @@ var j1 = (function (options) {
       window.onkeyup = function (event) {
         if (event.keyCode == 27) window.history.back();
       };
-    }
+
+      $("a[href*='#']:not([href='#'])").click(function() {
+        if (location.pathname.replace(/^\//,'') == this.pathname.replace(/^\//,'') && location.hostname == this.hostname) {
+        var target = $(this.hash);
+        target = target.length ? target : $('[name=' + this.hash.slice(1) +']');
+        if (target.length) {
+          var scrollOffsetCorrection  = scrollerOptions.smoothscroll.offsetCorrectionLocal;
+          var offset                  = target.offset().top + scrollOffsetCorrection;
+          $('html,body').animate({
+            scrollTop: offset
+          }, 1000);
+          return false;
+        }
+      }
+     });
+
+   } // END registerEvents
   };
 }) (j1, window);
 

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

@@ -111,9 +111,9 @@ var logText;
     // 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}} ]
+      var xhrLoadState      = 'pending';                                        // (initial) load state for the HTML portion of the slider
+      var load_dependencies = {};
+      var dependency;
 
       // -----------------------------------------------------------------------
       // Default module settings
@@ -133,24 +133,29 @@ var logText;
       // Load  module DEFAULTS|CONFIG
       masonryDefaults = $.extend({}, {{masonry_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
       masonrySettings = $.extend({}, {{masonry_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
-      masonryOptions = $.extend({}, masonryDefaults, masonrySettings);
-  
+      masonryOptions =  $.extend(true, {}, masonryDefaults, masonrySettings);
+
+      // load HTML portion for all grids
+      console.debug('loading HTML portion for all Masonry grids configured');
+      _this.loadGridHTML(masonryOptions, masonryOptions.grids);
+
       // -----------------------------------------------------------------------
       // initializer
       // -----------------------------------------------------------------------
       var dependencies_met_page_ready = setInterval (function (options) {
+        var pageState   = $('#no_flicker').css("display");
+        var pageVisible = (pageState == 'block') ? true: false;
 
-        if ( j1.getState() === 'finished' ) {
+        if ( j1.getState() === 'finished' && pageVisible ) {
 
           _this.setState('started');
           logger.debug('\n' + 'state: ' + _this.getState());
           logger.info('\n' + 'module is being initialized');
 
-          {% for item in masonry_options.grids %}
-            {% if item.grid.enabled %}
-              {% assign grid_id = item.grid.id %}
-
-              logger.info('\n' + 'found masonry on id: ' + '{{grid_id}}');
+          {% for grid in masonry_settings.grids %}
+            {% if grid.enabled %}
+              {% assign grid_id = grid.id %}
+              logger.info('\n' + 'found masonry grid on id: ' + '{{grid_id}}');
 
               {% comment %} load default grid options
               ------------------------------------------------------------------ {% endcomment %}
@@ -162,53 +167,76 @@ var logText;
               {% assign transition_duration = masonry_defaults.transitionDuration %}
               {% assign stagger_duration    = masonry_defaults.stagger %}
               {% assign gutter_size         = masonry_defaults.gutter %}
+              {% assign resize              = masonry_defaults.resize %}
+              {% assign itemSelector        = masonry_defaults.itemSelector %}
+              {% assign containerStyle      = masonry_defaults.containerStyle %}
+              {% assign columnWidth         = masonry_defaults.columnWidth %}
 
               {% comment %} overload defaults by grid element options
               ------------------------------------------------------------------ {% endcomment %}
-              {% if item.grid.percentPosition %}      {% assign percent_position    = item.grid.percentPosition %}    {% endif %}
-              {% if item.grid.horizontalOrder %}      {% assign horizontal_order    = item.grid.horizontalOrder %}    {% endif %}
-              {% if item.grid.originLeft %}           {% assign origin_left         = item.grid.originLeft %}         {% endif %}
-              {% if item.grid.originTop %}            {% assign origin_top          = item.grid.originTop %}          {% endif %}
-              {% if item.grid.initLayout %}           {% assign init_layout         = item.grid.initLayout %}         {% endif %}
-              {% if item.grid.transitionDuration %}   {% assign transition_duration = item.grid.transitionDuration %} {% endif %}
-              {% if item.grid.stagger %}              {% assign stagger_duration    = item.grid.stagger %}            {% endif %}
-              {% if item.grid.gutter %}               {% assign gutter_size         = item.grid.gutter %}             {% endif %}
-
-              var $grid_{{grid_id}} = $('#{{grid_id}}');
-
-              logger.info('\n' + 'initialize grid on id: ' + '{{grid_id}}');
-              // initialize the (masonry) grid
-              //
-              $grid_{{grid_id}}.masonry({
-                percentPosition:        {{percent_position}},
-                horizontalOrder:        {{horizontal_order}},
-                originLeft:             {{origin_left}},
-                originTop:              {{origin_top}},
-                initLayout:             {{init_layout}},
-                transitionDuration:     "{{transition_duration}}s",
-                stagger:                "{{stagger_duration}}",
-              });
-
-              logger.info('\n' + 'install event handlers on id: ' + '{{grid_id}}');
-              // grid event handler
-              //
-              $grid_{{grid_id}}.on( 'click', '.card', function() {
-                // remove clicked element
-                // layout remaining item elements
-                $grid_{{grid_id}}.masonry('remove', this).masonry('layout');
-                $grid_{{grid_id}}.masonry('reloadItems');
-              });
+              {% if grid.options.percentPosition %}    {% assign percent_position    = grid.options.percentPosition %}    {% endif %}
+              {% if grid.options.horizontalOrder %}    {% assign horizontal_order    = grid.options.horizontalOrder %}    {% endif %}
+              {% if grid.options.originLeft %}         {% assign origin_left         = grid.options.originLeft %}         {% endif %}
+              {% if grid.options.originTop %}          {% assign origin_top          = grid.options.originTop %}          {% endif %}
+              {% if grid.options.initLayout %}         {% assign init_layout         = grid.options.initLayout %}         {% endif %}
+              {% if grid.options.transitionDuration %} {% assign transition_duration = grid.options.transitionDuration %} {% endif %}
+              {% if grid.options.stagger %}            {% assign stagger_duration    = grid.options.stagger %}            {% endif %}
+              {% if grid.options.gutter %}             {% assign gutter_size         = grid.options.gutter %}             {% endif %}
+              {% if grid.options.resize %}             {% assign resize              = grid.options.resize %}             {% endif %}
+              {% if grid.options.itemSelector %}       {% assign itemSelector        = grid.options.itemSelector %}       {% endif %}
+              {% if grid.options.containerStyle %}     {% assign containerStyle      = grid.options.containerStyle %}     {% endif %}
+              {% if grid.options.columnWidth %}        {% assign columnWidth         = grid.options.columnWidth %}     {% endif %}
+
+              // create dynamic loader variable|s
+              dependency = 'dependencies_met_html_loaded_{{grid.id}}';
+              load_dependencies[dependency] = '';
+
+              // initialize the grid if HTML portion successfully loaded
+              load_dependencies['dependencies_met_html_loaded_{{grid.id}}'] = setInterval (function (options) {
+                // check if HTML portion of the slider is loaded successfully (loadSliderHTML)
+                xhrLoadState = j1.xhrDOMState['#{{grid.id}}_parent'];
+                if ( xhrLoadState === 'success' ) {
+                  setTimeout (function() {
+                    var $grid_{{grid_id}} = $('#{{grid_id}}');
+                    logger.info('\n' + 'initialize grid on id: ' + '{{grid_id}}');
+
+                    // grid event handler
+                    logger.info('\n' + 'install event handlers for grid on id: ' + '{{grid_id}}');
+                    $grid_{{grid_id}}.on('layoutComplete', function() {
+                      // initializing (layout) completed
+                      logger.debug('\n' + 'initializing layout completed for grid on id: ' + '{{grid_id}}');
+                    });
+
+                    // setup the grid
+                    logger.info('\n' + 'grid is being setup on id: ' + '{{grid.id}}');
+                    $grid_{{grid_id}}.masonry({
+                      percentPosition:        {{percent_position}},
+                      horizontalOrder:        {{horizontal_order}},
+                      originLeft:             {{origin_left}},
+                      originTop:              {{origin_top}},
+                      initLayout:             {{init_layout}},
+                      transitionDuration:     "{{transition_duration}}s",
+                      stagger:                "{{stagger_duration}}s",
+                      resize:                 {{resize}},
+                      gutter:                 {{gutter_size}},
+//                    containerStyle:         "{{containerStyle}}",
+//                    columnWidth:             {{columnWidth}},
+                    });
+                  }, masonryOptions.initTimeout);
+                }
+                clearInterval(load_dependencies['dependencies_met_html_loaded_{{grid.id}}']);
+              }, 25); // END dependencies_met_html_loaded
 
             {% else %}
-
-              {% if item.grid.hideDisabled %}
+              logger.info('\n' + 'found grid disabled on id: {{grid.id}}');
+              {% if masonryOptions.hideDisabled %}
                 // hide a grid if disabled
-                $('#{{item.grid.id}}').hide();
+                logger.debug('\n' + 'hide grid disabled on id: {{grid.id}}');
+                $('#{{grid.id}}').hide();
               {% endif %}
-
             {% endif %} // ENDIF grid enabled
-          {% endfor %} // ENDFOR (all) grids
 
+          {% endfor %} // ENDFOR (all) grids
           logger.info('\n' + 'initializing module finished');
           clearInterval(dependencies_met_page_ready);
         }
@@ -216,6 +244,40 @@ var logText;
 
     }, // END init
 
+    // -------------------------------------------------------------------------
+    // loadGridHTML()
+    // loads the HTML portion via AJAX (j1.loadHTML) for all grids configured.
+    // NOTE: Make sure the placeholder DIV is available in the content
+    // page e.g. using the asciidoc extension masonry::
+    // -------------------------------------------------------------------------
+    loadGridHTML: function (options, grid) {
+      var numGrids      = Object.keys(grid).length;
+      var active_grids  = numGrids;
+      var xhr_data_path = options.xhr_data_path + '/index.html';
+      var xhr_container_id;
+
+      console.debug('number of grids found: ' + numGrids);
+
+      _this.setState('load_data');
+      Object.keys(grid).forEach(function(key) {
+        if (grid[key].enabled) {
+          xhr_container_id = grid[key].id + '_parent';
+
+          console.debug('load HTML portion on grid id: ' + grid[key].id);
+          j1.loadHTML({
+            xhr_container_id: xhr_container_id,
+            xhr_data_path:    xhr_data_path,
+            xhr_data_element: grid[key].id
+          });
+        } else {
+          console.debug('grid found disabled on id: ' + grid[key].id);
+          active_grids--;
+        }
+      });
+      console.debug('grids loaded in page enabled|all: ' + active_grids + '|' + numGrids);
+      _this.setState('data_loaded');
+    }, // END loadSliderHTML
+
     // -------------------------------------------------------------------------
     // messageHandler()
     // manage messages send from other J1 modules

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

@@ -384,9 +384,10 @@ j1.adapter.mmenu = (function (j1, window) {
                 callback: function (event) {
                   logger.debug('\n' + 'hide|show the nav menu');
                   // switch off|on the (main) nav menu
-                  $('#' + 'navbar-brand').toggle();
-                  $('#' + navMenuOptions.nav_main_menu).toggle();
-                  $('#' + navMenuOptions.nav_quicklinks).toggle();
+                  $('#' + 'navigator_nav_navbar').toggle();
+                  // $('#' + 'navbar-brand').toggle();
+                  // $('#' + navMenuOptions.nav_main_menu).toggle();
+                  // $('#' + navMenuOptions.nav_quicklinks).toggle();
                 }
               });
 

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

@@ -261,10 +261,10 @@ j1.adapter.navigator = (function (j1, window) {
 
       // Merge|Overload module CONFIG by DEFAULTS
       //
-      navBarOptions                                 = j1.mergeData(navBarConfig, navDefaults.nav_bar);
-      navMenuOptions                                = j1.mergeData(navMenuConfig, navDefaults.nav_menu);
-      navQuicklinksOptions                          = j1.mergeData(navQuicklinksConfig, navDefaults.nav_quicklinks);
-      navAuthClientConfig                           = j1.mergeData(navAuthClientConfig, navDefaults.nav_authclient);
+      navBarOptions                                 = $.extend(true, {}, navDefaults.nav_bar,  navBarConfig);
+      navMenuOptions                                = $.extend(true, {}, navDefaults.nav_menu, navMenuConfig);
+      navQuicklinksOptions                          = $.extend(true, {}, navDefaults.nav_bar,  navQuicklinksConfig,);
+      navAuthClientConfig                           = $.extend(true, {}, navAuthClientConfig,  navDefaults.nav_authclient);
 
       // save config settings into the adapter object for global access
       //
@@ -406,8 +406,10 @@ j1.adapter.navigator = (function (j1, window) {
             // event handler|css styles
             // -----------------------------------------------------------------
             var dependencies_met_initialized = setInterval(function() {
+              var pageState   = $('#no_flicker').css("display");
+              var pageVisible = (pageState == 'block') ? true: false;
               // initialize if page and themer ready
-              if (j1.getState() === 'finished' && j1.adapter.themer.getState() === 'finished') {
+              if (j1.getState() === 'finished' && j1.adapter.themer.getState() === 'finished' && pageVisible) {
                 _this.setState('processing');
 
                 // apply module configuration settings
@@ -789,8 +791,6 @@ j1.adapter.navigator = (function (j1, window) {
 
       $('head').append(navbar_scrolled_style);
 
-
-
       logger.info('\n' + 'set dynamic styles for the theme loaded');
 
       // Set|Resolve navMenuOptions
@@ -837,6 +837,56 @@ j1.adapter.navigator = (function (j1, window) {
       // set current body background color for all tables
       $('table').css('background', bg_table);
 
+      // jadams, 2023-02-26: navbar settings
+      style  = '<style>';
+      style += '  li.nav-item > a {';
+      style += '    color: ' + navBarOptions.nav_item_color + ' !important;';
+      style += '  }';
+      style += '</style>';
+      $('head').append(style);
+
+      // jadams, 2023-02-26: navbar settings
+      style  = '<style>';
+      style += '  li.nav-item > a:hover {';
+      style += '    color: ' + navBarOptions.nav_item_color_hover + ' !important;';
+      style += '  }';
+      style += '</style>';
+      $('head').append(style);
+
+      // jadams, 2023-02-26: navmenu settings
+      style  = '<style>';
+      style += '  li.dropdown.nav-item > a {';
+      style += '    color: ' + navMenuOptions.menu_item_color + ' !important;';
+      style += '  }';
+      style += '</style>';
+      $('head').append(style);
+
+      // jadams, 2023-02-26: navmenu settings
+      style  = '<style>';
+      style += '  li.dropdown.nav-item > a:hover {';
+      style += '    color: ' + navMenuOptions.menu_item_color_hover + ' !important;';
+      style += '  }';
+      style += '</style>';
+      $('head').append(style);
+
+      // jadams, 2023-02-26: navicon settings
+      style  = '<style>';
+      style += '  .nav-icon {';
+      style += '    color: ' + navQuicklinksOptions.icon_color + ' !important;';
+      style += '  }';
+      style += '</style>';
+      $('head').append(style);
+
+      // jadams, 2023-02-26: navicon settings
+      style  = '<style>';
+      style += '  .nav-icon:hover {';
+      style += '    color: ' + navQuicklinksOptions.icon_color_hover + ' !important;';
+      style += '  }';
+      style += '</style>';
+      $('head').append(style);
+
+
+
 //    $('head').append('<style>.mdi-bg-primary {color: ' +bg_scrolled+ ';}</style>');
       style  = '<style>';
       style += '  .mdi-bg-primary {';
@@ -1022,7 +1072,7 @@ j1.adapter.navigator = (function (j1, window) {
       style += '    nav.navbar.navigator li.dropdown ul.dropdown-menu {';
       style += '       max-height: ' + navMenuOptions.dropdown_menu_max_height + 'rem !important;';
       style += '       animation-duration: ' + navMenuOptions.dropdown_animate_duration + 's !important;';
-      style += '       color: #616161 !important;';
+//    style += '       color: #616161 !important;';
       style += '       min-width: ' + navMenuOptions.dropdown_item_min_width + 'rem !important;';
       style += '       border-top: solid ' + navMenuOptions.dropdown_border_top + 'px !important;';
       style += '       border-radius: ' + navMenuOptions.dropdown_border_radius + 'px !important;';
@@ -1057,22 +1107,22 @@ j1.adapter.navigator = (function (j1, window) {
 
 //    $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator li.dropdown ul.dropdown-menu > li > a { color: ' +navMenuOptions.dropdown_item_color+ ' !important; font-size: ' +navMenuOptions.dropdown_font_size+ ' !important; font-weight: 400; } }</style>');
       // configure dropdown_font_size|color
-      style  = '<style>';
-      style += '  @media screen and (min-width: ' + gridBreakpoint_lg + ') {';
-      style += '    nav.navbar.navigator li.dropdown ul.dropdown-menu > li > a {';
-      style += '       color: ' + navMenuOptions.dropdown_item_color + ' !important;';
-      style += '       font-size: ' + navMenuOptions.dropdown_font_size + ' !important;';
-      style += '       font-weight: 400;';
-      style += '    }';
-      style += '  }';
-      style += '</style>';
-      $('head').append(style);
+      // style  = '<style>';
+      // style += '  @media screen and (min-width: ' + gridBreakpoint_lg + ') {';
+      // style += '    nav.navbar.navigator li.dropdown ul.dropdown-menu > li > a {';
+      // style += '       color: ' + navMenuOptions.dropdown_item_color + ' !important;';
+      // style += '       font-size: ' + navMenuOptions.dropdown_font_size + ' !important;';
+      // style += '       font-weight: 400;';
+      // style += '    }';
+      // style += '  }';
+      // style += '</style>';
+      // $('head').append(style);
 
 //    $('head').append('<style>@media (min-width: ' +gridBreakpoint_lg+ ') { nav.navbar.navigator ul.dropdown-menu.megamenu-content .content ul.menu-col li a { color: ' +navMenuOptions.dropdown_item_color+ ' !important; font-size: ' +navMenuOptions.megamenu_font_size+ ' !important; font-weight: 400; } }</style>');
       style  = '<style>';
       style += '  @media screen and (min-width: ' + gridBreakpoint_lg + ') {';
       style += '    nav.navbar.navigator ul.dropdown-menu.megamenu-content .content ul.menu-col li a {';
-      style += '       color: ' + navMenuOptions.dropdown_item_color + ' !important;';
+//    style += '       color: ' + navMenuOptions.dropdown_item_color + ' !important;';
       style += '       font-size: ' + navMenuOptions.megamenu_font_size + ' !important;';
       style += '       font-weight: 400;';
       style += '    }';