j1_template 2019.4.7 → 2019.4.8

data/lib/starter_web/assets/themes/j1/adapter/js/back2top.js

@@ -143,16 +143,16 @@ j1.adapter['back2top'] = (function (j1, window) {
         _this.setCss(); 
         j1.core.back2top.init(moduleOptions);
       } else {
-        var delayLog = setInterval(function() {
-          if ( j1.getState() === 'finished' ) {
+        // var delayLog = setInterval(function() {
+        //   if ( j1.getState() === 'finished' ) {
             state   = 'disabled';
             logger.info('state: ' + state);
             logger.info("J1 Back2Top disabled");
 
-            // clear interval checking
-            clearInterval(delayLog);
-          } // END Manage cookie consent dialog
-        }, 50); // END setInterval
+        //     // clear interval checking
+        //     clearInterval(delayLog);
+        //   } // END Manage cookie consent dialog
+        // }, 50); // END setInterval
       }
      
       return true;
@@ -163,12 +163,14 @@ j1.adapter['back2top'] = (function (j1, window) {
     // -------------------------------------------------------------------------
     setCss: function () {
       var dataLoaded = setInterval(function() {
-        if (j1.getState() === 'finished') {
+        if (typeof j1.colors !== 'undefined') {
+          // clear interval checking
+          clearInterval(dataLoaded);
+
           $('head').append('<style>#topcontrol { background: ' + j1.colors['{{background_color}}'] + '; }</style>');
           $('head').append('<style>#topcontrol:hover { background: ' + j1.colors['{{active_color}}'] + '; }</style>');
           $('head').append('<style>#topcontrol:after { content: "\\{{back2top_icon}}"; font-family: {{back2top_icon_family}}; }</style>');
-          // clear interval checking
-          clearInterval(dataLoaded);
+
         } // END 'getState'
       }, 50); // END 'dataLoaded'
 

data/lib/starter_web/assets/themes/j1/adapter/js/cookie_consent.js

@@ -173,16 +173,16 @@ j1.adapter['cookie_consent'] = (function (j1, window) {
             });     
         });
       } else {
-        var delayLog = setInterval(function() {
-          if ( j1.getState() === 'finished' ) {
+        // var delayLog = setInterval(function() {
+        //   if ( j1.getState() === 'finished' ) {
             state   = 'disabled';
             logger.info('state: ' + state);
             logger.info('J1 CookieConsent disabled');
 
             // clear interval checking
-            clearInterval(delayLog);
-          } // END Manage cookie consent dialog
-        }, 50); // END setInterval
+        //     clearInterval(delayLog);
+        //   } // END Manage cookie consent dialog
+        // }, 50); // END setInterval
       }
 
       return true;

data/lib/starter_web/assets/themes/j1/adapter/js/logger.js

@@ -48,13 +48,6 @@ regenerate:                             false
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign logger_options    = logger_defaults | merge: logger_settings %}
 
-
-{% comment %} Variables
--------------------------------------------------------------------------------- {% endcomment %}
-
-{% assign environment   = site.environment %}
-{% assign config        = site.data.modules.j1_log4javascript %}
-
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/logger.js
@@ -68,7 +61,7 @@ regenerate:                             false
  # J1 Template is licensed under the MIT License.
  # For details, see https://jekyll.one
  # -----------------------------------------------------------------------------
- #  Adapter generated: {{site.time}}
+ # Adapter generated: {{site.time}}
  # -----------------------------------------------------------------------------
 */
 'use strict';
@@ -79,7 +72,7 @@ j1.adapter['logger'] = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
-  var environment   = '{{environment}}'; // Set environment
+  var environment   = '{{environment}}';
   var state         = 'not_started';
   var moduleOptions = {};
   var _this;
@@ -148,9 +141,9 @@ j1.adapter['logger'] = (function (j1, window) {
       _this   = j1.adapter.logger;  
       logger  = log4javascript.getLogger('j1.adapter.logger');
 
-      // logger.info('Logger Framework is being initialized');
-      // state = 'started';
-      // logger.info('state: ' + state);
+      logger.info('Logger Framework is being initialized');
+      state = 'started';
+      logger.info('state: ' + state);
 
       // Create a console consoleAppender inherited by all (client) loggers
       var consoleAppender = new log4javascript.BrowserConsoleAppender();
@@ -171,15 +164,12 @@ j1.adapter['logger'] = (function (j1, window) {
       // Set logging levels for all template (parent|child) logger
       if (environment == 'production') {
         log4javascript.getLogger('j1').setLevel(log4javascript.Level.WARN);
-        //log4javascript.getLogger('j1.Logger').setLevel(log4javascript.Level.WARN);
-        //log4javascript.getLogger('j1.loader').setLevel(log4javascript.Level.WARN);
-        //log4javascript.getLogger('j1.module').setLevel(log4javascript.Level.WARN);
       }
       if (environment == 'development' || environment == 'devel' || environment == 'dev' || environment == 'test') {
         log4javascript.getLogger('j1').setLevel(log4javascript.Level.DEBUG);
-        //log4javascript.getLogger('j1.module').setLevel(log4javascript.Level.DEBUG);
-        //log4javascript.getLogger('j1.loader').setLevel(log4javascript.Level.DEBUG);
-        //log4javascript.getLogger('j1.Logger').setLevel(log4javascript.Level.DEBUG);
+      } else {
+        // fallback settings
+        log4javascript.getLogger('j1').setLevel(log4javascript.Level.WARN);
       }
 
       state = 'finished';

data/lib/starter_web/assets/themes/j1/adapter/js/master_header.js

@@ -93,41 +93,31 @@ j1.adapter['master_header'] = (function (j1, window) {
     // Initializer
     // -------------------------------------------------------------------------
     init: function ( options ) {
+      // create seetings object from frontmatterOptions 
       var frontmatterOptions = options != null ? $.extend({}, options) : {};
       
+      // Save frontmatterOptions in the j1 namespace 
+      // to be used later by j1.template.init() to load the header
       j1.adapter.master_header['frontmatterOptions'] = frontmatterOptions;
 
-
       {% comment %} Set global variables
       -------------------------------------------------------------------------- {% endcomment %}
       _this   = j1.adapter.master_header;
       logger  = log4javascript.getLogger('j1.adapter.master_header');
 
       status = 'started';
-      _this.setState(status);
       logger.info('state: ' + status);
       logger.info('Module is being initialized');
-//    _this.loadHeader( frontmatterOptions );
-
 
-      {% comment %} Run loading headers if J1 Template data is loaded
+      {% comment %} Loading headers if j1.template.init() loaded all data objects
       -------------------------------------------------------------------------- {% endcomment %}
-//       var j1DataLoaded = setInterval(function() {
-// 
-//         {% comment %} Deferred (AJAX) data load
-//         ------------------------------------------------------------------------ {% endcomment %}
-// //      if ( j1.getState() === 'running' ) {
-//         if ( j1.getTrue() ) {
-//           clearInterval(j1DataLoaded); // clear interval checking
-// 
-//           status = 'running';
-//           _this.setState(status);
-//           logger.info('state: ' + status);
-// 
-//           _this.loadHeader( frontmatterOptions );
-// 
-//         } // END j1 state === 'running'
-//       }, 50); // END setInterval j1DataLoaded
+      var dataLoaded = setInterval(function() {
+        if (typeof j1.colors !== 'undefined' && typeof j1.fonts !== 'undefined') {
+          // clear interval checking
+          clearInterval(dataLoaded);
+          _this.loadHeader( frontmatterOptions );
+        }
+      }, 50); // END 'dataLoaded'
 
       return true;
     }, // END init
@@ -184,17 +174,18 @@ j1.adapter['master_header'] = (function (j1, window) {
 
             {% comment %} Set the headerLoaded flag
             -------------------------------------------------------------------- {% endcomment %}
-            $(window).on("backstretch.before", function (e, instance, index) {
-
-              status = 'finished';
-              _this.setState(status);
-              logger.info('state: ' + status);
+           $(window).on("backstretch.before", function (e, instance, index) {
+              status = 'backstretch.before';
+              logger.debug('state: ' + status);
             });
 
             {% comment %} Add caption text if configured
             See: https://github.com/jquery-backstretch/jquery-backstretch/issues/194
             -------------------------------------------------------------------- {% endcomment %}
             $(window).on("backstretch.after", function (e, instance, index) {
+              status = 'add caption text: backstretch.after';
+              logger.debug('state: ' + status);
+
               if ( typeof headerOptions.slides[index].caption != 'undefined' ) {
                 var theCaption    = headerOptions.slides[index].caption;
                 var theLink       = headerOptions.slides[index].caption_href;
@@ -212,26 +203,28 @@ j1.adapter['master_header'] = (function (j1, window) {
               }
             });
 
-            {% comment %} Detect how show  should run (only once|infinite loop)
+            {% comment %} Detect how show should run (only once|infinite loop)
             -------------------------------------------------------------------- {% endcomment %}
             {% if image_loop %}
-              $(window).on("backstretch.before", function (e, instance, index) {
-                'use strict';
-                // remove class for the backstretch_intro background
-                if (index === backstretch_instance_data.images.length -1) {
-                  $('.backstretch').removeClass(headerOptions.spinner);
-                }
-              });
+            $(window).on("backstretch.before", function (e, instance, index) {
+              status = 'image loop: backstretch.before';
+              logger.debug('state: ' + status);
+              // remove class for the backstretch_intro background
+              if (index === backstretch_instance_data.images.length -1) {
+                $('.backstretch').removeClass(headerOptions.spinner);
+              }
+            });
             {% else %}
-              $(window).on("backstretch.before", function (e, instance, index) {
-                'use strict';
-                // Stop the slideshow after reached the last image
-                if (index === backstretch_instance_data.images.length -1) {
-                  $("#{{ header_id }}").backstretch("pause");
-                  // remove class for the backstretch_intro background
-                  $('.backstretch').removeClass(headerOptions.spinner);
-                }
-              });
+            $(window).on("backstretch.before", function (e, instance, index) {
+              status = 'image once: backstretch.before';
+              logger.debug('state: ' + status);
+              // Stop the slideshow after reached the last image
+              if (index === backstretch_instance_data.images.length -1) {
+                $("#{{ header_id }}").backstretch("pause");
+                // remove class for the backstretch_intro background
+                $('.backstretch').removeClass(headerOptions.spinner);
+              }
+            });
             {% endif %}
 
           } // END if header_id exists
@@ -464,23 +457,19 @@ j1.adapter['master_header'] = (function (j1, window) {
             $('head').append( masthead_opacity );
 
             status = 'initialized';
-            _this.setState(status);
             logger.info('state: ' + status);
 
             {% comment %} Run the image header if any
             -------------------------------------------------------------------- {% endcomment %}
             if ( typeof headerOptions.slides != 'undefined' ) {
-              // Load the image header portion if the page is signaled as ready (and visible)
-              var loadImageHeaderOnPageFinished = setInterval(function() {
-                if ( j1.getState() === 'finished' ) {
-                  {{ header_id }}( headerOptions )
-                  // clear interval checking
-                  clearInterval(loadImageHeaderOnPageFinished);
-                  status = 'completed';
-                  _this.setState(status);
-                  logger.info('state: ' + status);
-                }
-              }, 50); // END setInterval
+              // Load the image header if the page is ready (visible)
+              $(function() {
+                // logger.debug('Load image header on: ' + {{ header_id }});
+                logger.debug('Load image header');
+                {{ header_id }}( headerOptions )
+                status = 'completed';
+                logger.info('state: ' + status);
+              });
             }
           } // END if header id found in page
         {% endif %} // END if header enabled
@@ -488,21 +477,10 @@ j1.adapter['master_header'] = (function (j1, window) {
 
       // NO header found in page
       if ( $('#no_header').length ) {
-        status = 'initialized';
-        _this.setState(status);
+        status = 'completed';
         logger.info('state: ' + status);
-        logger.warn('No header configured/found in page');
-
-        // Set final state 
-        var loadImageHeaderOnPageFinished = setInterval(function() {
-          if ( j1.getState() === 'finished' ) {
-            // clear interval checking
-            clearInterval(loadImageHeaderOnPageFinished);
-            status = 'completed';
-            _this.setState(status);
-            logger.info('state: ' + status);
-          }
-        }, 50); // END setInterval
+        logger.warn('No header configured or found in page');        
+        logger.info('state: ' + status);        
       }
 
       return true;
@@ -522,7 +500,7 @@ j1.adapter['master_header'] = (function (j1, window) {
       //  Process commands|actions
       // -----------------------------------------------------------------------
       if ( message.type === 'command' && message.action === 'module_initialized' ) {
-        _this.setState('finished');
+        status = 'completed';
         logger.info(message.text);
       }
 

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

@@ -220,6 +220,13 @@ j1.adapter['navigator'] = (function (j1, window) {
       navSidebarOptions           = j1.mergeData(navSidebarConfig, navDefaults.nav_sidebar);
       navAuthClientConfig         = j1.mergeData(navAuthClientConfig, navDefaults.nav_authclient);
 
+      j1.adapter.navigator['navBarOptions']         = navBarOptions;
+      j1.adapter.navigator['navMenuOptions']        = navMenuOptions;
+      j1.adapter.navigator['navQuicklinksOptions']  = navQuicklinksOptions;
+      j1.adapter.navigator['navTopsearchOptions']   = navTopsearchOptions;
+      j1.adapter.navigator['navSidebarOptions']     = navSidebarOptions;
+      j1.adapter.navigator['navAuthClientConfig']   = navAuthClientConfig;
+
       // Load (individual) frontmatter options (currently NOT used)
       if ( options  != null ) { var frontmatterOptions = $.extend({}, options) }
   
@@ -230,23 +237,34 @@ j1.adapter['navigator'] = (function (j1, window) {
       $.when( 
         j1.xhrLoadData('j1.adapter.navigator', navSidebarOptions, 'sideBarLoaded'),
         j1.xhrLoadData('j1.adapter.navigator', navQuicklinksOptions, 'quickLinksLoaded'),
-        _this.loadMenuBar( navDefaults, navMenuOptions ) )
+        _this.loadMenuBar(navDefaults, navMenuOptions))
       .done (function( sideBar, quickLinks, menuBar ) {
+        logger.info('deferred (AJAX) data load finished');
+        logger.info('initialite navigator core');
+
+
+        {% comment %} Set CSS styles if j1.template.init() loaded all data objects
+        ------------------------------------------------------------------------ {% endcomment %}
+        var dataLoaded = setInterval(function() {
+          if (typeof j1.colors !== 'undefined' && typeof j1.fonts !== 'undefined') {
+            // clear interval checking
+            clearInterval(dataLoaded);
+            logger.info('apply CSS styles');
+            _this.setCss( navBarOptions, navMenuOptions, navQuicklinksOptions, navTopsearchOptions, navSidebarOptions );
+          }
+        }, 25); // END 'dataLoaded'
+
         // Detect|Set J1 App status
         appDetected       = j1.appDetected();
         authClientEnabled = j1.authClientEnabled();
-
-        logger.info('deferred (AJAX) data load finished');          
-
-        logger.info('apply CSS styles');
-        _this.setCss( navBarOptions, navMenuOptions, navQuicklinksOptions, navTopsearchOptions, navSidebarOptions );
-
         logger.info('application status detected: ' + appDetected);
+
         // Load AuthClient modals if appDetected
         if ( appDetected ) {
           logger.info('load AuthClient modals');
           j1.adapter.navigator.loadAuthClientModals( authConfig );
         }
+
       });
 
       // -----------------------------------------------------------------------
@@ -290,9 +308,9 @@ j1.adapter['navigator'] = (function (j1, window) {
       // See: http://stackoverflow.com/questions/939032/jquery-pass-more-parameters-into-callback
       var cb_load_closure = function(id, navMenuOptions) {
         return function ( responseTxt, statusTxt, xhr ) {
-          if ( statusTxt == "success" ) {
-            j1.core.navigator.init( navDefaultOptions, navMenuOptions );
+          if ( statusTxt == "success" ) {            
             var logText = "MenuBar on ID " +id+ " loaded successfully"
+            j1.core.navigator.init( navDefaultOptions, navMenuOptions );
             logger.info(logText);
             // Set processing to 'finished' to display page
             state = 'finished';
@@ -514,8 +532,8 @@ j1.adapter['navigator'] = (function (j1, window) {
       logText = "Initialize button click events";
       logger.info(logText);
 
-      var modalsLoaded = setInterval(function() {
-        if ( j1.adapter.navigator.getState() === 'finished' ) {
+      // var modalsLoaded = setInterval(function() {
+      //   if ( j1.adapter.navigator.getState() === 'finished' ) {
 
           // Manage button click events for modal "signInOutButton"
           // -------------------------------------------------------------------
@@ -611,10 +629,10 @@ j1.adapter['navigator'] = (function (j1, window) {
           logger.info(logText);
 
           // clear interval checking
-          clearInterval(modalsLoaded);
-
-        } // END Manage cookie consent dialog
-      }, 50); // END setInterval
+      //     clearInterval(modalsLoaded);
+      // 
+      //   } // END Manage cookie consent dialog
+      // }, 50); // END setInterval
 
       return true;
     }, // END modalEventHandler
@@ -680,12 +698,12 @@ j1.adapter['navigator'] = (function (j1, window) {
       // Size of brand image
       $('head').append("<style>.navbar-brand > img { height: {{brand_image_height}}px !important; }</style>");
       // Navbar transparent-light (light)
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator.navbar-transparent.light { background-color: " +navBarOptions.background_color_full+ "; border-bottom: solid 0px !important; } }</style>");
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator.navbar-scrolled.light { background-color: " +navBarOptions.background_color_scrolled+ "; } }</style>");
+      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator.navbar-transparent.light { background-color: " +navBarOptions.background_color_full+ " !important; border-bottom: solid 0px !important; } }</style>");
+      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator.navbar-scrolled.light { background-color: " +navBarOptions.background_color_scrolled+ " !important; } }</style>");
 
       /* Navbar media-queries, LARGE Window|Desktop (>= 1024) */
       /* jadams:  Oversized menu bar fixed by: overflow: hidden */
-      $('head').append("<style>@media (max-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator { background-color: " +navBarOptions.background_color_collapsed+ "; overflow: hidden; } }</style>");
+      $('head').append("<style>@media (max-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator { background-color: " +navBarOptions.background_color_collapsed+ " !important; overflow: hidden; } }</style>");
       //$('head').append("<style>@media (max-width: 1023px) { row { margin-left: 0 !important; margin-right: 0 !important; } }</style>");
 
       {% comment %} navQuicklinks styles
@@ -711,7 +729,7 @@ j1.adapter['navigator'] = (function (j1, window) {
       //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu  { max-height: " +navMenuOptions.dropdown_menu_height_max+ "em; overflow: hidden } }</style>");
 
       //  Limit dropdown item width
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator ul.nav.navbar-right .dropdown-menu .dropdown-menu { left: -" +navMenuOptions.dropdown_item_width+ "em; } }</style>");
+      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator ul.nav.navbar-right .dropdown-menu .dropdown-menu { left: -" +navMenuOptions.dropdown_item_width+ "em !important; } }</style>");
 
       // Limit last (2nd) dropdown in height (nav.navbar.navigator li.dropdown ul.dropdown-menu ul.dropdown-menu)
       $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu ul.dropdown-menu  { top: -" +navMenuOptions.dropdown_border_top+ "px !important; max-height: " +navMenuOptions.dropdown_menu_height_max+ "em !important; } }</style>");
@@ -724,17 +742,17 @@ j1.adapter['navigator'] = (function (j1, window) {
       //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: " +navMenuOptions.dropdown_animate_duration+ "s !important; color: " +navMenuOptions.dropdown_border_color+ "; width: " +navMenuOptions.dropdown_item_width+ "px; border-top: solid " +navMenuOptions.dropdown_border_height+ "px; left: 1rem; top: calc( 90px + " +navMenuOptions.dropdown_border_height+ "px ); } }</style>");
       //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: " +navMenuOptions.dropdown_animate_duration+ "s !important; color: " +navMenuOptions.dropdown_border_color+ "; width: " +navMenuOptions.dropdown_item_width+ "em; border-top: solid " +navMenuOptions.dropdown_border_height+ "px; left: 1em; } }</style>");
       // jadams, 2017-11-30: removed left padding from dropdown mwenu (for new j1nav style based on Navigator|Slate)
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: " +navMenuOptions.dropdown_animate_duration+ "s !important; color: " +navMenuOptions.dropdown_border_color+ "; width: " +navMenuOptions.dropdown_item_width+ "em; border-top: solid " +navMenuOptions.dropdown_border_top+ "px; border-radius: " +navMenuOptions.dropdown_border_radius+ "px; left: 0; } }</style>");
+      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu { animation-duration: " +navMenuOptions.dropdown_animate_duration+ "s !important; color: " +navMenuOptions.dropdown_border_color+ " !important; width: " +navMenuOptions.dropdown_item_width+ "emm!important; border-top: solid " +navMenuOptions.dropdown_border_top+ "px !important; border-radius: " +navMenuOptions.dropdown_border_radius+ "px !important; left: 0; } }</style>");
 
       {% if dropdown_style == 'raised' %}
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu { box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2); } }</style>");
+      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu { box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important; } }</style>");
       {% endif %}
 
       // jadams,2017-11-22: stop configure dropdown_font_size
       //$('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown li.dropdown.nav-item.nav-sub-item { color: " +navMenuOptions.dropdown_item_color+ "; font-size: " +navMenuOptions.dropdown_font_size+ "; font-weight: 400; } }</style>");
       // $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu > li > a { color: " +navMenuOptions.dropdown_item_color+ "; font-size: " +navMenuOptions.dropdown_font_size+ "; font-weight: 400; display: inline-flex; align-items: center;} }</style>");
-      $('head').append("<style>@media (min-width: " +gridBreakpoint_lg+ " ) { nav.navbar.navigator li.dropdown ul.dropdown-menu > li > a { color: " +navMenuOptions.dropdown_item_color+ "; font-size: " +navMenuOptions.dropdown_font_size+ "; font-weight: 400; } }</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+ "; font-size: " +navMenuOptions.megamenu_font_size+ "; font-weight: 400; } }</style>");
+      $('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>");
+      $('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>");
 
       // dropdown-menu item padding
       // jadams, 2017-11-22:  moved item padding to nav|dropdown-item based on font-site (rel|em)
@@ -750,13 +768,13 @@ j1.adapter['navigator'] = (function (j1, window) {
 
       {% comment %} navTopSearch Styles
       -------------------------------------------------------------------------- {% endcomment %}
-      $('head').append("<style>.top-search { background-color: " +navTopsearchOptions.background_color+ "; }</style>");
-      $('head').append("<style>.top-search .input-group-addon { color: " +navTopsearchOptions.input_color+ "; }</style>");
-      $('head').append("<style>.top-search .input.form-control { color: " +navTopsearchOptions.input_color+ "; }</style>");
+      $('head').append("<style>.top-search { background-color: " +navTopsearchOptions.background_color+ " !important; }</style>");
+      $('head').append("<style>.top-search .input-group-addon { color: " +navTopsearchOptions.input_color+ " !important; }</style>");
+      $('head').append("<style>.top-search .input.form-control { color: " +navTopsearchOptions.input_color+ " !important; }</style>");
 
       {% comment %} navSidebar styles
       -------------------------------------------------------------------------- {% endcomment %}
-      $('head').append("<style>.side { background-color: " +navSidebarOptions.background_color+ "; }</style>");
+      $('head').append("<style>.side { background-color: " +navSidebarOptions.background_color+ " !important; }</style>");
 
       return true;
     }, // END setCss